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 5F09BC77B7A for ; Thu, 25 May 2023 02:24:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229489AbjEYCYQ (ORCPT ); Wed, 24 May 2023 22:24:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236525AbjEYCYP (ORCPT ); Wed, 24 May 2023 22:24:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68117139; Wed, 24 May 2023 19:24:14 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 03EB1635A0; Thu, 25 May 2023 02:24:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F0FEC433D2; Thu, 25 May 2023 02:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684981453; bh=1XyJN682bKPmnrFMOUA/Rz8FyBhig9nJpB9ztqCBcMA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=UDEj8I3OQISu5wf/9VcTweiPKsdAojV5u/bdpiZ76ZZeRJmm0NuU7d2PHyvTL7njK d8A3DpR/AMg7zrSetNBn/55/5Pza0YtFdIa1gBPMaKMEdDWqnNgTYnRKHLGXjuK7/U WF/mQ7Hj/+wVbSO/gMBsnUPvndFEW5x+k+l0WgzjrO1aoMnDePhaHyLqb9ZKNFUi6G zyZxqHGByC7Ds0cjyCxvWacmZrytuaPkhQ57OjM5fuRl1J7H/DCAdTgNSjDPsF+MBv 6MN1Eqc1YhJud4XYlX5di0PEFunkYoxqOkqg/nn6loUCe8yFTzWo4JECqhvOyaYZWe eAR7Fy5Kq1lMQ== Date: Thu, 25 May 2023 10:24:08 +0800 From: Masami Hiramatsu (Google) To: Steven Rostedt Cc: LKML , Linux trace kernel , Masami Hiramatsu , Tom Zanussi , Mark Rutland , Shuah Khan , Shuah Khan , linux-kselftest@vger.kernel.org Subject: Re: [PATCH] tracing/selftests: Update synthetic event selftest to use common_stacktrace Message-Id: <20230525102408.4b2750621cb1deeb05e58980@kernel.org> In-Reply-To: <20230523225402.55951f2f@rorschach.local.home> References: <20230523225402.55951f2f@rorschach.local.home> X-Mailer: Sylpheed 3.8.0beta1 (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 On Tue, 23 May 2023 22:54:29 -0400 Steven Rostedt wrote: > From: "Steven Rostedt (Google)" > > With the rename of the stacktrace field to common_stacktrace, update the > selftests to reflect this change. Copy the current selftest to test the > backward compatibility "stacktrace" keyword. Also the "requires" of that > test was incorrect, so it would never actually ran before. That is fixed > now. > > Signed-off-by: Steven Rostedt (Google) Looks good to me. Acked-by: Masami Hiramatsu (Google) Thanks, > --- > .../trigger-synthetic-event-stack-legacy.tc | 24 +++++++++++++++++++ > .../trigger-synthetic-event-stack.tc | 5 ++-- > 2 files changed, 26 insertions(+), 3 deletions(-) > create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc > > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc > new file mode 100644 > index 000000000000..d0cd91a93069 > --- /dev/null > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc > @@ -0,0 +1,24 @@ > +#!/bin/sh > +# SPDX-License-Identifier: GPL-2.0 > +# description: event trigger - test inter-event histogram trigger trace action with dynamic string param (legacy stack) > +# requires: set_event synthetic_events events/sched/sched_process_exec/hist "long[] stack' >> synthetic_events":README > + > +fail() { #msg > + echo $1 > + exit_fail > +} > + > +echo "Test create synthetic event with stack" > + > +# Test the old stacktrace keyword (for backward compatibility) > +echo 's:wake_lat pid_t pid; u64 delta; unsigned long[] stack;' > dynamic_events > +echo 'hist:keys=next_pid:ts=common_timestamp.usecs,st=stacktrace if prev_state == 1||prev_state == 2' >> events/sched/sched_switch/trigger > +echo 'hist:keys=prev_pid:delta=common_timestamp.usecs-$ts,s=$st:onmax($delta).trace(wake_lat,prev_pid,$delta,$s)' >> events/sched/sched_switch/trigger > +echo 1 > events/synthetic/wake_lat/enable > +sleep 1 > + > +if ! grep -q "=>.*sched" trace; then > + fail "Failed to create synthetic event with stack" > +fi > + > +exit 0 > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc > index 755dbe94ccf4..8f1cc9a86a06 100644 > --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc > @@ -1,7 +1,7 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > # description: event trigger - test inter-event histogram trigger trace action with dynamic string param > -# requires: set_event synthetic_events events/sched/sched_process_exec/hist "long[]' >> synthetic_events":README > +# requires: set_event synthetic_events events/sched/sched_process_exec/hist "can be any field, or the special string 'common_stacktrace'":README > > fail() { #msg > echo $1 > @@ -10,9 +10,8 @@ fail() { #msg > > echo "Test create synthetic event with stack" > > - > echo 's:wake_lat pid_t pid; u64 delta; unsigned long[] stack;' > dynamic_events > -echo 'hist:keys=next_pid:ts=common_timestamp.usecs,st=stacktrace if prev_state == 1||prev_state == 2' >> events/sched/sched_switch/trigger > +echo 'hist:keys=next_pid:ts=common_timestamp.usecs,st=common_stacktrace if prev_state == 1||prev_state == 2' >> events/sched/sched_switch/trigger > echo 'hist:keys=prev_pid:delta=common_timestamp.usecs-$ts,s=$st:onmax($delta).trace(wake_lat,prev_pid,$delta,$s)' >> events/sched/sched_switch/trigger > echo 1 > events/synthetic/wake_lat/enable > sleep 1 > -- > 2.39.2 > -- Masami Hiramatsu (Google)