From patchwork Tue Nov 26 08:34:16 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: 11261613 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 9A5DE913 for ; Tue, 26 Nov 2019 08:34:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79E2A20835 for ; Tue, 26 Nov 2019 08:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574757260; bh=glC5idivSVC+Ml4rqmH96g0j3YWKCfNJIV8n1KOAndY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RD4V6byANi+3mvw+VywfxQM1AU6apoVvUFAzjHZtjVTwhl4SjY704sf3bTUJc7Ybr d02jTQisvGIPoCsmlFoRyKUCCXgaYqUpDD5lyPSlCouTFP/knb826kQK06ERNoHJ5H RYceEoufpY5j12NZwXLTL/imb+xi1hj4jenxMYyc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725970AbfKZIeU (ORCPT ); Tue, 26 Nov 2019 03:34:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:32794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725943AbfKZIeT (ORCPT ); Tue, 26 Nov 2019 03:34:19 -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 328EA207DD; Tue, 26 Nov 2019 08:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574757259; bh=glC5idivSVC+Ml4rqmH96g0j3YWKCfNJIV8n1KOAndY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wgJGXiGqpeknSqDmMqIp+WjaLCsbJxnuyof0SSzULX+f+7CMch7Yr6E5XkcXuoDvK 6kNOhhRLqZKER9YF3bvIZBCIV9+SBPoixrJFR4lddjNqprBJu8GAUrrMMk+8f//8rr 5PfzydcpqOyra7np/pTTp4Zk8iLznS3HpdvO2EY4= From: Masami Hiramatsu To: Shuah Khan , Steven Rostedt Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [BUGFIX PATCH v4 1/4] selftests/ftrace: Fix to check the existence of set_ftrace_filter Date: Tue, 26 Nov 2019 17:34:16 +0900 Message-Id: <157475725551.3389.16908546371847626653.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157475724667.3389.15752644047898709246.stgit@devnote2> References: <157475724667.3389.15752644047898709246.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 in reset_ftrace_filter() and clean up only set_ftrace_notrace in initialize_ftrace(). Signed-off-by: Masami Hiramatsu Reviewed-by: Steven Rostedt (VMware) --- Changes in v4: - Clear set_ftrace_notrace --- tools/testing/selftests/ftrace/test.d/functions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions index 86986c4bba54..5d4550591ff9 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,7 @@ 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_ftrace_notrace ] && echo > set_ftrace_notrace [ -f set_graph_function ] && echo | tee set_graph_* [ -f stack_trace_filter ] && echo > stack_trace_filter [ -f kprobe_events ] && echo > kprobe_events