public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: asml.silence@gmail.com, axboe@kernel.dk, stable-commits@vger.kernel.org
Subject: Re: Patch "io_uring: fail links of cancelled timeouts" has been added to the 5.13-stable tree
Date: Mon, 13 Sep 2021 12:49:07 +0200	[thread overview]
Message-ID: <YT8so5i420vp4LRZ@kroah.com> (raw)
In-Reply-To: <163152631411232@kroah.com>

On Mon, Sep 13, 2021 at 11:45:14AM +0200, gregkh@linuxfoundation.org wrote:
> 
> This is a note to let you know that I've just added the patch titled
> 
>     io_uring: fail links of cancelled timeouts
> 
> to the 5.13-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> 
> The filename of the patch is:
>      io_uring-fail-links-of-cancelled-timeouts.patch
> and it can be found in the queue-5.13 subdirectory.
> 
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
> 
> 
> >From 2ae2eb9dde18979b40629dd413b9adbd6c894cdf Mon Sep 17 00:00:00 2001
> From: Pavel Begunkov <asml.silence@gmail.com>
> Date: Thu, 9 Sep 2021 13:56:27 +0100
> Subject: io_uring: fail links of cancelled timeouts
> 
> From: Pavel Begunkov <asml.silence@gmail.com>
> 
> commit 2ae2eb9dde18979b40629dd413b9adbd6c894cdf upstream.
> 
> When we cancel a timeout we should mark it with REQ_F_FAIL, so
> linked requests are cancelled as well, but not queued for further
> execution.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
> Link: https://lore.kernel.org/r/fff625b44eeced3a5cae79f60e6acf3fbdf8f990.1631192135.git.asml.silence@gmail.com
> Signed-off-by: Jens Axboe <axboe@kernel.dk>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  fs/io_uring.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -1307,6 +1307,8 @@ static void io_kill_timeout(struct io_ki
>  	struct io_timeout_data *io = req->async_data;
>  
>  	if (hrtimer_try_to_cancel(&io->timer) != -1) {
> +		if (status)
> +			req_set_fail(req);
>  		atomic_set(&req->ctx->cq_timeouts,
>  			atomic_read(&req->ctx->cq_timeouts) + 1);
>  		list_del_init(&req->timeout.list);
> 
> 
> Patches currently in stable-queue which might be from asml.silence@gmail.com are
> 
> queue-5.13/io_uring-limit-fixed-table-size-by-rlimit_nofile.patch
> queue-5.13/io_uring-reexpand-under-reexpanded-iters.patch
> queue-5.13/io_uring-fail-links-of-cancelled-timeouts.patch
> queue-5.13/bio-fix-page-leak-bio_add_hw_page-failure.patch
> queue-5.13/io_uring-refactor-io_submit_flush_completions.patch

Breaks the build on 5.13.y so dropping it from there.

thanks,

greg k-h

           reply	other threads:[~2021-09-13 10:49 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <163152631411232@kroah.com>]

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=YT8so5i420vp4LRZ@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=asml.silence@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable-commits@vger.kernel.org \
    /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