public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 1/8] io_uring: cancel-match based on flags
Date: Thu,  4 Mar 2021 13:59:24 +0000	[thread overview]
Message-ID: <4157ce297803d38e560cbb257cc6dbf81e2d530c.1614866085.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

Instead of going into request internals, like checking req->file->f_op,
do match them based on REQ_F_INFLIGHT, it's set only when we want it to
be reliably cancelled.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 fs/io_uring.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 7cf8d4a99d91..c340d7ba40a2 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -703,7 +703,7 @@ enum {
 
 	/* fail rest of links */
 	REQ_F_FAIL_LINK		= BIT(REQ_F_FAIL_LINK_BIT),
-	/* on inflight list */
+	/* on inflight list, should be cancelled and waited on exit reliably */
 	REQ_F_INFLIGHT		= BIT(REQ_F_INFLIGHT_BIT),
 	/* read/write uses file position */
 	REQ_F_CUR_POS		= BIT(REQ_F_CUR_POS_BIT),
@@ -1069,7 +1069,7 @@ static bool io_match_task(struct io_kiocb *head,
 		return true;
 
 	io_for_each_link(req, head) {
-		if (req->file && req->file->f_op == &io_uring_fops)
+		if (req->flags & REQ_F_INFLIGHT)
 			return true;
 		if (req->task->files == files)
 			return true;
-- 
2.24.0


  reply	other threads:[~2021-03-04 14:05 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-04 13:59 [PATCH 5.12 0/8] remove task file notes Pavel Begunkov
2021-03-04 13:59 ` Pavel Begunkov [this message]
2021-03-04 13:59 ` [PATCH 2/8] io_uring: reliably cancel linked timeouts Pavel Begunkov
2021-03-04 13:59 ` [PATCH 3/8] io_uring: make del_task_file more forgiving Pavel Begunkov
2021-03-04 13:59 ` [PATCH 4/8] io_uring: introduce ctx to tctx back map Pavel Begunkov
2021-03-04 13:59 ` [PATCH 5/8] io_uring: do ctx initiated file note removal Pavel Begunkov
2021-03-04 13:59 ` [PATCH 6/8] io_uring: don't take task ring-file notes Pavel Begunkov
2021-03-04 13:59 ` [PATCH 7/8] io_uring: index io_uring->xa by ctx not file Pavel Begunkov
2021-03-04 13:59 ` [PATCH 8/8] io_uring: warn when ring exit takes too long Pavel Begunkov
2021-03-05  4:25   ` Jens Axboe
2021-03-05 11:15     ` Pavel Begunkov

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=4157ce297803d38e560cbb257cc6dbf81e2d530c.1614866085.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