diff mbox series

io_uring/net: account memory for zc sendmsg

Message ID 4f00f67ca6ac8e8ed62343ae92b5816b1e0c9c4b.1743086313.git.asml.silence@gmail.com (mailing list archive)
State New
Headers show
Series io_uring/net: account memory for zc sendmsg | expand

Commit Message

Pavel Begunkov March 27, 2025, 3:02 p.m. UTC 
Account pinned pages for IORING_OP_SENDMSG_ZC, just as we for
IORING_OP_SEND_ZC and net/ does for MSG_ZEROCOPY.

Fixes: 493108d95f146 ("io_uring/net: zerocopy sendmsg")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 io_uring/net.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Jens Axboe March 28, 2025, 1:46 p.m. UTC | #1 
On Thu, 27 Mar 2025 15:02:20 +0000, Pavel Begunkov wrote:
> Account pinned pages for IORING_OP_SENDMSG_ZC, just as we for
> IORING_OP_SEND_ZC and net/ does for MSG_ZEROCOPY.
> 
> 

Applied, thanks!

[1/1] io_uring/net: account memory for zc sendmsg
      commit: f20cf4ffec98663bfa0fa234a82dfd8fd92de9e0

Best regards,
diff mbox series

Patch

diff --git a/io_uring/net.c b/io_uring/net.c
index 616e953ef0ae..a1d32555fe6a 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -1304,6 +1304,7 @@  int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 	struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg);
 	struct io_ring_ctx *ctx = req->ctx;
 	struct io_kiocb *notif;
+	int ret;
 
 	zc->done_io = 0;
 	zc->retry = false;
@@ -1356,7 +1357,16 @@  int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 		req->flags |= REQ_F_IMPORT_BUFFER;
 		return io_send_setup(req, sqe);
 	}
-	return io_sendmsg_zc_setup(req, sqe);
+	ret = io_sendmsg_zc_setup(req, sqe);
+	if (unlikely(ret))
+		return ret;
+
+	if (!(zc->flags & IORING_RECVSEND_FIXED_BUF)) {
+		struct io_async_msghdr *iomsg = req->async_data;
+
+		return io_notif_account_mem(zc->notif, iomsg->msg.msg_iter.count);
+	}
+	return 0;
 }
 
 static int io_sg_from_iter_iovec(struct sk_buff *skb,