FAILED: patch "[PATCH] io_uring: if we see flush on exit, cancel related tasks" failed to apply to 5.10-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 84965ff8a84f0368b154c9b367b62e59c1193f30 Mon Sep 17 00:00:00 2001
From: Jens Axboe <[email protected]>
Date: Sat, 23 Jan 2021 15:51:11 -0700
Subject: [PATCH] io_uring: if we see flush on exit, cancel related tasks
Ensure we match tasks that belong to a dead or dying task as well, as we need to reap those in addition to those belonging to the exiting task.
Cc [email protected] # 5.9+
Reported-by Josef Grieb <[email protected]>
Signed-off-by Jens Axboe <[email protected]>
fs/io_uring.c +8 -1
@@ -1069,8 +1069,12 @@ static bool io_match_task(struct io_kiocb *head, {struct io_kiocb *req; -if (task && head->task != task) +if (task && head->task != task) { +/* in terms of cancelation, always match if req task is dead */ +if (head->task->flags &PF_EXITING ) +return true;return false; + }if (!files)return true;
@@ -9136,6 +9140,9 @@ static int io_uring_flush(struct file *file, void *data)struct io_uring_task *tctx = current->io_uring;struct io_ring_ctx *ctx = file->private_data; +if (fatal_signal_pending (current) || (current->flags &PF_EXITING )) +io_uring_cancel_task_requests (ctx,NULL ); +if (!tctx)return 0 ;