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 7043BC001DC for ; Fri, 14 Jul 2023 02:38:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234364AbjGNCiG (ORCPT ); Thu, 13 Jul 2023 22:38:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234464AbjGNCiE (ORCPT ); Thu, 13 Jul 2023 22:38:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D2312D4B; Thu, 13 Jul 2023 19:38:02 -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 22C4261BCD; Fri, 14 Jul 2023 02:38:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3470C433C7; Fri, 14 Jul 2023 02:37:59 +0000 (UTC) Date: Thu, 13 Jul 2023 22:37:58 -0400 From: Steven Rostedt To: Ajay Kaher Cc: shuah@kernel.org, mhiramat@kernel.org, chinglinyu@google.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org, lkp@intel.com, namit@vmware.com, oe-lkp@lists.linux.dev, amakhalov@vmware.com, er.ajay.kaher@gmail.com, srivatsa@csail.mit.edu, tkundu@vmware.com, vsirnapalli@vmware.com Subject: Re: [PATCH v4 10/10] test: ftrace: Fix kprobe test for eventfs Message-ID: <20230713223758.31a1e391@rorschach.local.home> In-Reply-To: <1689248004-8158-11-git-send-email-akaher@vmware.com> References: <1689248004-8158-1-git-send-email-akaher@vmware.com> <1689248004-8158-11-git-send-email-akaher@vmware.com> X-Mailer: Claws Mail 3.17.8 (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 Thu, 13 Jul 2023 17:03:24 +0530 Ajay Kaher wrote: > kprobe_args_char.tc, kprobe_args_string.tc has validation check > for tracefs_create_dir, for eventfs it should be eventfs_create_dir. > > Signed-off-by: Ajay Kaher > Co-developed-by: Steven Rostedt (VMware) > Signed-off-by: Steven Rostedt (VMware) > Tested-by: Ching-lin Yu > Acked-by: Masami Hiramatsu (Google) As this patch as is will break when running on older kernels, I was wondering if we should do this instead? diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc index 285b4770efad..ff7499eb98d6 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc @@ -34,14 +34,19 @@ mips*) esac : "Test get argument (1)" -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):char" > kprobe_events +if grep -q eventfs_add_dir available_filter_functions; then + DIR_NAME="eventfs_add_dir" +else + DIR_NAME="tracefs_create_dir" +fi +echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):char" > kprobe_events echo 1 > events/kprobes/testprobe/enable echo "p:test $FUNCTION_FORK" >> kprobe_events grep -qe "testprobe.* arg1='t'" trace echo 0 > events/kprobes/testprobe/enable : "Test get argument (2)" -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):char arg2=+0(${ARG1}):char[4]" > kprobe_events +echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):char arg2=+0(${ARG1}):char[4]" > kprobe_events echo 1 > events/kprobes/testprobe/enable echo "p:test $FUNCTION_FORK" >> kprobe_events grep -qe "testprobe.* arg1='t' arg2={'t','e','s','t'}" trace diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc index a4f8e7c53c1f..a202b2ea4baf 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc @@ -37,14 +37,19 @@ loongarch*) esac : "Test get argument (1)" -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string" > kprobe_events +if grep -q eventfs_add_dir available_filter_functions; then + DIR_NAME="eventfs_add_dir" +else + DIR_NAME="tracefs_create_dir" +fi +echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):string" > kprobe_events echo 1 > events/kprobes/testprobe/enable echo "p:test $FUNCTION_FORK" >> kprobe_events grep -qe "testprobe.* arg1=\"test\"" trace echo 0 > events/kprobes/testprobe/enable : "Test get argument (2)" -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events +echo "p:testprobe ${DIR_NAME} arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events echo 1 > events/kprobes/testprobe/enable echo "p:test $FUNCTION_FORK" >> kprobe_events grep -qe "testprobe.* arg1=\"test\" arg2=\"test\"" trace -- Steve > --- > .../selftests/ftrace/test.d/kprobe/kprobe_args_char.tc | 4 ++-- > .../selftests/ftrace/test.d/kprobe/kprobe_args_string.tc | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc > index 285b4770efad..523cfb64539f 100644 > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc > @@ -34,14 +34,14 @@ mips*) > esac > > : "Test get argument (1)" > -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):char" > kprobe_events > +echo "p:testprobe eventfs_add_dir arg1=+0(${ARG1}):char" > kprobe_events > echo 1 > events/kprobes/testprobe/enable > echo "p:test $FUNCTION_FORK" >> kprobe_events > grep -qe "testprobe.* arg1='t'" trace > > echo 0 > events/kprobes/testprobe/enable > : "Test get argument (2)" > -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):char arg2=+0(${ARG1}):char[4]" > kprobe_events > +echo "p:testprobe eventfs_add_dir arg1=+0(${ARG1}):char arg2=+0(${ARG1}):char[4]" > kprobe_events > echo 1 > events/kprobes/testprobe/enable > echo "p:test $FUNCTION_FORK" >> kprobe_events > grep -qe "testprobe.* arg1='t' arg2={'t','e','s','t'}" trace > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc > index a4f8e7c53c1f..b9f8c3f8bae8 100644 > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc > @@ -37,14 +37,14 @@ loongarch*) > esac > > : "Test get argument (1)" > -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string" > kprobe_events > +echo "p:testprobe eventfs_add_dir arg1=+0(${ARG1}):string" > kprobe_events > echo 1 > events/kprobes/testprobe/enable > echo "p:test $FUNCTION_FORK" >> kprobe_events > grep -qe "testprobe.* arg1=\"test\"" trace > > echo 0 > events/kprobes/testprobe/enable > : "Test get argument (2)" > -echo "p:testprobe tracefs_create_dir arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events > +echo "p:testprobe eventfs_add_dir arg1=+0(${ARG1}):string arg2=+0(${ARG1}):string" > kprobe_events > echo 1 > events/kprobes/testprobe/enable > echo "p:test $FUNCTION_FORK" >> kprobe_events > grep -qe "testprobe.* arg1=\"test\" arg2=\"test\"" trace