Commit af07330e authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/zcrx: fix rq flush locking 



zcrx needs to keep the rq lock for uref manipulations, for now move all
zcrx_return_buffers() under the lock.

Fixes: 475eb39b ("io_uring/zcrx: add sync refill queue flushing")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0ae91d8a

io_uring/zcrx.c

+4 −4
Original line number Diff line number Diff line
@@ -1069,8 +1069,6 @@ static unsigned zcrx_parse_rq(netmem_ref *netmem_array, unsigned nr, 
	unsigned int mask = zcrx->rq_entries - 1;

	unsigned int i;



	guard(spinlock_bh)(&zcrx->rq_lock);



	nr = min(nr, io_zcrx_rqring_entries(zcrx));

	for (i = 0; i < nr; i++) {

		struct io_uring_zcrx_rqe *rqe = io_zcrx_get_rqe(zcrx, mask);
@@ -1115,9 +1113,11 @@ static int zcrx_flush_rq(struct io_ring_ctx *ctx, struct io_zcrx_ifq *zcrx, 
		return -EINVAL;



	do {

		scoped_guard(spinlock_bh, &zcrx->rq_lock) {

			nr = zcrx_parse_rq(netmems, ZCRX_FLUSH_BATCH, zcrx);



			zcrx_return_buffers(netmems, nr);

		}



		total += nr;



		if (fatal_signal_pending(current))