zcrx accounting fixes
Subsystems (2)
Pavel Begunkov
maintainercover zcrx accounting fixes
A follow up on Dan's report + patch up possible page leaks in io_zcrx_free_area().
Pavel Begunkov (3):
io_uring/zcrx: fix null ifq on area destruction io_uring/zcrx: don't leak pages on account failure io_uring/zcrx: fix leaking pages on sg init fail
io_uring/zcrx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
Signature · 1 line
2.49.0
Pavel Begunkov
maintainerPATCH 1/3 io_uring/zcrx: fix null ifq on area destruction
Dan reports that ifq can be null when infering arguments for io_unaccount_mem() from io_zcrx_free_area(). Fix it by always setting a correct ifq.
--- io_uring/zcrx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
io_uring/zcrx.c +2 -3
@@ -377,8 +377,7 @@ static void io_free_rbuf_ring(struct io_zcrx_ifq *ifq)static void io_zcrx_free_area (struct io_zcrx_area *area) { -if (area->ifq) -io_zcrx_unmap_area (area->ifq, area); +io_zcrx_unmap_area (area->ifq, area);io_release_area_mem (&area->mem);if (area->mem.account_pages)
@@ -411,6 +410,7 @@ static int io_zcrx_create_area(struct io_zcrx_ifq *ifq, area =kzalloc (sizeof (*area),GFP_KERNEL );if (!area) goto err; + area->ifq = ifq; ret =io_import_area (ifq, &area->mem, area_reg);if (ret)
@@ -445,7 +445,6 @@ static int io_zcrx_create_area(struct io_zcrx_ifq *ifq, } area->free_count = nr_iovs; - area->ifq = ifq;/* we're only supporting one area per ifq for now */ area->area_id =0 ; area_reg->rq_area_token = (u64 )area->area_id <<IORING_ZCRX_AREA_SHIFT ;
Signature · 1 line
2.49.0
Pavel Begunkov
maintainerPATCH 2/3 io_uring/zcrx: don't leak pages on account failure
In reply to Pavel BegunkovSomeone needs to release pinned pages in io_import_umem() if accounting fails. Assign them to the area but return an error, the following io_zcrx_free_area() will clean them up.
--- io_uring/zcrx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
io_uring/zcrx.c +2 -4
@@ -199,15 +199,13 @@ static int io_import_umem(struct io_zcrx_ifq *ifq, mem->account_pages =io_count_account_pages (pages, nr_pages); ret =io_account_mem (ifq->ctx, mem->account_pages); -if (ret <0 ) { +if (ret <0 ) mem->account_pages =0 ; -return ret; - } mem->pages = pages; mem->nr_folios = nr_pages; mem->size = area_reg->len; -return 0 ; +return ret; }static void io_release_area_mem (struct io_zcrx_mem *mem)
Signature · 1 line
2.49.0
Pavel Begunkov
maintainerPATCH 3/3 io_uring/zcrx: fix leaking pages on sg init fail
In reply to Pavel BegunkovIf sg_alloc_table_from_pages() fails, io_import_umem() returns without cleaning up pinned pages first. Fix it.
--- io_uring/zcrx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
io_uring/zcrx.c +3 -1
@@ -194,8 +194,10 @@ static int io_import_umem(struct io_zcrx_ifq *ifq, ret =sg_alloc_table_from_pages (&mem->page_sg_table, pages, nr_pages,0 , nr_pages <<PAGE_SHIFT ,GFP_KERNEL_ACCOUNT ); -if (ret) +if (ret) { +unpin_user_pages (pages, nr_pages);return ret; + } mem->account_pages =io_count_account_pages (pages, nr_pages); ret =io_account_mem (ifq->ctx, mem->account_pages);
Signature · 1 line
2.49.0
Quoted 9 lines · Pavel Begunkov
A follow up on Dan's report + patch up possible page leaks in
io_zcrx_free_area().Pavel Begunkov (3):
io_uring/zcrx: fix null ifq on area destructionio_uring/zcrx: don't leak pages on account failureio_uring/zcrx: fix leaking pages on sg init fail[...]
Applied, thanks!
[1/3] io_uring/zcrx: fix null ifq on area destruction
commit: 720df2310b89cf76c1dc1a05902536282506f8bf
[2/3] io_uring/zcrx: don't leak pages on account failure
commit: 6bbd3411ff87df1ca38ff32d36eb5dc673ca8021
[3/3] io_uring/zcrx: fix leaking pages on sg init fail
commit: d9f595b9a65e9c9eb03e21f3db98fde158d128dbBest regards,
Signature · 1 line
Jens Axboe