From patchwork Mon Nov 25 00:11:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11259399 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 17ECC112B for ; Mon, 25 Nov 2019 00:11:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBF2820815 for ; Mon, 25 Nov 2019 00:11:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574640685; bh=dgmbdVph82qN1wa16cF6s2yHXttZdvsFBY+an8U/Rxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IwrbltQRktMuboSVywfYWUBMuPRr31Bxvbs0TB/XbFG21Z8FJbFuzQZmGst1pVCZN VsJutaIWBmz6qcjLJTAOw8YkmxvimB+CxpClBdZbrGDmCbxYGmdyKAKOxjuhkxZa59 tYp3ee/nFcgJk5D14Ziu8J1leiiRdvJV8hWmUBoM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbfKYALY (ORCPT ); Sun, 24 Nov 2019 19:11:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:35524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726851AbfKYALY (ORCPT ); Sun, 24 Nov 2019 19:11:24 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 055AA207FD; Mon, 25 Nov 2019 00:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574640684; bh=dgmbdVph82qN1wa16cF6s2yHXttZdvsFBY+an8U/Rxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N7xP/QtPBX5lmFIiqXd0h3VKKtFvspf08nSR12rSxveMYqKHnb7dutCcGYoUXAc/u Vdm+PS/s3zbP0H0jnFKkCIDJv9g69N3BovzyaKuIfztEgUsCaWyWMqiqv0zfbwsYbF tpVKj2QiWle9VMV9GycWSQKXh7XpNr95CJ+7uew0= From: Masami Hiramatsu To: Shuah Khan , Steven Rostedt Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [BUGFIX PATCH v2 1/3] selftests/ftrace: Fix to check the existence of set_ftrace_filter Date: Mon, 25 Nov 2019 09:11:21 +0900 Message-Id: <157464068087.2006.4439754583596758605.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157464067201.2006.6413506591718899129.stgit@devnote2> References: <157464067201.2006.6413506591718899129.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org If we run ftracetest on the kernel with CONFIG_DYNAMIC_FTRACE=n, there is no set_ftrace_filter and all test cases are failed, because reset_ftrace_filter returns an error. Let's check whether set_ftrace_filter exists and remove redundant set_ftrace_filter from initialize_ftrace(). Signed-off-by: Masami Hiramatsu --- tools/testing/selftests/ftrace/test.d/functions | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions index 86986c4bba54..19d288cdf336 100644 --- a/tools/testing/selftests/ftrace/test.d/functions +++ b/tools/testing/selftests/ftrace/test.d/functions @@ -46,6 +46,9 @@ reset_events_filter() { # reset all current setting filters } reset_ftrace_filter() { # reset all triggers in set_ftrace_filter + if [ ! -f set_ftrace_filter ]; then + return 0 + fi echo > set_ftrace_filter grep -v '^#' set_ftrace_filter | while read t; do tr=`echo $t | cut -d: -f2` @@ -93,7 +96,6 @@ initialize_ftrace() { # Reset ftrace to initial-state disable_events [ -f set_event_pid ] && echo > set_event_pid [ -f set_ftrace_pid ] && echo > set_ftrace_pid - [ -f set_ftrace_filter ] && echo | tee set_ftrace_* [ -f set_graph_function ] && echo | tee set_graph_* [ -f stack_trace_filter ] && echo > stack_trace_filter [ -f kprobe_events ] && echo > kprobe_events From patchwork Mon Nov 25 00:11:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11259401 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 98D63112B for ; Mon, 25 Nov 2019 00:11:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7924420823 for ; Mon, 25 Nov 2019 00:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574640693; bh=phZqQ51DaGnCQflW3J09B6LC13NsFK9mZ6NFiZrDYeo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c1FZKSvi5jcs8614T86blRxIx1ru5T12ke0cSf/ePcljPZr6Op5dA536vtht5Mk/v OoAMTZK1oGghFDe/9+lhoidDkmVkE6JEAFimFp1n9mPx6fCJN9fpvdHfGmJj2jdKte rClyTeu/vZruZ1Urz6uTdp6k4zvHn5iUWy0NAUjI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727106AbfKYALd (ORCPT ); Sun, 24 Nov 2019 19:11:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:35712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726851AbfKYALd (ORCPT ); Sun, 24 Nov 2019 19:11:33 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 798C72071A; Mon, 25 Nov 2019 00:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574640692; bh=phZqQ51DaGnCQflW3J09B6LC13NsFK9mZ6NFiZrDYeo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MZIx9bJOIqFRHKslUcx4faGD1QYi3etEZibNn2mCDTItU7Ff/rikesjRLStjSZ97N UwTiN+sMH7lwuFnPVb2stGX6zSHP4WrdpykpiwvBUDn+dzYRCzlu51Y0wfi4fGj84z yJSSgCQ9nt4Rg6cIeaWuNhE32hNzU9O2EqC73Hmc= From: Masami Hiramatsu To: Shuah Khan , Steven Rostedt Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [BUGFIX PATCH v2 2/3] selftests/ftrace: Fix ftrace test cases to check unsupported Date: Mon, 25 Nov 2019 09:11:29 +0900 Message-Id: <157464068938.2006.2309427604804731225.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157464067201.2006.6413506591718899129.stgit@devnote2> References: <157464067201.2006.6413506591718899129.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Since dynamic function tracer can be disabled, set_ftrace_filter can be disappeared. Test cases which depends on it, must check whether the set_ftrace_filter exists or not before testing and if not, return as unsupported. Also, if the function tracer itself is disabled, we can not set "function" to current_tracer. Test cases must check it before testing, and return as unsupported. Signed-off-by: Masami Hiramatsu --- .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 2 ++ .../selftests/ftrace/test.d/ftrace/func_cpumask.tc | 5 +++++ 2 files changed, 7 insertions(+) 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 36fb59f886ea..1a52f2883fe0 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,6 +3,8 @@ # description: ftrace - stacktrace filter command # flags: instance +[ ! -f set_ftrace_filter ] && exit_unsupported + echo _do_fork:stacktrace >> set_ftrace_filter grep -q "_do_fork:stacktrace:unlimited" set_ftrace_filter diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_cpumask.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_cpumask.tc index 86a1f07ef2ca..7757b549f0b6 100644 --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_cpumask.tc +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_cpumask.tc @@ -15,6 +15,11 @@ if [ $NP -eq 1 ] ;then exit_unresolved fi +if ! grep -q function available_tracers ; then + echo "Function trace is not enabled" + exit_unsupported +fi + ORIG_CPUMASK=`cat tracing_cpumask` do_reset() { From patchwork Mon Nov 25 00:11:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11259403 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2364B930 for ; Mon, 25 Nov 2019 00:11:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 026E7207DD for ; Mon, 25 Nov 2019 00:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574640703; bh=7KhYAgodYyb0DXk6DOmo0km58xW1FsFbLoY4aD0xgA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QP1VEGjNHAyr/KCtNuTUe22IgTwe3InWm96o1LNQgAYhVLh0O4PUlMdZphFLL7TDs mtc1tLa99GTvsJ1pvNnTOz4vX0zUJ8JqnknGccusF2Hqp8zVdyhmq309LtXukYRjtA GDFQOgAB6PXyN98eykyl+sosIvMEdvbIKikT3zgU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727217AbfKYALm (ORCPT ); Sun, 24 Nov 2019 19:11:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:35966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726851AbfKYALm (ORCPT ); Sun, 24 Nov 2019 19:11:42 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 387472073F; Mon, 25 Nov 2019 00:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574640701; bh=7KhYAgodYyb0DXk6DOmo0km58xW1FsFbLoY4aD0xgA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I9bquT4aQ5P+2cqSyC5bvtGDc+f/1mjylFDQiLabiccPJ1Ux35fRsMM0NPColipTc j3DtRnBbA+jwUTbsITHwRRTwOA/tLZVNlTm56beQDu6lB3QfnDKD9dHIr++fJG0ptu i9SFjRYgvAN2IpudqQhN31wb0kVzCEug7PeEqPVI= From: Masami Hiramatsu To: Shuah Khan , Steven Rostedt Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [BUGFIX PATCH v2 3/3] selftests/ftrace: Do not to use absolute debugfs path Date: Mon, 25 Nov 2019 09:11:38 +0900 Message-Id: <157464069798.2006.1926064676962300669.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157464067201.2006.6413506591718899129.stgit@devnote2> References: <157464067201.2006.6413506591718899129.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Use relative path to trigger file instead of absolute debugfs path, because if the user uses tracefs instead of debugfs, it can be mounted at /sys/kernel/tracing. Anyway, since the ftracetest is designed to be run at the tracing directory, user doesn't need to use absolute path. Signed-off-by: Masami Hiramatsu Reviewed-by: Steven Rostedt (VMware) --- .../inter-event/trigger-action-hist-xfail.tc | 4 ++-- .../inter-event/trigger-onchange-action-hist.tc | 2 +- .../inter-event/trigger-snapshot-action-hist.tc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc index 1221240f8cf6..3f2aee115f6e 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc @@ -21,10 +21,10 @@ grep -q "snapshot()" README || exit_unsupported # version issue echo "Test expected snapshot action failure" -echo 'hist:keys=comm:onmatch(sched.sched_wakeup).snapshot()' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger && exit_fail +echo 'hist:keys=comm:onmatch(sched.sched_wakeup).snapshot()' >> events/sched/sched_waking/trigger && exit_fail echo "Test expected save action failure" -echo 'hist:keys=comm:onmatch(sched.sched_wakeup).save(comm,prio)' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger && exit_fail +echo 'hist:keys=comm:onmatch(sched.sched_wakeup).save(comm,prio)' >> events/sched/sched_waking/trigger && exit_fail exit_xfail diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc index 064a284e4e75..c80007aa9f86 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc @@ -16,7 +16,7 @@ grep -q "onchange(var)" README || exit_unsupported # version issue echo "Test onchange action" -echo 'hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio) if comm=="ping"' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger +echo 'hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio) if comm=="ping"' >> events/sched/sched_waking/trigger ping $LOCALHOST -c 3 nice -n 1 ping $LOCALHOST -c 3 diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc index 18fff69fc433..f546c1b66a9b 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc @@ -23,9 +23,9 @@ grep -q "snapshot()" README || exit_unsupported # version issue echo "Test snapshot action" -echo 1 > /sys/kernel/debug/tracing/events/sched/enable +echo 1 > events/sched/enable -echo 'hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio):onchange($newprio).snapshot() if comm=="ping"' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger +echo 'hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio):onchange($newprio).snapshot() if comm=="ping"' >> events/sched/sched_waking/trigger ping $LOCALHOST -c 3 nice -n 1 ping $LOCALHOST -c 3