Skip to content

Commit dce00c8

Browse files
isilenceaxboe
authored andcommitted
io_uring/net: allow vectorised regbuf send zc
Enable IORING_SEND_VECTORIZED with registered buffers for IORING_OP_SEND_ZC. Set IORING_SEND_VECTORIZED for all msg send requests to differentiate if the vectorised version is expected. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent d8345a2 commit dce00c8

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

io_uring/net.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,13 @@ static int io_send_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe)
375375
kmsg->msg.msg_namelen = addr_len;
376376
}
377377
if (sr->flags & IORING_RECVSEND_FIXED_BUF) {
378-
if (sr->flags & IORING_SEND_VECTORIZED)
379-
return -EINVAL;
380-
req->flags |= REQ_F_IMPORT_BUFFER;
381-
return 0;
378+
if (!(sr->flags & IORING_SEND_VECTORIZED)) {
379+
req->flags |= REQ_F_IMPORT_BUFFER;
380+
return 0;
381+
}
382+
383+
kmsg->msg.msg_iter.nr_segs = sr->len;
384+
return io_prep_reg_iovec(req, &kmsg->vec, sr->buf, sr->len);
382385
}
383386
if (req->flags & REQ_F_BUFFER_SELECT)
384387
return 0;
@@ -396,6 +399,7 @@ static int io_sendmsg_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe
396399
struct user_msghdr msg;
397400
int ret;
398401

402+
sr->flags |= IORING_SEND_VECTORIZED;
399403
sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr));
400404
ret = io_msg_copy_hdr(req, kmsg, &msg, ITER_SOURCE, NULL);
401405
if (unlikely(ret))
@@ -1453,7 +1457,7 @@ static int io_send_zc_import(struct io_kiocb *req,
14531457

14541458
notif->buf_index = req->buf_index;
14551459

1456-
if (req->opcode == IORING_OP_SEND_ZC) {
1460+
if (!(sr->flags & IORING_SEND_VECTORIZED)) {
14571461
ret = io_import_reg_buf(notif, &kmsg->msg.msg_iter,
14581462
(u64)(uintptr_t)sr->buf, sr->len,
14591463
ITER_SOURCE, issue_flags);

0 commit comments

Comments
 (0)