io_uring/net: don't continue send bundle if poll was required for retry

If a send bundle has picked a bunch of buffers, then it needs to send
all of those to be complete. This may require poll arming, if the send
buffer ends up being full. Once a send bundle has been poll armed, no
further bundles should be attempted.

This allows a current bundle to complete even though it needs to go
through polling to do so, but it will not allow another bundle to be
started once that has happened. Ideally we would abort a bundle if it
was only partially sent, but as some parts of it already went out on the
wire, this obviously isn't feasible. Not continuing more bundle attempts
post encountering a full socket buffer is the second best thing.

Cc: stable@vger.kernel.org
Fixes: a05d1f625c7a ("io_uring/net: support bundles for send")
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/net.c b/io_uring/net.c
index 519ea055b76197480a48f039049e39baddd5ee04..d9a4b83804a2542bd9fac3418f1b58ee0f6c197d 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -515,7 +515,11 @@ static inline bool io_send_finish(struct io_kiocb *req,
 
        cflags = io_put_kbufs(req, sel->val, sel->buf_list, io_bundle_nbufs(kmsg, sel->val));
 
-       if (bundle_finished || req->flags & REQ_F_BL_EMPTY)
+       /*
+        * Don't start new bundles if the buffer list is empty, or if the
+        * current operation needed to go through polling to complete.
+        */
+       if (bundle_finished || req->flags & (REQ_F_BL_EMPTY | REQ_F_POLLED))
                goto finish;
 
        /*