io_uring: cancel all task's requests on exit (44e728b8) · Commits · 戴 / test

fs/io-wq.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -1018,20 +1018,6 @@ enum io_wq_cancel io_wq_cancel_work(struct io_wq wq, struct io_wq_work cwork)
		return io_wq_cancel_cb(wq, io_wq_io_cb_cancel_data, (void *)cwork, false);
		}

		static bool io_wq_pid_match(struct io_wq_work work, void data)
		{
		pid_t pid = (pid_t) (unsigned long) data;

		return work->task_pid == pid;
		}

		enum io_wq_cancel io_wq_cancel_pid(struct io_wq *wq, pid_t pid)
		{
		void data = (void ) (unsigned long) pid;

		return io_wq_cancel_cb(wq, io_wq_pid_match, data, false);
		}

		struct io_wq io_wq_create(unsigned bounded, struct io_wq_data data)
		{
		int ret = -ENOMEM, node;

+0 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,6 @@ static inline bool io_wq_is_hashed(struct io_wq_work *work)

		void io_wq_cancel_all(struct io_wq *wq);
		enum io_wq_cancel io_wq_cancel_work(struct io_wq wq, struct io_wq_work cwork);
		enum io_wq_cancel io_wq_cancel_pid(struct io_wq *wq, pid_t pid);

		typedef bool (work_cancel_fn)(struct io_wq_work , void );

+12 −2

Original line number	Diff line number	Diff line
		@@ -7424,6 +7424,13 @@ static void io_uring_cancel_files(struct io_ring_ctx *ctx,
		}
		}

		static bool io_cancel_pid_cb(struct io_wq_work work, void data)
		{
		pid_t pid = (pid_t) (unsigned long) data;

		return work->task_pid == pid;
		}

		static int io_uring_flush(struct file file, void data)
		{
		struct io_ring_ctx *ctx = file->private_data;
		@@ -7433,8 +7440,11 @@ static int io_uring_flush(struct file file, void data)
		/*
		* If the task is going away, cancel work it may have pending
		*/
		if (fatal_signal_pending(current) \|\| (current->flags & PF_EXITING))
		io_wq_cancel_pid(ctx->io_wq, task_pid_vnr(current));
		if (fatal_signal_pending(current) \|\| (current->flags & PF_EXITING)) {
		void data = (void ) (unsigned long)task_pid_vnr(current);

		io_wq_cancel_cb(ctx->io_wq, io_cancel_pid_cb, data, true);
		}

		return 0;
		}