From: Pavel Begunkov Date: Fri, 29 Nov 2024 13:34:25 +0000 (+0000) Subject: io_uring/memmap: flag regions with user pages X-Git-Tag: v6.14-rc1~201^2~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16375af32d0fd5a6398c48d2a684b3f4fbb17a8e;p=thirdparty%2Fkernel%2Flinux.git io_uring/memmap: flag regions with user pages In preparation to kernel allocated regions add a flag telling if the region contains user pinned pages or not. Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/0dc91564642654405bab080b7ec911cb4a43ec6e.1732886067.git.asml.silence@gmail.com Signed-off-by: Jens Axboe --- diff --git a/io_uring/memmap.c b/io_uring/memmap.c index 31fb8c8ffe4eb..a0416733e9213 100644 --- a/io_uring/memmap.c +++ b/io_uring/memmap.c @@ -205,12 +205,17 @@ void *__io_uaddr_map(struct page ***pages, unsigned short *npages, enum { /* memory was vmap'ed for the kernel, freeing the region vunmap's it */ IO_REGION_F_VMAP = 1, + /* memory is provided by user and pinned by the kernel */ + IO_REGION_F_USER_PROVIDED = 2, }; void io_free_region(struct io_ring_ctx *ctx, struct io_mapped_region *mr) { if (mr->pages) { - unpin_user_pages(mr->pages, mr->nr_pages); + if (mr->flags & IO_REGION_F_USER_PROVIDED) + unpin_user_pages(mr->pages, mr->nr_pages); + else + release_pages(mr->pages, mr->nr_pages); kvfree(mr->pages); } if ((mr->flags & IO_REGION_F_VMAP) && mr->ptr) @@ -267,7 +272,7 @@ int io_create_region(struct io_ring_ctx *ctx, struct io_mapped_region *mr, mr->pages = pages; mr->ptr = vptr; mr->nr_pages = nr_pages; - mr->flags |= IO_REGION_F_VMAP; + mr->flags |= IO_REGION_F_VMAP | IO_REGION_F_USER_PROVIDED; return 0; out_free: if (pages_accounted)