From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30395C4361B for ; Sun, 6 Dec 2020 12:06:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E518122C7D for ; Sun, 6 Dec 2020 12:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727151AbgLFMGi (ORCPT ); Sun, 6 Dec 2020 07:06:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:54158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725767AbgLFMGh (ORCPT ); Sun, 6 Dec 2020 07:06:37 -0500 Date: Sun, 6 Dec 2020 13:07:09 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1607256356; bh=HykN30l+JNQ7Az9wYE07hKTyOFCtswEBbQAICUYD3c0=; h=From:To:Cc:Subject:References:In-Reply-To:From; b=rAUSLk2TZReZkSdbA6qON+BeneWgCUu8i5W4o82Mih6A80mceUnozCVIcCJ8IYYHY vhjx+xw8C77Zlo5/LX8A74FMc722AZtD04T2H6VMhu9Ty4rMXks6RxLi7ICGAstsxx e8uxMsiWfKfoGaizfnxy38IxipDk7ywGAbwaDCqk= From: Greg KH To: Vincent Guittot Cc: Ben Segall , Phil Auld , Peter Zijlstra , Tao Zhou , "# v4 . 16+" Subject: Re: FAILED: patch "[PATCH] sched/fair: Fix unthrottle_cfs_rq() for leaf_cfs_rq list" failed to apply to 5.4-stable tree Message-ID: References: <159041776924279@kroah.com> <20200525172709.GB7427@vingu-book> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Sun, Dec 06, 2020 at 12:54:57PM +0100, Vincent Guittot wrote: > On Sun, 6 Dec 2020 at 12:47, Greg KH wrote: > > > > On Sun, Dec 06, 2020 at 12:25:12PM +0100, Vincent Guittot wrote: > > > On Sun, 6 Dec 2020 at 10:56, Greg KH 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 . > > > > > > > > > > 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 > > > > > Signed-off-by: Vincent Guittot > > > > > Signed-off-by: Peter Zijlstra (Intel) > > > > > Reviewed-by: Phil Auld > > > > > Reviewed-by: Ben Segall > > > > > 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 it didn't apply. So I still do not understand what I can do here... greg k-h