From a63948834fe1a1aeb715a0991183a4dd1e6fad03 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 17 Jan 2020 11:15:34 -0700 Subject: [PATCH] io_uring: file switch work needs to get flushed on exit to #26323588 commit e46a7950d362231a4d0b078af5f4c109b8e5ac9e upstream. We currently flush early, but if we have something in progress and a new switch is scheduled, we need to ensure to flush after our teardown as well. Signed-off-by: Jens Axboe Signed-off-by: Joseph Qi Acked-by: Xiaoguang Wang --- fs/io_uring.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 7734f5fdd739..1e6a8402e0c1 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5076,11 +5076,14 @@ static int io_sqe_files_unregister(struct io_ring_ctx *ctx) return -ENXIO; /* protect against inflight atomic switch, which drops the ref */ - flush_work(&data->ref_work); percpu_ref_get(&data->refs); + /* wait for existing switches */ + flush_work(&data->ref_work); percpu_ref_kill_and_confirm(&data->refs, io_file_ref_kill); wait_for_completion(&data->done); percpu_ref_put(&data->refs); + /* flush potential new switch */ + flush_work(&data->ref_work); percpu_ref_exit(&data->refs); __io_sqe_files_unregister(ctx); -- GitLab