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 3C767C2FC20 for ; Thu, 17 Aug 2023 13:12:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351135AbjHQNMR (ORCPT ); Thu, 17 Aug 2023 09:12:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351358AbjHQNLz (ORCPT ); Thu, 17 Aug 2023 09:11:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E1853AAB; Thu, 17 Aug 2023 06:11:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6FF2F62847; Thu, 17 Aug 2023 13:02:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EAABC433C8; Thu, 17 Aug 2023 13:02:28 +0000 (UTC) Date: Thu, 17 Aug 2023 09:02:33 -0400 From: Steven Rostedt To: Shuah Khan Cc: "Masami Hiramatsu (Google)" , Yipeng Zou , , , Subject: Re: [PATCH v2] selftests/ftrace: traceonoff_triggers: strip off names Message-ID: <20230817090233.1e0a139e@gandalf.local.home> In-Reply-To: <20230817141603.7815300ef7a15df1872bb603@kernel.org> References: <20230817025028.3953490-1-zouyipeng@huawei.com> <20230817141603.7815300ef7a15df1872bb603@kernel.org> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org Shuah, Can you take this in your tree? Reviewed-by: Steven Rostedt (Google) -- Steve On Thu, 17 Aug 2023 14:16:03 +0900 Masami Hiramatsu (Google) wrote: > On Thu, 17 Aug 2023 10:50:28 +0800 > Yipeng Zou wrote: > > > The func_traceonoff_triggers.tc sometimes goes to fail > > on my board, Kunpeng-920. > > > > [root@localhost]# ./ftracetest ./test.d/ftrace/func_traceonoff_triggers.tc -l fail.log > > === Ftrace unit tests === > > [1] ftrace - test for function traceon/off triggers [FAIL] > > [2] (instance) ftrace - test for function traceon/off triggers [UNSUPPORTED] > > > > I look up the log, and it shows that the md5sum is different between csum1 and csum2. > > > > ++ cnt=611 > > ++ sleep .1 > > +++ cnt_trace > > +++ grep -v '^#' trace > > +++ wc -l > > ++ cnt2=611 > > ++ '[' 611 -ne 611 ']' > > +++ cat tracing_on > > ++ on=0 > > ++ '[' 0 '!=' 0 ']' > > +++ md5sum trace > > ++ csum1='76896aa74362fff66a6a5f3cf8a8a500 trace' > > ++ sleep .1 > > +++ md5sum trace > > ++ csum2='ee8625a21c058818fc26e45c1ed3f6de trace' > > ++ '[' '76896aa74362fff66a6a5f3cf8a8a500 trace' '!=' 'ee8625a21c058818fc26e45c1ed3f6de trace' ']' > > ++ fail 'Tracing file is still changing' > > ++ echo Tracing file is still changing > > Tracing file is still changing > > ++ exit_fail > > ++ exit 1 > > > > So I directly dump the trace file before md5sum, the diff shows that: > > > > [root@localhost]# diff trace_1.log trace_2.log -y --suppress-common-lines > > dockerd-12285 [036] d.... 18385.510290: sched_stat | <...>-12285 [036] d.... 18385.510290: sched_stat > > dockerd-12285 [036] d.... 18385.510291: sched_swit | <...>-12285 [036] d.... 18385.510291: sched_swit > > <...>-740 [044] d.... 18385.602859: sched_stat | kworker/44:1-740 [044] d.... 18385.602859: sched_stat > > <...>-740 [044] d.... 18385.602860: sched_swit | kworker/44:1-740 [044] d.... 18385.602860: sched_swit > > > > And we can see that <...> filed be filled with names. > > > > We can strip off the names there to fix that. > > > > After strip off the names: > > > > kworker/u257:0-12 [019] d..2. 2528.758910: sched_stat | -12 [019] d..2. 2528.758910: sched_stat_runtime: comm=k > > kworker/u257:0-12 [019] d..2. 2528.758912: sched_swit | -12 [019] d..2. 2528.758912: sched_switch: prev_comm=kw > > -0 [000] d.s5. 2528.762318: sched_waki | -0 [000] d.s5. 2528.762318: sched_waking: comm=sshd pi > > -0 [037] dNh2. 2528.762326: sched_wake | -0 [037] dNh2. 2528.762326: sched_wakeup: comm=sshd pi > > -0 [037] d..2. 2528.762334: sched_swit | -0 [037] d..2. 2528.762334: sched_switch: prev_comm=sw > > > > Looks good to me. > > Acked-by: Masami Hiramatsu (Google) > > Thank you! > > > Fixes: d87b29179aa0 ("selftests: ftrace: Use md5sum to take less time of checking logs") > > Suggested-by: Steven Rostedt (Google) > > Signed-off-by: Yipeng Zou > > --- > > .../ftrace/test.d/ftrace/func_traceonoff_triggers.tc | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc > > index aee22289536b..c5783999582d 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc > > @@ -90,9 +90,9 @@ if [ $on != "0" ]; then > > fail "Tracing is not off" > > fi > > > > -csum1=`md5sum trace` > > +csum1=`cat trace | sed -e 's/^ *[^ ]*\(-[0-9][0-9]*\)/\1/' | md5sum` > > sleep $SLEEP_TIME > > -csum2=`md5sum trace` > > +csum2=`cat trace | sed -e 's/^ *[^ ]*\(-[0-9][0-9]*\)/\1/' | md5sum` > > > > if [ "$csum1" != "$csum2" ]; then > > fail "Tracing file is still changing" > > -- > > 2.34.1 > > > >