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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2A838C54FCB for ; Wed, 22 Apr 2020 15:26:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F392020774 for ; Wed, 22 Apr 2020 15:26:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587569191; bh=Aw8Gbk8zozdmoRoJ/Poa7XJslFSRFgQqqCXuQEzIve8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=lUC8teYwyu8Yb5LaKoe3y1nyzet1VCOs41jsoAbXyy1jqWvc7qvncIyVwt/OSbKrI +sR73v759szZz9ndMhH6lJ3BnVQUcrl6VJIZgyzPT25D7NrSj+yU9dk6RfMp1jQE61 PinM1oWHPjELTasCU2zuMWlmIdHmXIBRmU2X2QWQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726161AbgDVP0a (ORCPT ); Wed, 22 Apr 2020 11:26:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:46196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726006AbgDVP0a (ORCPT ); Wed, 22 Apr 2020 11:26:30 -0400 Received: from devnote2 (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 709702074B; Wed, 22 Apr 2020 15:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587569189; bh=Aw8Gbk8zozdmoRoJ/Poa7XJslFSRFgQqqCXuQEzIve8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BOryurO0/K4HA/fk3jGpvlg4fmkQlRwFPkwdIyCCWLNg/aUDjSP898LL0uLkLWcHH JvEmbOcVvpYZQRFH/w7jp/pV0zj/NtfAVxn6QqjIGv0jxNbZqhi+i8xXy2BFlGZJEY 8d3e3J2r947dfZc/L/pyoOQ1Xm3RfMBVkqFpUAZ8= Date: Thu, 23 Apr 2020 00:26:24 +0900 From: Masami Hiramatsu To: Steven Rostedt Cc: Xiao Yang , , , , Masami Hiramatsu , Shuah Khan Subject: Re: [PATCH] selftests/ftrace: Check required filter files before running test Message-Id: <20200423002624.b315fc63d3699a4dd494ff8e@kernel.org> In-Reply-To: <20200422092110.6a4f0cfb@gandalf.local.home> References: <20200422095807.548519-1-yangx.jy@cn.fujitsu.com> <20200422092110.6a4f0cfb@gandalf.local.home> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On Wed, 22 Apr 2020 09:21:10 -0400 Steven Rostedt wrote: > On Wed, 22 Apr 2020 17:58:07 +0800 > Xiao Yang wrote: > > > Without CONFIG_DYNAMIC_FTRACE, some tests get failure because required > > filter files(set_ftrace_filter/available_filter_functions/stack_trace_filter) > > are missing. So implement check_filter_file() and make all related tests > > check required filter files by it. > > > > BTW: set_ftrace_filter and available_filter_functions are introduced together > > so just check either of them. > > I'm fine with that. > > I'd like an Acked-by from Masami, and then Shauh, can you take this? This looks good to me too. please pick it up. Acked-by: Masami Hiramatsu Thank you, > > -- Steve > > > > > Signed-off-by: Xiao Yang > > --- > > .../selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc | 5 +---- > > .../testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc | 2 ++ > > .../selftests/ftrace/test.d/ftrace/func-filter-glob.tc | 2 ++ > > .../ftrace/test.d/ftrace/func-filter-notrace-pid.tc | 5 +---- > > .../selftests/ftrace/test.d/ftrace/func-filter-pid.tc | 5 +---- > > .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 2 +- > > .../selftests/ftrace/test.d/ftrace/func_event_triggers.tc | 5 +---- > > .../selftests/ftrace/test.d/ftrace/func_mod_trace.tc | 2 +- > > .../testing/selftests/ftrace/test.d/ftrace/func_profiler.tc | 5 +---- > > .../selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc | 5 +---- > > .../selftests/ftrace/test.d/ftrace/func_stack_tracer.tc | 2 ++ > > .../ftrace/test.d/ftrace/func_traceonoff_triggers.tc | 5 +---- > > tools/testing/selftests/ftrace/test.d/functions | 6 ++++++ > > .../testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 2 ++ > > 14 files changed, 23 insertions(+), 30 deletions(-) > > > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc b/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc > > index aefab0c66d54..f59853857ad2 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc > > @@ -10,10 +10,7 @@ if ! grep -q function_graph available_tracers; then > > exit_unsupported > > fi > > > > -if [ ! -f set_ftrace_filter ]; then > > - echo "set_ftrace_filter not found? Is dynamic ftrace not set?" > > - exit_unsupported > > -fi > > +check_filter_file set_ftrace_filter > > > > do_reset() { > > if [ -e /proc/sys/kernel/stack_tracer_enabled ]; then > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc b/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc > > index c8a5209f2119..d610f47edd90 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc > > @@ -9,6 +9,8 @@ if ! grep -q function_graph available_tracers; then > > exit_unsupported > > fi > > > > +check_filter_file set_ftrace_filter > > + > > fail() { # msg > > echo $1 > > exit_fail > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc > > index f4e92afab14b..28936f434ee5 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc > > @@ -9,6 +9,8 @@ if ! grep -q function available_tracers; then > > exit_unsupported > > fi > > > > +check_filter_file set_ftrace_filter > > + > > disable_tracing > > clear_trace > > > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-notrace-pid.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-notrace-pid.tc > > index 8aa46a2ea133..71db68a7975f 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-notrace-pid.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-notrace-pid.tc > > @@ -15,10 +15,7 @@ if [ ! -f set_ftrace_notrace_pid ]; then > > exit_unsupported > > fi > > > > -if [ ! -f set_ftrace_filter ]; then > > - echo "set_ftrace_filter not found? Is function tracer not set?" > > - exit_unsupported > > -fi > > +check_filter_file set_ftrace_filter > > > > do_function_fork=1 > > > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc > > index f2ee1e889e13..d58403c4b7cd 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc > > @@ -16,10 +16,7 @@ if [ ! -f set_ftrace_pid ]; then > > exit_unsupported > > fi > > > > -if [ ! -f set_ftrace_filter ]; then > > - echo "set_ftrace_filter not found? Is function tracer not set?" > > - exit_unsupported > > -fi > > +check_filter_file set_ftrace_filter > > > > do_function_fork=1 > > > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-stacktrace.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-stacktrace.tc > > index 1a52f2883fe0..b2aff786c1a2 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-stacktrace.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-stacktrace.tc > > @@ -3,7 +3,7 @@ > > # description: ftrace - stacktrace filter command > > # flags: instance > > > > -[ ! -f set_ftrace_filter ] && exit_unsupported > > +check_filter_file set_ftrace_filter > > > > echo _do_fork:stacktrace >> set_ftrace_filter > > > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc > > index ca2ffd7957f9..e9b1fd534e96 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc > > @@ -11,10 +11,7 @@ > > # > > > > # The triggers are set within the set_ftrace_filter file > > -if [ ! -f set_ftrace_filter ]; then > > - echo "set_ftrace_filter not found? Is dynamic ftrace not set?" > > - exit_unsupported > > -fi > > +check_filter_file set_ftrace_filter > > > > do_reset() { > > reset_ftrace_filter > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_mod_trace.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_mod_trace.tc > > index 9330c873f9fe..1a4b4a442d33 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_mod_trace.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_mod_trace.tc > > @@ -2,7 +2,7 @@ > > # SPDX-License-Identifier: GPL-2.0 > > # description: ftrace - function trace on module > > > > -[ ! -f set_ftrace_filter ] && exit_unsupported > > +check_filter_file set_ftrace_filter > > > > : "mod: allows to filter a non exist function" > > echo 'non_exist_func:mod:non_exist_module' > set_ftrace_filter > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc > > index dfbae637c60c..a3dadb6b93b4 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc > > @@ -18,10 +18,7 @@ if ! grep -q function_graph available_tracers; then > > exit_unsupported; > > fi > > > > -if [ ! -f set_ftrace_filter ]; then > > - echo "set_ftrace_filter not found? Is dynamic ftrace not set?" > > - exit_unsupported > > -fi > > +check_filter_file set_ftrace_filter > > > > if [ ! -f function_profile_enabled ]; then > > echo "function_profile_enabled not found, function profiling enabled?" > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc > > index 51f6e6146bd9..70bad441fa7d 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc > > @@ -10,10 +10,7 @@ > > # > > > > # The triggers are set within the set_ftrace_filter file > > -if [ ! -f set_ftrace_filter ]; then > > - echo "set_ftrace_filter not found? Is dynamic ftrace not set?" > > - exit_unsupported > > -fi > > +check_filter_file set_ftrace_filter > > > > fail() { # mesg > > echo $1 > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_stack_tracer.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_stack_tracer.tc > > index b414f0e3c646..51e9e80bc0e6 100644 > > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_stack_tracer.tc > > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_stack_tracer.tc > > @@ -8,6 +8,8 @@ if [ ! -f stack_trace ]; then > > exit_unsupported > > fi > > > > +check_filter_file stack_trace_filter > > + > > echo > stack_trace_filter > > echo 0 > stack_max_size > > echo 1 > /proc/sys/kernel/stack_tracer_enabled > > 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 1947387fe976..3ed173f2944a 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 > > @@ -11,10 +11,7 @@ > > # > > > > # The triggers are set within the set_ftrace_filter file > > -if [ ! -f set_ftrace_filter ]; then > > - echo "set_ftrace_filter not found? Is dynamic ftrace not set?" > > - exit_unsupported > > -fi > > +check_filter_file set_ftrace_filter > > > > fail() { # mesg > > echo $1 > > diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions > > index 5d4550591ff9..61a3c7e2634d 100644 > > --- a/tools/testing/selftests/ftrace/test.d/functions > > +++ b/tools/testing/selftests/ftrace/test.d/functions > > @@ -1,3 +1,9 @@ > > +check_filter_file() { # check filter file introduced by dynamic ftrace > > + if [ ! -f "$1" ]; then > > + echo "$1 not found? Is dynamic ftrace not set?" > > + exit_unsupported > > + fi > > +} > > > > clear_trace() { # reset trace output > > echo > trace > > diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc > > index 7650a82db3f5..df5072815b87 100644 > > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc > > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc > > @@ -5,6 +5,8 @@ > > [ -f kprobe_events ] || exit_unsupported # this is configurable > > grep "function" available_tracers || exit_unsupported # this is configurable > > > > +check_filter_file set_ftrace_filter > > + > > # prepare > > echo nop > current_tracer > > echo _do_fork > set_ftrace_filter > -- Masami Hiramatsu