diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-07-12 22:52:44 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-07-25 02:41:07 +0200 |
| commit | e29e3bd4b968d50bfb3bbdcee6bfdc340f7792cf (patch) | |
| tree | 51fe9adcee0ba02f46cb789a3b02d09d44ffafac /io_uring | |
| parent | io_uring: wire send zc request type (diff) | |
| download | linux-e29e3bd4b968d50bfb3bbdcee6bfdc340f7792cf.tar.xz linux-e29e3bd4b968d50bfb3bbdcee6bfdc340f7792cf.zip | |
io_uring: account locked pages for non-fixed zc
Fixed buffers are RLIMIT_MEMLOCK accounted, however it doesn't cover iovec
based zerocopy sends. Do the accounting on the io_uring side.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/19b6e3975440f59f1f6199c7ee7acf977b4eecdc.1657643355.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/net.c | 1 | ||||
| -rw-r--r-- | io_uring/notif.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 89a8678ce69b..2d04a70b0632 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -906,6 +906,7 @@ int io_sendzc(struct io_kiocb *req, unsigned int issue_flags) ret = import_single_range(WRITE, zc->buf, zc->len, &iov, &msg.msg_iter); if (unlikely(ret)) return ret; + mm_account_pinned_pages(¬if->uarg.mmp, zc->len); msg_flags = zc->msg_flags | MSG_ZEROCOPY; if (issue_flags & IO_URING_F_NONBLOCK) diff --git a/io_uring/notif.c b/io_uring/notif.c index e6d98dc208c7..c5179e5c1cd6 100644 --- a/io_uring/notif.c +++ b/io_uring/notif.c @@ -14,7 +14,13 @@ static void __io_notif_complete_tw(struct callback_head *cb) struct io_notif *notif = container_of(cb, struct io_notif, task_work); struct io_rsrc_node *rsrc_node = notif->rsrc_node; struct io_ring_ctx *ctx = notif->ctx; + struct mmpin *mmp = ¬if->uarg.mmp; + if (mmp->user) { + atomic_long_sub(mmp->num_pg, &mmp->user->locked_vm); + free_uid(mmp->user); + mmp->user = NULL; + } if (likely(notif->task)) { io_put_task(notif->task, 1); notif->task = NULL; |