From patchwork Fri Mar 10 19:20:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 67656 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1057460wrd; Fri, 10 Mar 2023 11:25:37 -0800 (PST) X-Google-Smtp-Source: AK7set+uDdMHMktFqLNf1ftyuqsVmkXV73/ULCWo9T9G6HB3NnI9EaSYydLfdx6tQVno+Z3IDXaQ X-Received: by 2002:a17:90b:1b10:b0:237:40a5:7acf with SMTP id nu16-20020a17090b1b1000b0023740a57acfmr28028453pjb.33.1678476336847; Fri, 10 Mar 2023 11:25:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678476336; cv=none; d=google.com; s=arc-20160816; b=V/0kkALuHj19sqo+u5FhVn04ze7rcw1j2meBpGi0riHzcPH8zW6FW1PciFKyFn7KEF Led/BKg1lqnlTY+RBBF7IDQyL2hCCwWYlq+xTzoGy+notxgAxPAiOw6YYTcZtNEYNMGW 6DDdkqPC63YBE+O5L65DD3/W3KaeOJnwvbiSxPWkihVNp1siEyvUh+pGKoM4loZfzeiz Fwr7jmCARLSWYmLy5zj6FEikL3CbHyju9dDpGa8MMu6WnnYvpJn0A5xoHnVHtmsDJg8g xqI+CmlL1Pwbqa8KEBRESv4p/QBnM/UZvFi4dwdRZR3RKfRHszto9caTAQbS0PcslAde KGrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BmkTKs+wcqZgQT5xMF3LQhEToSvbX2IFjpGdyAHx//I=; b=Dcox6WmFlDZ0/WmZV6qtDw4gqZproMwNSCKsXp6pfcQkWARLhTdWaTcnViF8e5/gZt Up0z2PczAVwoXl3VXH3HmaJ4nCwkcwwEUQwytsPHEFIzLD6IE1dOCcdeI4am4Eykg6AJ MNPOcFmo5i1ftWAfv3sxyyjluwZiNaSYLfJwDMZuWxjA28R/e6wAtq1jPwRPS8VmgSpO qsCgrS/jJg1hdUPgYwwS5DSRu6crCPd/coFP4mSBSb6BghtWkTgFcKbYMrih4DZLh1T6 dwxZeQCQT2umeZr88T0qtXCNXxNcbr6iDaLIxQWrU32mfZs5lMp+7W+nM43WQoi1i0SF F11g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TJlvsCbz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q10-20020a17090a9f4a00b00233ce098f21si476538pjv.135.2023.03.10.11.25.24; Fri, 10 Mar 2023 11:25:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TJlvsCbz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231140AbjCJTVS (ORCPT + 99 others); Fri, 10 Mar 2023 14:21:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230405AbjCJTVI (ORCPT ); Fri, 10 Mar 2023 14:21:08 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A60CA12802D; Fri, 10 Mar 2023 11:21:06 -0800 (PST) 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 62940B823E6; Fri, 10 Mar 2023 19:21:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C841C433EF; Fri, 10 Mar 2023 19:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678476064; bh=/Rg3otAfWIfcGHEh5SOOjD8wJ1PbvmfxogXF/vFficw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TJlvsCbzL6MyXQm4Sis6p2ve3MO247C+KX+ve3wn6jNLcg4aCkHR3eoILykS4XV+Y H0GgYCXxs7y79R2Y7YSw00iFqFTCQqh083r8a7oXwqHv7nU8WtL0YvQjpBbNI3xd54 QMcxhfNB3kJti97u3bFRuuba+MXsv9ALeKiMq9h4hhbUFWvaxOXiWXD2T/+4AdW1xl 5OJqbAYvqHVR3eMCRw0ac8sy/19SWVHrnZ4ByZGBtN4QNC/izdgYuQG1dCkfZKbS13 FFdyqc0PHe5pkfjTK7OTHz5AapIKgG8SpI3cxmlw8PC2DShMRNUltv8WId0fpEDGH5 J204/qa7GVvPw== From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , "Tobin C. Harding" , Andrew Morton , Paolo Bonzini , Shuah Khan , Tycho Andersen , kvm@vger.kernel.org, linux-hardening@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Steven Rostedt , Mukesh Ojha Subject: [PATCH v3 1/3] selftests: use canonical ftrace path Date: Fri, 10 Mar 2023 12:20:48 -0700 Message-Id: <20230310192050.4096886-2-zwisler@kernel.org> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog In-Reply-To: <20230310192050.4096886-1-zwisler@kernel.org> References: <20230310192050.4096886-1-zwisler@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760010003330881449?= X-GMAIL-MSGID: =?utf-8?q?1760010003330881449?= 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 --- 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(-) 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;