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

io_uring: destroy io-wq on exec 



Destroy current's io-wq backend and tctx on __io_uring_task_cancel(),
aka exec(). Looks it's not strictly necessary, because it will be done
at some point when the task dies and changes of creds/files/etc. are
handled, but better to do that earlier to free io-wq and not potentially
lock previous mm and other resources for the time being.

It's safe to do because we wait for all requests of the current task to
complete, so no request will use tctx afterwards. Note, that
io_uring_files_cancel() may leave some requests for later reaping, so it
leaves tctx intact, that's ok as the task is dying anyway.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ef8eaa4e

fs/io_uring.c

+10 −9
Original line number Diff line number Diff line
@@ -8835,13 +8835,17 @@ static void io_uring_del_task_file(struct file *file) 
		fput(file);

}



static void io_uring_remove_task_files(struct io_uring_task *tctx)

static void io_uring_clean_tctx(struct io_uring_task *tctx)

{

	struct file *file;

	unsigned long index;



	xa_for_each(&tctx->xa, index, file)

		io_uring_del_task_file(file);

	if (tctx->io_wq) {

		io_wq_put_and_exit(tctx->io_wq);

		tctx->io_wq = NULL;

	}

}



void __io_uring_files_cancel(struct files_struct *files)
@@ -8856,13 +8860,8 @@ void __io_uring_files_cancel(struct files_struct *files) 
		io_uring_cancel_task_requests(file->private_data, files);

	atomic_dec(&tctx->in_idle);



	if (files) {

		io_uring_remove_task_files(tctx);

		if (tctx->io_wq) {

			io_wq_put_and_exit(tctx->io_wq);

			tctx->io_wq = NULL;

		}

	}

	if (files)

		io_uring_clean_tctx(tctx);

}



static s64 tctx_inflight(struct io_uring_task *tctx)
@@ -8954,7 +8953,9 @@ void __io_uring_task_cancel(void) 


	atomic_dec(&tctx->in_idle);



	io_uring_remove_task_files(tctx);

	io_uring_clean_tctx(tctx);

	/* all current's requests should be gone, we can kill tctx */

	__io_uring_free(current);

}



static int io_uring_flush(struct file *file, void *data)

include/linux/io_uring.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void __io_uring_free(struct task_struct *tsk); 


static inline void io_uring_task_cancel(void)

{

	if (current->io_uring && !xa_empty(&current->io_uring->xa))

	if (current->io_uring)

		__io_uring_task_cancel();

}

static inline void io_uring_files_cancel(struct files_struct *files)