Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io_uring/rsrc: refactor io_{un}account_mem() to take {user,mm}_struct param 

Refactor io_{un}account_mem() to take user_struct and mm_struct
directly, instead of accessing it from the ring ctx.

Signed-off-by: David Wei <dw@davidwei.uk>
Reviewed-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
David Wei 2025-11-04 14:44:54 -08:00 committed by Jens Axboe
parent 1fa7a34131
commit 6ab39b392e
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
io_uring/rsrc.c
View File

@ -56,27 +56,29 @@ int __io_account_mem(struct user_struct *user, unsigned long nr_pages)
return 0; return 0;
} }
void io_unaccount_mem(struct io_ring_ctx *ctx, unsigned long nr_pages) void io_unaccount_mem(struct user_struct *user, struct mm_struct *mm_account,
unsigned long nr_pages)
{ {
if (ctx->user) if (user)
__io_unaccount_mem(ctx->user, nr_pages); __io_unaccount_mem(user, nr_pages);
if (ctx->mm_account) if (mm_account)
atomic64_sub(nr_pages, &ctx->mm_account->pinned_vm); atomic64_sub(nr_pages, &mm_account->pinned_vm);
} }
int io_account_mem(struct io_ring_ctx *ctx, unsigned long nr_pages) int io_account_mem(struct user_struct *user, struct mm_struct *mm_account,
unsigned long nr_pages)
{ {
int ret; int ret;
if (ctx->user) { if (user) {
ret = __io_account_mem(ctx->user, nr_pages); ret = __io_account_mem(user, nr_pages);
if (ret) if (ret)
return ret; return ret;
} }
if (ctx->mm_account) if (mm_account)
atomic64_add(nr_pages, &ctx->mm_account->pinned_vm); atomic64_add(nr_pages, &mm_account->pinned_vm);
return 0; return 0;
} }
@ -145,7 +147,7 @@ static void io_buffer_unmap(struct io_ring_ctx *ctx, struct io_mapped_ubuf *imu)
} }
if (imu->acct_pages) if (imu->acct_pages)
io_unaccount_mem(ctx, imu->acct_pages); io_unaccount_mem(ctx->user, ctx->mm_account, imu->acct_pages);
imu->release(imu->priv); imu->release(imu->priv);
io_free_imu(ctx, imu); io_free_imu(ctx, imu);
} }
@ -684,7 +686,7 @@ static int io_buffer_account_pin(struct io_ring_ctx *ctx, struct page **pages,
if (!imu->acct_pages) if (!imu->acct_pages)
return 0; return 0;
ret = io_account_mem(ctx, imu->acct_pages); ret = io_account_mem(ctx->user, ctx->mm_account, imu->acct_pages);
if (ret) if (ret)
imu->acct_pages = 0; imu->acct_pages = 0;
return ret; return ret;

6
io_uring/rsrc.h
View File

@ -120,8 +120,10 @@ int io_files_update(struct io_kiocb *req, unsigned int issue_flags);
int io_files_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); int io_files_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
int __io_account_mem(struct user_struct *user, unsigned long nr_pages); int __io_account_mem(struct user_struct *user, unsigned long nr_pages);
int io_account_mem(struct io_ring_ctx *ctx, unsigned long nr_pages); int io_account_mem(struct user_struct *user, struct mm_struct *mm_account,
void io_unaccount_mem(struct io_ring_ctx *ctx, unsigned long nr_pages); unsigned long nr_pages);
void io_unaccount_mem(struct user_struct *user, struct mm_struct *mm_account,
unsigned long nr_pages);
static inline void __io_unaccount_mem(struct user_struct *user, static inline void __io_unaccount_mem(struct user_struct *user,
unsigned long nr_pages) unsigned long nr_pages)

5
io_uring/zcrx.c
View File

@ -200,7 +200,7 @@ static int io_import_umem(struct io_zcrx_ifq *ifq,
} }
mem->account_pages = io_count_account_pages(pages, nr_pages); mem->account_pages = io_count_account_pages(pages, nr_pages);
ret = io_account_mem(ifq->ctx, mem->account_pages); ret = io_account_mem(ifq->ctx->user, ifq->ctx->mm_account, mem->account_pages);
if (ret < 0) if (ret < 0)
mem->account_pages = 0; mem->account_pages = 0;
@ -389,7 +389,8 @@ static void io_zcrx_free_area(struct io_zcrx_area *area)
io_release_area_mem(&area->mem); io_release_area_mem(&area->mem);
if (area->mem.account_pages) if (area->mem.account_pages)
io_unaccount_mem(area->ifq->ctx, area->mem.account_pages); io_unaccount_mem(area->ifq->ctx->user, area->ifq->ctx->mm_account,
area->mem.account_pages);
kvfree(area->freelist); kvfree(area->freelist);
kvfree(area->nia.niovs); kvfree(area->nia.niovs);