Commit 6b5733eb authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: add warn_once for io_uring_flush()

files_cancel() should cancel all relevant requests and drop file notes,
so we should never have file notes after that, including on-exit fput
and flush. Add a WARN_ONCE to be sure.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4f793dc4
...@@ -9055,17 +9055,23 @@ void __io_uring_task_cancel(void) ...@@ -9055,17 +9055,23 @@ void __io_uring_task_cancel(void)
static int io_uring_flush(struct file *file, void *data) static int io_uring_flush(struct file *file, void *data)
{ {
if (!current->io_uring) struct io_uring_task *tctx = current->io_uring;
if (!tctx)
return 0; return 0;
/* we should have cancelled and erased it before PF_EXITING */
WARN_ON_ONCE((current->flags & PF_EXITING) &&
xa_load(&tctx->xa, (unsigned long)file));
/* /*
* fput() is pending, will be 2 if the only other ref is our potential * fput() is pending, will be 2 if the only other ref is our potential
* task file note. If the task is exiting, drop regardless of count. * task file note. If the task is exiting, drop regardless of count.
*/ */
if (fatal_signal_pending(current) || (current->flags & PF_EXITING) || if (atomic_long_read(&file->f_count) != 2)
atomic_long_read(&file->f_count) == 2) return 0;
io_uring_del_task_file(file);
io_uring_del_task_file(file);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment