]> www.infradead.org Git - nvme.git/commitdiff
io_uring/net: account memory for zc sendmsg
authorPavel Begunkov <asml.silence@gmail.com>
Thu, 27 Mar 2025 15:02:20 +0000 (15:02 +0000)
committerKeith Busch <kbusch@kernel.org>
Mon, 31 Mar 2025 15:48:23 +0000 (08:48 -0700)
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>
Link: https://lore.kernel.org/r/4f00f67ca6ac8e8ed62343ae92b5816b1e0c9c4b.1743086313.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/net.c

index 8944eb679024a8d9b5653f934be5b8bea967b0e7..228b4f13d34cd001541d2e7acc96475ab4edce72 100644 (file)
@@ -1303,6 +1303,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;
@@ -1355,7 +1356,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,