public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

io_uring/zcrx: account area memory

Browse source 
zcrx areas can be quite large and need to be accounted and checked
against RLIMIT_MEMLOCK. In practise it shouldn't be a big issue as
the inteface already requires cap_net_admin.

Cc: stable@vger.kernel.org
Fixes: cf96310c5f ("io_uring/zcrx: add io_zcrx_area")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/4b53f0c575bd062f63d12bec6cac98037fc66aeb.1752699568.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2025-07-16 22:04:09 +01:00 • committed by Jens Axboe
parent 11fbada718
commit 262ab20518
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
io_uring/zcrx.c
View file

@ -158,6 +158,23 @@ static int io_zcrx_map_area_dmabuf(struct io_zcrx_ifq *ifq, struct io_zcrx_area
area->mem.dmabuf_offset);
}
static unsigned long io_count_account_pages(struct page **pages, unsigned nr_pages)
{
struct folio *last_folio = NULL;
unsigned long res = 0;
int i;
for (i = 0; i < nr_pages; i++) {
struct folio *folio = page_folio(pages[i]);
if (folio == last_folio)
continue;
last_folio = folio;
res += 1UL << folio_order(folio);
}
return res;
}
static int io_import_umem(struct io_zcrx_ifq *ifq,
struct io_zcrx_mem *mem,
struct io_uring_zcrx_area_reg *area_reg)
@ -180,6 +197,13 @@ static int io_import_umem(struct io_zcrx_ifq *ifq,
if (ret)
return ret;
mem->account_pages = io_count_account_pages(pages, nr_pages);
ret = io_account_mem(ifq->ctx, mem->account_pages);
if (ret < 0) {
mem->account_pages = 0;
return ret;
}
mem->pages = pages;
mem->nr_folios = nr_pages;
mem->size = area_reg->len;
@ -357,6 +381,9 @@ static void io_zcrx_free_area(struct io_zcrx_area *area)
io_zcrx_unmap_area(area->ifq, area);
io_release_area_mem(&area->mem);
if (area->mem.account_pages)
io_unaccount_mem(area->ifq->ctx, area->mem.account_pages);
kvfree(area->freelist);
kvfree(area->nia.niovs);
kvfree(area->user_refs);

1
io_uring/zcrx.h
View file

@ -15,6 +15,7 @@ struct io_zcrx_mem {
struct page **pages;
unsigned long nr_folios;
struct sg_table page_sg_table;
unsigned long account_pages;
struct dma_buf_attachment *attach;
struct dma_buf *dmabuf;