io_uring: batch cancel in io_uring_cancel_files() (67c4d9e6) · Commits · 戴 / test

Instead of waiting for each request one by one, first try to cancel all of them in a batched manner, and then go over inflight_list/etc to reap leftovers. Signed-off-by:

Pavel Begunkov <asml.silence@gmail.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

fs/io_uring.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -7366,9 +7366,22 @@ static int io_uring_release(struct inode inode, struct file file)
		return 0;
		}

		static bool io_wq_files_match(struct io_wq_work work, void data)
		{
		struct files_struct *files = data;

		return work->files == files;
		}

		static void io_uring_cancel_files(struct io_ring_ctx *ctx,
		struct files_struct *files)
		{
		if (list_empty_careful(&ctx->inflight_list))
		return;

		/* cancel all at once, should be faster than doing it one by one*/
		io_wq_cancel_cb(ctx->io_wq, io_wq_files_match, files, true);

		while (!list_empty_careful(&ctx->inflight_list)) {
		struct io_kiocb cancel_req = NULL, req;
		DEFINE_WAIT(wait);

Admin message