stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vincent Guittot <vincent.guittot@linaro.org>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Ben Segall <bsegall@google.com>, Phil Auld <pauld@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Tao Zhou <zohooouoto@zoho.com.cn>,
	"# v4 . 16+" <stable@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] sched/fair: Fix unthrottle_cfs_rq() for leaf_cfs_rq list" failed to apply to 5.4-stable tree
Date: Sun, 6 Dec 2020 13:10:48 +0100	[thread overview]
Message-ID: <CAKfTPtCuohx7dYXm4tgA9JujEAfOv0dSVPjjFz2VNw9dzcBCHA@mail.gmail.com> (raw)
In-Reply-To: <X8zJbSgaegj5He+i@kroah.com>

On Sun, 6 Dec 2020 at 13:05, Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Sun, Dec 06, 2020 at 12:54:57PM +0100, Vincent Guittot wrote:
> > On Sun, 6 Dec 2020 at 12:47, Greg KH <gregkh@linuxfoundation.org> wrote:
> > >
> > > On Sun, Dec 06, 2020 at 12:25:12PM +0100, Vincent Guittot wrote:
> > > > On Sun, 6 Dec 2020 at 10:56, Greg KH <gregkh@linuxfoundation.org> wrote:
> > > > >
> > > > > On Mon, May 25, 2020 at 07:27:09PM +0200, Vincent Guittot wrote:
> > > > > > Le lundi 25 mai 2020 à 16:42:49 (+0200), gregkh@linuxfoundation.org a écrit :
> > > > > > >
> > > > > > > The patch below does not apply to the 5.4-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>.
> > > > > >
> > > > > > This patch needs  commit
> > > > > >     b34cb07dde7c ("sched/fair: Fix enqueue_task_fair() warning some more")
> > > > > > to be applied first. But then, it will not apply. The backport is :
> > > > > >
> > > > > > [ Upstream commit 39f23ce07b9355d05a64ae303ce20d1c4b92b957 upstream ]
> > > > > >
> > > > > > Although not exactly identical, unthrottle_cfs_rq() and enqueue_task_fair()
> > > > > > are quite close and follow the same sequence for enqueuing an entity in the
> > > > > > cfs hierarchy. Modify unthrottle_cfs_rq() to use the same pattern as
> > > > > > enqueue_task_fair(). This fixes a problem already faced with the latter and
> > > > > > add an optimization in the last for_each_sched_entity loop.
> > > > > >
> > > > > > Fixes: fe61468b2cb (sched/fair: Fix enqueue_task_fair warning)
> > > > > > Reported-by Tao Zhou <zohooouoto@zoho.com.cn>
> > > > > > Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
> > > > > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> > > > > > Reviewed-by: Phil Auld <pauld@redhat.com>
> > > > > > Reviewed-by: Ben Segall <bsegall@google.com>
> > > > > > Link: https://lkml.kernel.org/r/20200513135528.4742-1-vincent.guittot@linaro.org
> > > > > > ---
> > > > > >  kernel/sched/fair.c | 36 ++++++++++++++++++++++++++++--------
> > > > > >  1 file changed, 28 insertions(+), 8 deletions(-)
> > > > >
> > > > > This patch doesn't apply to the 5.4.y tree at all.  Can someone please
> > > > > provide a working backport?
> > > >
> > > > It seems that commit b34cb07dde7c ("sched/fair: Fix
> > > > enqueue_task_fair() warning some more") has already been applied back
> > > > in May. But then, I'm able to apply this patch on top of
> > > > v5.4.y/v5.4.81
> > > >
> > >
> > > What is "this patch" here?  I tried to apply 39f23ce07b93 ("sched/fair:
> > > Fix unthrottle_cfs_rq() for leaf_cfs_rq list") directly to the 5.4 tree
> > > and it too did not apply.
> >
> > commit 39f23ce07b93 ("sched/fair: Fix unthrottle_cfs_rq() for
> > leaf_cfs_rq list") can't apply because there are several changes which
> > are not fixes which have been applied since v5.4 on the same code.
> >
> > This patch is the backport on v5.4 of the commit 39f23ce07b93
>
> What is "this"?  I tried to apply the above patch to the 5.4.y tree, and

I was referring to the email  <20200525172709.GB7427@vingu-book>

> it didn't apply.  So I still do not understand what I can do here...

Let me resend it with a clean subject title

>
> greg k-h

  reply	other threads:[~2020-12-06 12:11 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-25 14:42 FAILED: patch "[PATCH] sched/fair: Fix unthrottle_cfs_rq() for leaf_cfs_rq list" failed to apply to 5.4-stable tree gregkh
2020-05-25 17:27 ` Vincent Guittot
2020-05-26  0:22   ` Sasha Levin
2020-12-06  9:57   ` Greg KH
2020-12-06 11:25     ` Vincent Guittot
2020-12-06 11:40       ` Greg KH
2020-12-06 11:54         ` Vincent Guittot
2020-12-06 12:07           ` Greg KH
2020-12-06 12:10             ` Vincent Guittot [this message]
2020-12-06 15:18             ` Sasha Levin
2020-11-19 14:56 Guilherme G. Piccoli
2020-11-19 14:57 ` Guilherme Piccoli
     [not found]   ` <BN8PR12MB297872B12C4DBE0793605F9B9AE00@BN8PR12MB2978.namprd12.prod.outlook.com>
2020-11-19 17:45     ` Guilherme Piccoli
2020-11-19 18:57 ` Sasha Levin
2020-11-20  5:04   ` Nivedita Singhvi
2020-12-01 15:03 ` Guilherme G. Piccoli
2020-12-02  7:51   ` Greg KH
2020-12-02  8:21     ` Vincent Guittot
2020-12-02  9:44       ` Peter Zijlstra
2020-12-02 13:52         ` Sasha Levin
2020-12-06  9:57 ` Greg KH
2020-12-11  4:00   ` Nivedita Singhvi

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=CAKfTPtCuohx7dYXm4tgA9JujEAfOv0dSVPjjFz2VNw9dzcBCHA@mail.gmail.com \
    --to=vincent.guittot@linaro.org \
    --cc=bsegall@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=pauld@redhat.com \
    --cc=peterz@infradead.org \
    --cc=stable@vger.kernel.org \
    --cc=zohooouoto@zoho.com.cn \
    /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;
as well as URLs for NNTP newsgroup(s).