diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2025-02-19 10:08:01 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-02-19 08:07:31 -0700 |
| commit | bc674a04c47cc23ad7e12893cad6226ea8f7a8ec (patch) | |
| tree | fd415caa84b2bd7ab1bf151e59cb26957eb7eb79 /io_uring/zcrx.c | |
| parent | 71082faa2c648a2adc1167b37565e195a8df1bc7 (diff) | |
io_uring/zcrx: recheck ifq on shutdown
io_ring_exit_work() checks ifq before shutting it down and guarantees
that the pointer is stable, but instead of relying on rather complicated
synchronisation recheck the ifq pointer inside.
Reported-by: Kees Bakker <kees@ijzerbout.nl>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/905e55c47235ab26377a735294f939f31d00ae53.1739934175.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/zcrx.c')
| -rw-r--r-- | io_uring/zcrx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 026efb8dd381..a9eaab3fccf2 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -489,9 +489,9 @@ void io_shutdown_zcrx_ifqs(struct io_ring_ctx *ctx) { lockdep_assert_held(&ctx->uring_lock); - if (ctx->ifq) - io_zcrx_scrub(ctx->ifq); - + if (!ctx->ifq) + return; + io_zcrx_scrub(ctx->ifq); io_close_queue(ctx->ifq); } |