kevin/linux
1
Fork 0
Code

io_uring/net: don't pick multiple buffers for non-bundle send

Browse Source 
If a send is issued marked with IOSQE_BUFFER_SELECT for selecting a
buffer, unless it's a bundle, it should not select multiple buffers.

Cc: stable@vger.kernel.org
Fixes: a05d1f625c ("io_uring/net: support bundles for send")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2024-08-07 15:09:33 -06:00
parent 70ed519ed5
commit 8fe8ac24ad
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
io_uring/net.c
View File

@ -601,17 +601,18 @@ retry_bundle:
.iovs = &kmsg->fast_iov, .iovs = &kmsg->fast_iov,
.max_len = INT_MAX, .max_len = INT_MAX,
.nr_iovs = 1, .nr_iovs = 1,
.mode = KBUF_MODE_EXPAND,
}; };
if (kmsg->free_iov) { if (kmsg->free_iov) {
arg.nr_iovs = kmsg->free_iov_nr; arg.nr_iovs = kmsg->free_iov_nr;
arg.iovs = kmsg->free_iov; arg.iovs = kmsg->free_iov;
arg.mode |= KBUF_MODE_FREE; arg.mode = KBUF_MODE_FREE;
} }
if (!(sr->flags & IORING_RECVSEND_BUNDLE)) if (!(sr->flags & IORING_RECVSEND_BUNDLE))
arg.nr_iovs = 1; arg.nr_iovs = 1;
else
arg.mode |= KBUF_MODE_EXPAND;
ret = io_buffers_select(req, &arg, issue_flags); ret = io_buffers_select(req, &arg, issue_flags);
if (unlikely(ret < 0)) if (unlikely(ret < 0))