From: Pavel Begunkov Date: Mon, 24 Feb 2025 21:31:08 +0000 (-0800) Subject: io_uring/net: reuse req->buf_index for sendzc X-Git-Tag: v6.15-rc1~167^2~63 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81cc96fcb3dcfb3d85df4e0eec56149b5b53c016;p=thirdparty%2Fkernel%2Flinux.git io_uring/net: reuse req->buf_index for sendzc There is already a field in io_kiocb that can store a registered buffer index, use that instead of stashing the value into struct io_sr_msg. Reviewed-by: Keith Busch Signed-off-by: Pavel Begunkov Reviewed-by: Pavel Begunkov Reviewed-by: Ming Lei Link: https://lore.kernel.org/r/20250224213116.3509093-4-kbusch@meta.com Signed-off-by: Jens Axboe --- diff --git a/io_uring/net.c b/io_uring/net.c index 8283a1f55192f..22fa1664a6b1d 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -75,7 +75,6 @@ struct io_sr_msg { u16 flags; /* initialised and used only by !msg send variants */ u16 buf_group; - u16 buf_index; bool retry; void __user *msg_control; /* used only for send zerocopy */ @@ -1287,7 +1286,7 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) zc->len = READ_ONCE(sqe->len); zc->msg_flags = READ_ONCE(sqe->msg_flags) | MSG_NOSIGNAL | MSG_ZEROCOPY; - zc->buf_index = READ_ONCE(sqe->buf_index); + req->buf_index = READ_ONCE(sqe->buf_index); if (zc->msg_flags & MSG_DONTWAIT) req->flags |= REQ_F_NOWAIT; @@ -1363,7 +1362,7 @@ static int io_send_zc_import(struct io_kiocb *req, unsigned int issue_flags) ret = -EFAULT; io_ring_submit_lock(ctx, issue_flags); - node = io_rsrc_node_lookup(&ctx->buf_table, sr->buf_index); + node = io_rsrc_node_lookup(&ctx->buf_table, req->buf_index); if (node) { io_req_assign_buf_node(sr->notif, node); ret = 0;