Re: FAILED: patch "[PATCH] io_uring/net: limit inline multishot retries" failed to apply to 6.6-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Tue, Feb 13, 2024 at 07:52:53AM -0700, Jens Axboe wrote:
> On 2/13/24 6:19 AM, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 6.6-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 <stable@vger.kernel.org>.
> > 
> > To reproduce the conflict and resubmit, you may use the following commands:
> > 
> > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 76b367a2d83163cf19173d5cb0b562acbabc8eac
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024021330-twice-pacify-2be5@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
> 
> Here's the series for 6.6-stable.
> 
> -- 
> Jens Axboe
> 

> From 582cc8795c22337041abc7ee06f9de34f1592922 Mon Sep 17 00:00:00 2001
> From: Jens Axboe <axboe@kernel.dk>
> Date: Mon, 29 Jan 2024 11:52:54 -0700
> Subject: [PATCH 1/4] io_uring/poll: move poll execution helpers higher up
> 
> Commit e84b01a880f635e3084a361afba41f95ff500d12 upstream.
> 
> In preparation for calling __io_poll_execute() higher up, move the
> functions to avoid forward declarations.
> 
> No functional changes in this patch.
> 
> Signed-off-by: Jens Axboe <axboe@kernel.dk>
> ---
>  io_uring/poll.c | 30 +++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/io_uring/poll.c b/io_uring/poll.c
> index a4084acaff91..a2f21ae093dc 100644
> --- a/io_uring/poll.c
> +++ b/io_uring/poll.c
> @@ -226,6 +226,30 @@ enum {
>  	IOU_POLL_REISSUE = 3,
>  };
>  
> +static void __io_poll_execute(struct io_kiocb *req, int mask)
> +{
> +	io_req_set_res(req, mask, 0);
> +	/*
> +	 * This is useful for poll that is armed on behalf of another
> +	 * request, and where the wakeup path could be on a different
> +	 * CPU. We want to avoid pulling in req->apoll->events for that
> +	 * case.
> +	 */
> +	if (req->opcode == IORING_OP_POLL_ADD)
> +		req->io_task_work.func = io_poll_task_func;
> +	else
> +		req->io_task_work.func = io_apoll_task_func;
> +
> +	trace_io_uring_task_add(req, mask);
> +	io_req_task_work_add(req);
> +}
> +
> +static inline void io_poll_execute(struct io_kiocb *req, int res)
> +{
> +	if (io_poll_get_ownership(req))
> +		__io_poll_execute(req, res);
> +}
> +
>  /*
>   * All poll tw should go through this. Checks for poll events, manages
>   * references, does rewait, etc.
> @@ -372,30 +396,6 @@ static void io_apoll_task_func(struct io_kiocb *req, bool *locked)
>  		io_req_complete_failed(req, ret);
>  }
>  
> -static void __io_poll_execute(struct io_kiocb *req, int mask)
> -{
> -	io_req_set_res(req, mask, 0);
> -	/*
> -	 * This is useful for poll that is armed on behalf of another
> -	 * request, and where the wakeup path could be on a different
> -	 * CPU. We want to avoid pulling in req->apoll->events for that
> -	 * case.
> -	 */
> -	if (req->opcode == IORING_OP_POLL_ADD)
> -		req->io_task_work.func = io_poll_task_func;
> -	else
> -		req->io_task_work.func = io_apoll_task_func;
> -
> -	trace_io_uring_task_add(req, mask);
> -	io_req_task_work_add(req);
> -}
> -
> -static inline void io_poll_execute(struct io_kiocb *req, int res)
> -{
> -	if (io_poll_get_ownership(req))
> -		__io_poll_execute(req, res);
> -}
> -

This first patch fails to apply to the 6.6.y tree, are you sure you made
it against the correct one?  These functions do not look like this to
me.

confused,

greg k-h