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

io_uring/memmap: return bool from io_mem_alloc_compound() 

io_mem_alloc_compound() returns either ERR_PTR(-ENOMEM) or a virtual
address for the allocated memory, but its caller just checks whether the
result is an error. Return a bool success value instead.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1354/merge
Caleb Sander Mateos 2025-10-15 11:25:54 -06:00 committed by Jens Axboe
parent ffce324364
commit 4b25b75c30
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
io_uring/memmap.c
View File

@ -15,26 +15,26 @@
#include "rsrc.h" #include "rsrc.h"
#include "zcrx.h" #include "zcrx.h"
static void *io_mem_alloc_compound(struct page **pages, int nr_pages, static bool io_mem_alloc_compound(struct page **pages, int nr_pages,
size_t size, gfp_t gfp) size_t size, gfp_t gfp)
{ {
struct page *page; struct page *page;
int i, order; int i, order;
order = get_order(size); order = get_order(size);
if (order > MAX_PAGE_ORDER) if (order > MAX_PAGE_ORDER)
return ERR_PTR(-ENOMEM); return false;
else if (order) else if (order)
gfp |= __GFP_COMP; gfp |= __GFP_COMP;
page = alloc_pages(gfp, order); page = alloc_pages(gfp, order);
if (!page) if (!page)
return ERR_PTR(-ENOMEM); return false;
for (i = 0; i < nr_pages; i++) for (i = 0; i < nr_pages; i++)
pages[i] = page + i; pages[i] = page + i;
return page_address(page); return true;
} }
struct page **io_pin_pages(unsigned long uaddr, unsigned long len, int *npages) struct page **io_pin_pages(unsigned long uaddr, unsigned long len, int *npages)
@ -159,14 +159,12 @@ static int io_region_allocate_pages(struct io_ring_ctx *ctx,
size_t size = (size_t) mr->nr_pages << PAGE_SHIFT; size_t size = (size_t) mr->nr_pages << PAGE_SHIFT;
unsigned long nr_allocated; unsigned long nr_allocated;
struct page **pages; struct page **pages;
void *p;
pages = kvmalloc_array(mr->nr_pages, sizeof(*pages), gfp); pages = kvmalloc_array(mr->nr_pages, sizeof(*pages), gfp);
if (!pages) if (!pages)
return -ENOMEM; return -ENOMEM;
p = io_mem_alloc_compound(pages, mr->nr_pages, size, gfp); if (io_mem_alloc_compound(pages, mr->nr_pages, size, gfp)) {
if (!IS_ERR(p)) {
mr->flags |= IO_REGION_F_SINGLE_REF; mr->flags |= IO_REGION_F_SINGLE_REF;
goto done; goto done;
} }