From patchwork Mon Mar 13 21:17:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 13173353 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 01C41C6FD19 for ; Mon, 13 Mar 2023 21:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229565AbjCMVSg (ORCPT ); Mon, 13 Mar 2023 17:18:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229636AbjCMVSf (ORCPT ); Mon, 13 Mar 2023 17:18:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6064584B3; Mon, 13 Mar 2023 14:18:16 -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 361B6614F1; Mon, 13 Mar 2023 21:18:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93956C433EF; Mon, 13 Mar 2023 21:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678742295; bh=6mjt9yhry9OZrGSoFR8oPMv/MhGYAYm5/QiZHqwgr3Q=; h=From:To:Cc:Subject:Date:From; b=SALdwbEY67uvSj2NKIONHf4FyVXtnGDxNlObLGFUagGwVN6ayhPWsXf3i4zYs8RFv UH3MjeVdE4evNvqVpwAGOpINbdEBSnoUfb80mWBjePkoqSH7RA3/e6vk5zo5UOSADS y8Kmpr6hzjYvbFcaKD0cx8dwZ9k4BUWJryD0iaVSKQ4YBXRqZDyGiCPFkgrhgSTu4/ IhdPoofNqzzGwVim6/IrdXd/mO/KiEhwfMlYv6Et70EBQ1hcMG+++5wcaUKDwLd0rD vO47Vf0yxE7NdcPT/1qbCcqmsIebO+im14pbhnuNDFtG9SUKQCMLksghODxr9lhtWo 8K7ROvfOyUd0w== From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , "Tobin C. Harding" , Andrew Morton , Mark Rutland , Masami Hiramatsu , Paolo Bonzini , Shuah Khan , Steven Rostedt , Tycho Andersen , kvm@vger.kernel.org, linux-hardening@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, Mukesh Ojha Subject: [PATCH v4 1/3] selftests: use canonical ftrace path Date: Mon, 13 Mar 2023 15:17:43 -0600 Message-Id: <20230313211746.1541525-1-zwisler@kernel.org> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org From: Ross Zwisler The canonical location for the tracefs filesystem is at /sys/kernel/tracing. But, from Documentation/trace/ftrace.rst: Before 4.1, all ftrace tracing control files were within the debugfs file system, which is typically located at /sys/kernel/debug/tracing. For backward compatibility, when mounting the debugfs file system, the tracefs file system will be automatically mounted at: /sys/kernel/debug/tracing A few spots in tools/testing/selftests still refer to this older debugfs path, so let's update them to avoid confusion. Reviewed-by: Steven Rostedt (Google) Reviewed-by: Mukesh Ojha Signed-off-by: Ross Zwisler --- v3 here: https://lore.kernel.org/all/20230310192050.4096886-1-zwisler@kernel.org/ Changes from v3: * Added Reviwed-by from Steven to patch 2 * Rebased onto the current linux/master tools/testing/selftests/mm/protection_keys.c | 4 ++-- tools/testing/selftests/user_events/dyn_test.c | 2 +- tools/testing/selftests/user_events/ftrace_test.c | 10 +++++----- tools/testing/selftests/user_events/perf_test.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) base-commit: fc89d7fb499b0162e081f434d45e8d1b47e82ece diff --git a/tools/testing/selftests/mm/protection_keys.c b/tools/testing/selftests/mm/protection_keys.c index 95f403a0c46d..0381c34fdd56 100644 --- a/tools/testing/selftests/mm/protection_keys.c +++ b/tools/testing/selftests/mm/protection_keys.c @@ -98,7 +98,7 @@ int tracing_root_ok(void) void tracing_on(void) { #if CONTROL_TRACING > 0 -#define TRACEDIR "/sys/kernel/debug/tracing" +#define TRACEDIR "/sys/kernel/tracing" char pidstr[32]; if (!tracing_root_ok()) @@ -124,7 +124,7 @@ void tracing_off(void) #if CONTROL_TRACING > 0 if (!tracing_root_ok()) return; - cat_into_file("0", "/sys/kernel/debug/tracing/tracing_on"); + cat_into_file("0", "/sys/kernel/tracing/tracing_on"); #endif } diff --git a/tools/testing/selftests/user_events/dyn_test.c b/tools/testing/selftests/user_events/dyn_test.c index d6265d14cd51..8879a7b04c6a 100644 --- a/tools/testing/selftests/user_events/dyn_test.c +++ b/tools/testing/selftests/user_events/dyn_test.c @@ -16,7 +16,7 @@ #include "../kselftest_harness.h" -const char *dyn_file = "/sys/kernel/debug/tracing/dynamic_events"; +const char *dyn_file = "/sys/kernel/tracing/dynamic_events"; const char *clear = "!u:__test_event"; static int Append(const char *value) diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c index 404a2713dcae..a0b2c96eb252 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -16,11 +16,11 @@ #include "../kselftest_harness.h" -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; -const char *enable_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/enable"; -const char *trace_file = "/sys/kernel/debug/tracing/trace"; -const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; +const char *data_file = "/sys/kernel/tracing/user_events_data"; +const char *status_file = "/sys/kernel/tracing/user_events_status"; +const char *enable_file = "/sys/kernel/tracing/events/user_events/__test_event/enable"; +const char *trace_file = "/sys/kernel/tracing/trace"; +const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; static inline int status_check(char *status_page, int status_bit) { diff --git a/tools/testing/selftests/user_events/perf_test.c b/tools/testing/selftests/user_events/perf_test.c index 8b4c7879d5a7..31505642aa9b 100644 --- a/tools/testing/selftests/user_events/perf_test.c +++ b/tools/testing/selftests/user_events/perf_test.c @@ -18,10 +18,10 @@ #include "../kselftest_harness.h" -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; -const char *id_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/id"; -const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; +const char *data_file = "/sys/kernel/tracing/user_events_data"; +const char *status_file = "/sys/kernel/tracing/user_events_status"; +const char *id_file = "/sys/kernel/tracing/events/user_events/__test_event/id"; +const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; struct event { __u32 index; From patchwork Mon Mar 13 21:17:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 13173354 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 9DAB0C7618E for ; Mon, 13 Mar 2023 21:18:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229813AbjCMVSj (ORCPT ); Mon, 13 Mar 2023 17:18:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229748AbjCMVSh (ORCPT ); Mon, 13 Mar 2023 17:18:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1623925BB7; Mon, 13 Mar 2023 14:18:17 -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 5FA5D6150D; Mon, 13 Mar 2023 21:18:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE125C433D2; Mon, 13 Mar 2023 21:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678742296; bh=q17gWNDEER7JFUSGy9HVW9DTdpWFf2LCktZduqnianY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sYWYaC5bJg15qkd5Wy1envpuTqaOAMqPXhrK+ra5OePk7jrNF8Gs0W7JdLpjKn/jH ZikIXg6VFeiSYDGyPtekMZlE6T8pVNLPgBQSRlzmLFP3ihzgZt9bY+MmUIjJD70EX/ cMfSMW6W9QacnsivpuypswFUIslyS2opfmuIjce9lrebqjmm4VPBeZPzOORTUGyswP oRG2aHJS9Kk667ds2itHFeH8MvGghQSO2p9j7GLRp+YmAoczxVfhBFyPEj1pjUQthI qLaT90azdUVwHozj+RFPzxsGI9SCXuAIN+S3VAjCxnEYaXJxi8nMsvibR/9Tuwwn9N 1C4EraE9FLatg== From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , "Tobin C. Harding" , Andrew Morton , Mark Rutland , Masami Hiramatsu , Paolo Bonzini , Shuah Khan , Steven Rostedt , Tycho Andersen , kvm@vger.kernel.org, linux-hardening@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v4 2/3] leaking_addresses: also skip canonical ftrace path Date: Mon, 13 Mar 2023 15:17:44 -0600 Message-Id: <20230313211746.1541525-2-zwisler@kernel.org> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog In-Reply-To: <20230313211746.1541525-1-zwisler@kernel.org> References: <20230313211746.1541525-1-zwisler@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org From: Ross Zwisler The canonical location for the tracefs filesystem is at /sys/kernel/tracing. But, from Documentation/trace/ftrace.rst: Before 4.1, all ftrace tracing control files were within the debugfs file system, which is typically located at /sys/kernel/debug/tracing. For backward compatibility, when mounting the debugfs file system, the tracefs file system will be automatically mounted at: /sys/kernel/debug/tracing scripts/leaking_addresses.pl only skipped this older debugfs path, so let's add the canonical path as well. Acked-by: Tycho Andersen Reviewed-by: Steven Rostedt (Google) Signed-off-by: Ross Zwisler --- scripts/leaking_addresses.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index 8f636a23bc3f..e695634d153d 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -61,6 +61,7 @@ my @skip_abs = ( '/proc/device-tree', '/proc/1/syscall', '/sys/firmware/devicetree', + '/sys/kernel/tracing/trace_pipe', '/sys/kernel/debug/tracing/trace_pipe', '/sys/kernel/security/apparmor/revision'); From patchwork Mon Mar 13 21:17:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 13173355 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 E3B12C7619A for ; Mon, 13 Mar 2023 21:18:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjCMVSl (ORCPT ); Mon, 13 Mar 2023 17:18:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229807AbjCMVSi (ORCPT ); Mon, 13 Mar 2023 17:18:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01A0862FCE; Mon, 13 Mar 2023 14:18:18 -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 917C661518; Mon, 13 Mar 2023 21:18:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00DA5C433A1; Mon, 13 Mar 2023 21:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678742298; bh=VoI18tD8o9ZMnsU9Cf6DTDg2Lm9gO1Nul+/I2tAuayk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nCpgKbakOtkAns5toIg+NwkKvMGL+DU/SdMEBmWUkakSH/dMzXWwA7SDfX6clXZMK gU/KyHhzhT0gDFeK9iucWz0e0IglHGtW32DmLtNqGHBiTDDudMb+/45zNVlOeIuvZl Bo/12sLk3dj/tcHxQxjKCDttyWYQMzQznpLph3UWOcNhoURoNwuMtKVnnRoeaqNdoy a5hf43SlvKT+tDcTLnSz57prfqT8Xjaf9pAmoouN8QsUhIHZrP7PTlSvqcoOY6P2ez N3MOxbOKHntJ5z8gd4RjLpB+XMzx8H03MC+sPhcjiLTOUWadx1pk4yzLPHiUpm7qts YK1pPGfXI5wag== From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , "Tobin C. Harding" , Andrew Morton , Mark Rutland , Masami Hiramatsu , Paolo Bonzini , Shuah Khan , Steven Rostedt , Tycho Andersen , kvm@vger.kernel.org, linux-hardening@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, Mukesh Ojha Subject: [PATCH v4 3/3] tools/kvm_stat: use canonical ftrace path Date: Mon, 13 Mar 2023 15:17:45 -0600 Message-Id: <20230313211746.1541525-3-zwisler@kernel.org> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog In-Reply-To: <20230313211746.1541525-1-zwisler@kernel.org> References: <20230313211746.1541525-1-zwisler@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org From: Ross Zwisler The canonical location for the tracefs filesystem is at /sys/kernel/tracing. But, from Documentation/trace/ftrace.rst: Before 4.1, all ftrace tracing control files were within the debugfs file system, which is typically located at /sys/kernel/debug/tracing. For backward compatibility, when mounting the debugfs file system, the tracefs file system will be automatically mounted at: /sys/kernel/debug/tracing A comment in kvm_stat still refers to this older debugfs path, so let's update it to avoid confusion. Acked-by: Paolo Bonzini Reviewed-by: Steven Rostedt (Google) Reviewed-by: Mukesh Ojha Signed-off-by: Ross Zwisler --- tools/kvm/kvm_stat/kvm_stat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat index 6f28180ffeea..15bf00e79e3f 100755 --- a/tools/kvm/kvm_stat/kvm_stat +++ b/tools/kvm/kvm_stat/kvm_stat @@ -627,7 +627,7 @@ class TracepointProvider(Provider): name)'. All available events have directories under - /sys/kernel/debug/tracing/events/ which export information + /sys/kernel/tracing/events/ which export information about the specific event. Therefore, listing the dirs gives us a list of all available events.