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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09C8BC636D7 for ; Thu, 16 Feb 2023 20:59:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33C7E6B0071; Thu, 16 Feb 2023 15:59:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EC726B0072; Thu, 16 Feb 2023 15:59:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DBA56B0073; Thu, 16 Feb 2023 15:59:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0E94D6B0071 for ; Thu, 16 Feb 2023 15:59:02 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C394912098C for ; Thu, 16 Feb 2023 20:59:01 +0000 (UTC) X-FDA: 80474369682.17.29AD733 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf20.hostedemail.com (Postfix) with ESMTP id E856A1C0006 for ; Thu, 16 Feb 2023 20:58:58 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf20.hostedemail.com: domain of "SRS0=s9J3=6M=goodmis.org=rostedt@kernel.org" designates 145.40.68.75 as permitted sender) smtp.mailfrom="SRS0=s9J3=6M=goodmis.org=rostedt@kernel.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676581139; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cCYAmRxCGrLUIPEA+7Mizr2NhOYsQ5L0uAX5y5zxynU=; b=l/eNZUpz1UKcdfziqrq+CER4EKweOvklwvT2XeXa+WnswosX1rBpjxjGDTemQ6MW+4eiVI Tua6ZvrqrcxziYODrGjj51m8teFR7jQB6jNy+jsmvurb6niv3tBLEc407uTFmuG0wUSUkV ZoyiKLzQRPvbv/LN+HRQEwqJWTEsexQ= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf20.hostedemail.com: domain of "SRS0=s9J3=6M=goodmis.org=rostedt@kernel.org" designates 145.40.68.75 as permitted sender) smtp.mailfrom="SRS0=s9J3=6M=goodmis.org=rostedt@kernel.org" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676581139; a=rsa-sha256; cv=none; b=rsUGnfbumitdrSk+vnQKEGMNCzQ67D8wJdu0SxIPVs8YyMM/iAwYSDpFIZKOgn2mGl2xR3 IufNI01c+nAvmhLnXgvEbdibyeb3rWbtvYWFe4K4UW13U5xzStDpyD2JWcDVmEqwWC9A35 A0h7vskl6OmauOYAZUAc84SCVeMOU9I= 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 ams.source.kernel.org (Postfix) with ESMTPS id 67152B82962; Thu, 16 Feb 2023 20:58:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C464CC433EF; Thu, 16 Feb 2023 20:58:55 +0000 (UTC) Date: Thu, 16 Feb 2023 15:58:54 -0500 From: Steven Rostedt To: Ross Zwisler , Shuah Khan Cc: linux-kernel@vger.kernel.org, Ross Zwisler , Shuah Khan , Andrew Morton , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: Re: [PATCH v2 2/6] selftests: use canonical ftrace path Message-ID: <20230216155854.424bcdd7@rorschach.local.home> In-Reply-To: <20230215223350.2658616-3-zwisler@google.com> References: <20230215223350.2658616-1-zwisler@google.com> <20230215223350.2658616-3-zwisler@google.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 X-Rspamd-Queue-Id: E856A1C0006 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: p3skyonnqz1kkgtafno8jwgttj1gnixn X-HE-Tag: 1676581138-34527 X-HE-Meta: U2FsdGVkX18oGeZT5C+/oUQRyp+oY9njwiBFkbqy1Afvio/OLMzZg7dHqz3fQ+Ht0Nlhmgni8upMRG8mrEDRIMfWHY+rIfiHlk/hJfBZktGXBZ7N8A5MOIXJhICP8s+oVf/Vgm+lYAqJNhTASXVo5JIKC/g974wxiKH1iJBy8dXUk6T4sqmDflM2PvRJunOGqRcrjZ8PuB7TDfLSYA6j7J1IO+HMaW0mlgJcWGjKYrRhmXj7gTEqkg/nMNwVjkWrNUyk6bBD+lHXeF133tA+zCm77I1wsTVyqc8Y9wdWT2mgDmeeRUJxOl5C1EeAgjS+5Ef8erUweYUHgcSeUkmcE6Xggeh91f2d+ariH8B+q8FdYIp1LZBSeUjFeQOixLABfDUIJq6Pw3lTzJhyVG/UF9+Jrug8QqFqVLBR5NV4Oo0WphDpFFLDqB8zK8NqlcuXN3MwCQnQmAYmpAmUY2DEjyaj4D1cX2K6HWEdtNm1LwtA6UPVsBdM9tsLcpvYLBdwu5I3qtHSC7JZj5U/w9SCW0Uq48Vwc3mk8c8CSs/UZIBjpmPeEb9Pwx9p8cSzzYN+aDg157Tgr2GkaCZRWLClLVw3nGrF2V/dLFxclRmpFHY2fx1B1SenE4z16q+0n30F33/c2zvmvPkVDHD619fX+nq5QcHRZ3c2PsEzscOL7X2yLkuMit5jpbSwmffxy4OqZ2DWmHdGJERxue3UlZPwPGGBjip3EGR6ngqL2TYKsZvpePZkboOv/zt+uDF1D8Hp9gn7pHayt+yrNBOadRzJ5tXiDtDUWIejYEpx9X/Jm8NfRW5HH1sMjmaeApnZEewn+44a23SAHMS8BkF4BWKeOusmPiGADTcwLuv4StaOpOD+mqEAxUwuFJ1BqJp2FB/BTAI0ioKwxQCnPCCjA74DeWe7jy/ynTyNSKJs7NiH/8L2VxxQ7+GJxmFD7D4yktFYRnNgfGnylNNskeAMVcN mVArd8M+ S1gU6KhbCgOFyIB6XuonhQki47DgLRQHXxcc/lmkVM9jO0oVd4b29Ay0v8LBWSKNUyuOxJqD/dP1kHroilokLvZAFq0badLqOfvsEO2qCIOcqBF9xZS0q8Zp8CZ0ZFmwmWsHz5Q+qP9rkzuCrmMM/7yjK3kiYsvo8ZMcO267D+72pos11/5aHMsBM6WnpGuTCWCtVBIwS0CAwMlDUDvFgkJkIjMb1zUKmmjQtuDaZd1z5giSnMM/MRIDhjrEIneiMRYPBEz4hP7EZBUjnkI/PeI5pLxmDs63VEQEPqIPkPRlZ10z+cfZEGI1CtcP4G6pyIb5VQwgfcsgv5qhe+6JwT9VAoTV+UPTFOTlQVOdSgeG27z01mkbPA9LbKlUcyypzt/eh5uwoAHQKwji2cI0Otp8L4k6T73n0lLHEKOS/qWEnCKQIW816HBhJjuI8MgoCLGPWyOg7q1UAGu+pEGgEzV5f1gL8g25VpWrvrfY0xGicZAK9p+gu0Ss0rRvnGWkf6Sq/ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, 15 Feb 2023 15:33:46 -0700 Ross Zwisler wrote: > 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) Shuah, Care to pull this in through your tree? -- Steve > > Signed-off-by: Ross Zwisler > --- > 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 ++++---- > tools/testing/selftests/vm/protection_keys.c | 4 ++-- > 4 files changed, 12 insertions(+), 12 deletions(-) > > 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; > diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c > index 95f403a0c46d..0381c34fdd56 100644 > --- a/tools/testing/selftests/vm/protection_keys.c > +++ b/tools/testing/selftests/vm/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 > } >