From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH for-5.10] io_uring: remove req cancel in ->flush()
Date: Mon, 19 Oct 2020 16:45:54 +0100 [thread overview]
Message-ID: <21aca47e03c82a06e4ea1140b328a86d04d1f422.1603122023.git.asml.silence@gmail.com> (raw)
Every close(io_uring) causes cancellation of all inflight requests
carrying ->files. That's not nice but was neccessary up until recently.
Now task->files removal is handled in the core code, so that part of
flush can be removed.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 95d2bb7069c6..6536e24eb44e 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -8748,16 +8748,12 @@ void __io_uring_task_cancel(void)
static int io_uring_flush(struct file *file, void *data)
{
- struct io_ring_ctx *ctx = file->private_data;
+ bool exiting = !data;
- /*
- * If the task is going away, cancel work it may have pending
- */
if (fatal_signal_pending(current) || (current->flags & PF_EXITING))
- data = NULL;
+ exiting = true;
- io_uring_cancel_task_requests(ctx, data);
- io_uring_attempt_task_drop(file, !data);
+ io_uring_attempt_task_drop(file, exiting);
return 0;
}
--
2.24.0
next reply other threads:[~2020-10-19 15:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 15:45 Pavel Begunkov [this message]
2020-10-19 20:08 ` [PATCH for-5.10] io_uring: remove req cancel in ->flush() Jens Axboe
2020-10-19 23:40 ` Pavel Begunkov
2020-10-20 14:09 ` Jens Axboe
2020-10-20 16:29 ` Pavel Begunkov
2020-10-20 16:59 ` Jens Axboe
2020-10-22 6:42 ` Xiaoguang Wang
2020-10-22 11:44 ` Pavel Begunkov
2020-10-23 3:33 ` Xiaoguang Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=21aca47e03c82a06e4ea1140b328a86d04d1f422.1603122023.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox