github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

io_uring/zcrx: lock area creation with pp_lock

Browse Source 
Protect __zcrx_create_area() with pp_lock. It's not needed for now,
nobody can take the lock in parallel, but we'll need it for dynamic area
creation for avoiding races with the device dying.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://patch.msgid.link/a667399971120227a28d54ebabc50e707f717bf3.1786108672.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2026-08-07 14:19:33 +01:00 committed by Jens Axboe
parent ef0f0e10ee
commit 5a22bfdd61
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
io_uring/zcrx.c
View File

@ -330,13 +330,6 @@ static void __io_zcrx_unmap_area(struct io_zcrx_ifq *ifq,
}
}
static void io_zcrx_unmap_area(struct io_zcrx_ifq *ifq,
struct io_zcrx_area *area)
{
guard(mutex)(&ifq->pp_lock);
__io_zcrx_unmap_area(ifq, area);
}
static void io_zcrx_unmap_areas(struct io_zcrx_ifq *ifq)
{
unsigned area_idx;
@ -508,6 +501,8 @@ static int __zcrx_create_area(struct io_zcrx_ifq *ifq,
unsigned nr_iovs;
int i, ret;
lockdep_assert_held(&ifq->pp_lock);
if (rx_buf_len) {
if (!is_power_of_2(rx_buf_len) || rx_buf_len < PAGE_SIZE)
return -EINVAL;
@ -579,7 +574,7 @@ static int __zcrx_create_area(struct io_zcrx_ifq *ifq,
return 0;
err:
if (area) {
io_zcrx_unmap_area(ifq, area);
__io_zcrx_unmap_area(ifq, area);
io_zcrx_free_area(ifq, area);
}
return ret;
@ -589,6 +584,7 @@ static int io_zcrx_create_area(struct io_zcrx_ifq *ifq,
struct io_uring_zcrx_area_reg *area_reg,
struct io_uring_zcrx_ifq_reg *reg)
{
guard(mutex)(&ifq->pp_lock);
return __zcrx_create_area(ifq, area_reg, reg->rx_buf_len);
}