From patchwork Wed Feb 15 22:33:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 13142274 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 B9EBDC6379F for ; Wed, 15 Feb 2023 22:34:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E31B6B0073; Wed, 15 Feb 2023 17:34:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4BE756B0072; Wed, 15 Feb 2023 17:34:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1FE1C6B0074; Wed, 15 Feb 2023 17:34:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 118226B0072 for ; Wed, 15 Feb 2023 17:34:02 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DF0481A0599 for ; Wed, 15 Feb 2023 22:34:01 +0000 (UTC) X-FDA: 80470980282.19.36DD105 Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by imf23.hostedemail.com (Postfix) with ESMTP id 1B6B0140019 for ; Wed, 15 Feb 2023 22:33:59 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=nkZL9fJ4; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf23.hostedemail.com: domain of zwisler@chromium.org designates 209.85.166.169 as permitted sender) smtp.mailfrom=zwisler@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676500440; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lP7i4Vg5vCi45+1jZsWESpRSmXH35ZniV9m1/+tW+Hk=; b=V3D6QIe3JbHYMiHG6p+cAbqQKc0nBN6wBkKxY1sJHQrUeGGUsLn61+yZFvlywQtvwBy4o/ bmkE3/VUFmwx05GsCYRz9vLwWrwTJqd5ic1DqFBNh4Dn5B3CLB7BKcNkvNMp/6pioNDLAM V784gglP06WkQh80NdZA/sfzKUfH0LM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=nkZL9fJ4; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf23.hostedemail.com: domain of zwisler@chromium.org designates 209.85.166.169 as permitted sender) smtp.mailfrom=zwisler@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676500440; a=rsa-sha256; cv=none; b=JO4JzPz7eEhUTZk2CrKCm64qu+NOkq+XMwYsUhuMmMyxB58Jn1K1J882YYf/hR7SKXbLCB fM0JH7AFVA5GJI5gFZxUuJbRCXLdiBy/258PmbJxP4Adljr/thcRVjgtrddLDykK1A5wgd FYfT/bLCCq/2QBNQo5j/NusDxui7tBk= Received: by mail-il1-f169.google.com with SMTP id l7so153788ilj.12 for ; Wed, 15 Feb 2023 14:33:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lP7i4Vg5vCi45+1jZsWESpRSmXH35ZniV9m1/+tW+Hk=; b=nkZL9fJ4DuIlF/CtEtVuUWG1NHpyIExHBSMUpvG++W5Ao+0jTazceFPQ+qafDgTzZN P+qX432q5PjnU01ridwbkLLkiU0rTtSZdXZEQd/FetfZiE1KzwwCeQCqOizI8U6m/CdR qCDN90d6J3zjeKTJ5KEfh+qukVjCgjja+cIZM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lP7i4Vg5vCi45+1jZsWESpRSmXH35ZniV9m1/+tW+Hk=; b=ievi22/j0vENARPdpt1RfPWkyPPJhgX3YYiT1uCvXONk5YyTOlRz0q3FZJCg7wZKCu zRgoTYtjqg8o9oUjYRdEkntjtLdzDa8iMvR1uHduhAfF9yc8SfzwefJutLZg7uuhfvEr 4shJ/28Q8axJHhJlD9YCXloala/RNpTv4TNSbB7WYL5KzFVfZrz01iQwhUTUCQetZikZ iR1d7M/M7yk93QB24eM6JRa/lHiJmoJKjHrB1H/N302Jvm22zt91QsMRnqzAzccjPDye WT78wwA8iNRpYp1HvZl9m1H4zB03OeXT9KHp/41cCCetjHMWcFmy5hZegI3JS4u40Xh+ cQBg== X-Gm-Message-State: AO0yUKXocl8ZqnhbKPPv6v51NRIrFDcUjKYBYWI2FKzis4MQaCGRvC0N cc33357CyHfhrdnHb+orqV9bqQ== X-Google-Smtp-Source: AK7set/iT57WkSxfAxsAOUoPZU2et6o/KodiZpe6LUgEgddn6Z+TYNMWbr3f09Z6/v0pnuZZ8Xenpg== X-Received: by 2002:a05:6e02:1d91:b0:315:7004:3e6c with SMTP id h17-20020a056e021d9100b0031570043e6cmr3354878ila.23.1676500439322; Wed, 15 Feb 2023 14:33:59 -0800 (PST) Received: from ravnica.bld.corp.google.com ([2620:15c:183:200:6299:179b:a6e4:be59]) by smtp.gmail.com with ESMTPSA id b15-20020a92c14f000000b003141eddd283sm1131489ilh.22.2023.02.15.14.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 14:33:59 -0800 (PST) From: Ross Zwisler X-Google-Original-From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , Shuah Khan , Andrew Morton , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, Steven Rostedt Subject: [PATCH v2 2/6] selftests: use canonical ftrace path Date: Wed, 15 Feb 2023 15:33:46 -0700 Message-Id: <20230215223350.2658616-3-zwisler@google.com> X-Mailer: git-send-email 2.39.1.637.g21b0678d19-goog In-Reply-To: <20230215223350.2658616-1-zwisler@google.com> References: <20230215223350.2658616-1-zwisler@google.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1B6B0140019 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: pfm83z6za8xhg1t585ajw9q4ddftnnzp X-HE-Tag: 1676500439-819271 X-HE-Meta: U2FsdGVkX18Bj3cJn7dLYbCPJloSS1S0iRmWx2yqdnthDPLjH+PYRdSg/0QI8UOwNKVHKgJbFgSJpbqFBrdL6lSAV1q2aiiRRem7jD4B0mEW9FOwCXdyGVV8Or85aeRLiZdFk/eMV3ZBvtFqhMP1kxUNyWkUVBFXkpxqjfXaGM2sIj8vyajjCja5/cIAj7brw5qxVZJrBt8MLnak0CWuyt7hGQlGYfKPpLiOudjuHW9GhG3vITNqE2o6vFwSyddffmGoMAkvT4gWFph0mMnnarE9+skTMB4Nq1OHMA6hmaw2XUECQKU/Pr7uHSS3LOFmoyMcq1eRgj6tVk2ZhYCoXwVddNGVQl/ynJum1VXLKzOwEOZUd3hy3BJcntVodXyvcnMUatxF+dPuS+aVF/on3bTePT+0msyuZmBfvv8D27khceaQGprddHg/U1iWmvGNUJwOhEVajrB6eVh3BJrNhVA/XxF+3LxIS99H64+E8XbiZ1C6eBIdZLCQVfRZyBSNmuQluJm0xkozsVVYA5yLVlvXam0D3mhb+5sF6oICSfb5EEet+agOg61I4SQocSvFw2L5Fq0kOrbht7J+QgizkbVWB/e7FUc3KmuakqvNTDbXvPzior8CMAV9GkfTqTdXWlxihdhhbihjR7hZyPe17aEMDaEK2TPDadk1SxAPc0M14CZS3gQECOaikQUQUe8rzAbvhbEHOHgyC2bPm5zr9A+Ny6T4XHVET2YhkmJhKo8RfYWultBdZ6aPrjyRPuKKfdMOHlULP5NT7XGtk8FNZKY/l/UtFd8bAwu33d532XS++j7SLk0nnl9Xe6v7HmMqxNTeyjaMVgfdA6BmnVyYCPltLghIJ5vyZ2qy3TWkXHOmZPirhOIxZyAj2gdjIXs2VD7vy6kGpY01nfob7O34x0QLYimT3sKK1bgVXiX1MgVg6dbn78iwhCi0UriAdhJaXC1vD9zsEzbxzbMb9SB 37rWOIya nAEWOiMDpkDpX88hKNI0sT/rUjZBu0ghVhlp+qodCFt8zBjjchUwrEsWlhaDe6749YWNuQbA+qCHn1LSvh+tinmYnacTzfYPQhX17feZVZpFR+h5uJgLG53nZVyQV3ZKfGcJODCja+8ak4KArWyXEHQFM8kax/Ifm2wg4G2DDaI/jWJYsTeUpKbvCwFZsh8o531e9R6CmW6LvDUjHb4DwKlJSZ9GYOR1yAa7LSOQlrTV2LCQJe/pJukTyUG89t7VCgE8TW/EW42VWtt+a9R+rQkliB9KHAjiX0QSesHZCeA/waFeErUEg/WE36BQpDztPKhqd+4gT+D4QK34= 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: 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. Signed-off-by: Ross Zwisler Reviewed-by: Steven Rostedt (Google) Reviewed-by: Mukesh Ojha --- 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 }