public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 3/4] io_uring: don't cancel-track common timeouts
Date: Thu, 25 Mar 2021 18:32:44 +0000	[thread overview]
Message-ID: <104441ef5d97e3932113d44501fda0df88656b83.1616696997.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

Don't account usual timeouts (i.e. not linked) as REQ_F_INFLIGHT but
keep behaviour prior to dd59a3d595cc1 ("io_uring: reliably cancel linked
timeouts").

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

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 3fcce81b24cd..fabaf49fefa3 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5564,7 +5564,8 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
 
 	data->mode = io_translate_timeout_mode(flags);
 	hrtimer_init(&data->timer, CLOCK_MONOTONIC, data->mode);
-	io_req_track_inflight(req);
+	if (is_timeout_link)
+		io_req_track_inflight(req);
 	return 0;
 }
 
-- 
2.24.0


  parent reply	other threads:[~2021-03-25 18:37 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-25 18:32 [PATCH 5.12 0/4] cancellation fixes Pavel Begunkov
2021-03-25 18:32 ` [PATCH 1/4] io_uring: fix timeout cancel return code Pavel Begunkov
2021-03-25 18:32 ` [PATCH 2/4] io_uring: do post-completion chore on t-out cancel Pavel Begunkov
2021-03-25 18:32 ` Pavel Begunkov [this message]
2021-03-25 18:32 ` [PATCH 4/4] io_uring: don't cancel extra on files match Pavel Begunkov
2021-03-26 15:55 ` [PATCH 5.12 0/4] cancellation fixes Jens Axboe

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=104441ef5d97e3932113d44501fda0df88656b83.1616696997.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