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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5E37C433EF for ; Mon, 11 Apr 2022 07:28:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245396AbiDKHay (ORCPT ); Mon, 11 Apr 2022 03:30:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231654AbiDKHat (ORCPT ); Mon, 11 Apr 2022 03:30:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA9153980C; Mon, 11 Apr 2022 00:28:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6CBDFB810A9; Mon, 11 Apr 2022 07:28:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DA9DC385AA; Mon, 11 Apr 2022 07:28:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649662113; bh=2/oel7D/T3xFqsHucMWFI9RxFKXj0LlHoDy+p6l+hS0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dMjzYz2P5ugiPBC4qpENXS23ET/WKy+OmwhbtRJJ45YkrLx7QTkwio6TaetOMFPbK YKcNhhTjxBzhxMw8JIb2mksOq1KKt0/Wb8ryYpNNnZnLK0ACq2JORejuHT8TGDYBcN /clbVSFzlkP/C5O/k8WE8egauvNWj2arZgNyxcoQ= Date: Mon, 11 Apr 2022 09:28:30 +0200 From: Greg KH To: Holger =?iso-8859-1?Q?Hoffst=E4tte?= Cc: Qais Yousef , linux-kernel@vger.kernel.org, linux-tip-commits@vger.kernel.org, Abhijeet Dharmapurikar , Valentin Schneider , "Peter Zijlstra (Intel)" , "Steven Rostedt (Google)" , x86@kernel.org, stable@vger.kernel.org Subject: Re: [tip: sched/core] sched/tracing: Don't re-read p->state when emitting sched_switch event Message-ID: References: <20220120162520.570782-2-valentin.schneider@arm.com> <164614827941.16921.4995078681021904041.tip-bot2@tip-bot2> <20220308180240.qivyjdn4e3te3urm@wubuntu> <20220308185138.ldxfqd242uxowymd@wubuntu> <20220409233829.o2s6tffuzujkx6w2@airbuntu> <20220410220608.cdf6hmf5mwcqzwun@airbuntu> 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: linux-kernel@vger.kernel.org On Mon, Apr 11, 2022 at 09:18:19AM +0200, Holger Hoffstätte wrote: > On 2022-04-11 01:22, Holger Hoffstätte wrote: > > On 2022-04-11 00:06, Qais Yousef wrote: > > > On 04/10/22 00:38, Qais Yousef wrote: > > > > On 03/08/22 18:51, Qais Yousef wrote: > > > > > On 03/08/22 19:10, Greg KH wrote: > > > > > > On Tue, Mar 08, 2022 at 06:02:40PM +0000, Qais Yousef wrote: > > > > > > > +CC stable > > > > > > > > > > > > > > On 03/01/22 15:24, tip-bot2 for Valentin Schneider wrote: > > > > > > > > The following commit has been merged into the sched/core branch of tip: > > > > > > > > > > > > > > > > Commit-ID:     fa2c3254d7cfff5f7a916ab928a562d1165f17bb > > > > > > > > Gitweb:        https://git.kernel.org/tip/fa2c3254d7cfff5f7a916ab928a562d1165f17bb > > > > > > > > Author:        Valentin Schneider > > > > > > > > AuthorDate:    Thu, 20 Jan 2022 16:25:19 > > > > > > > > Committer:     Peter Zijlstra > > > > > > > > CommitterDate: Tue, 01 Mar 2022 16:18:39 +01:00 > > > > > > > > > > > > > > > > sched/tracing: Don't re-read p->state when emitting sched_switch event > > > > > > > > > > > > > > > > As of commit > > > > > > > > > > > > > > > >    c6e7bd7afaeb ("sched/core: Optimize ttwu() spinning on p->on_cpu") > > > > > > > > > > > > > > > > the following sequence becomes possible: > > > > > > > > > > > > > > > >               p->__state = TASK_INTERRUPTIBLE; > > > > > > > >               __schedule() > > > > > > > >             deactivate_task(p); > > > > > > > >    ttwu() > > > > > > > >      READ !p->on_rq > > > > > > > >      p->__state=TASK_WAKING > > > > > > > >             trace_sched_switch() > > > > > > > >               __trace_sched_switch_state() > > > > > > > >                 task_state_index() > > > > > > > >                   return 0; > > > > > > > > > > > > > > > > TASK_WAKING isn't in TASK_REPORT, so the task appears as TASK_RUNNING in > > > > > > > > the trace event. > > > > > > > > > > > > > > > > Prevent this by pushing the value read from __schedule() down the trace > > > > > > > > event. > > > > > > > > > > > > > > > > Reported-by: Abhijeet Dharmapurikar > > > > > > > > Signed-off-by: Valentin Schneider > > > > > > > > Signed-off-by: Peter Zijlstra (Intel) > > > > > > > > Reviewed-by: Steven Rostedt (Google) > > > > > > > > Link: https://lore.kernel.org/r/20220120162520.570782-2-valentin.schneider@arm.com > > > > > > > > > > > > > > Any objection to picking this for stable? I'm interested in this one for some > > > > > > > Android users but prefer if it can be taken by stable rather than backport it > > > > > > > individually. > > > > > > > > > > > > > > I think it makes sense to pick the next one in the series too. > > > > > > > > > > > > What commit does this fix in Linus's tree? > > > > > > > > > > It should be this one: c6e7bd7afaeb ("sched/core: Optimize ttwu() spinning on p->on_cpu") > > > > > > > > Should this be okay to be picked up by stable now? I can see AUTOSEL has picked > > > > it up for v5.15+, but it impacts v5.10 too. > > > > > > commit: fa2c3254d7cfff5f7a916ab928a562d1165f17bb > > > subject: sched/tracing: Don't re-read p->state when emitting sched_switch event > > > > > > This patch has an impact on Android 5.10 users who experience tooling breakage. > > > Is it possible to include in 5.10 LTS please? > > > > > > It was already picked up for 5.15+ by AUTOSEL and only 5.10 is missing. > > > > > > > https://lore.kernel.org/stable/Yk2PQzynOVOzJdPo@kroah.com/ > > > > However, since then further investigation (still in progress) has shown that this > > may have been the fault of the tool in question, so if you can verify that tracing > > sched still works for you with this patch in 5.15.x then by all means > > let's merge it. > > So it turns out the lockup is indeed the fault of the tool, which contains multiple > kernel-version dependent tracepoint definitions and now fails with this > patch. What tools is this? > Greg, please re-enqueue this patch where necessary (5.10, 5.15+) If I queue it up again, will the tools keep breaking? thanks, greg k-hj