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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B731C7618B for ; Tue, 14 Mar 2023 21:54:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230200AbjCNVyY (ORCPT ); Tue, 14 Mar 2023 17:54:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230140AbjCNVyX (ORCPT ); Tue, 14 Mar 2023 17:54:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6012325B92 for ; Tue, 14 Mar 2023 14:54:22 -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 EFBCA619F4 for ; Tue, 14 Mar 2023 21:54:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4745FC433EF; Tue, 14 Mar 2023 21:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1678830861; bh=b6FVphZGZwP2k8I6xzoBW9Bi7YFqrW9jDCx7dvFk/iA=; h=Date:To:From:Subject:From; b=GGMkkEIpRNuHlm4jJRFwh1s3CCAUOE0lAQnG1lQD+cQ2iwiS6XgJVD90Z7E9ZETED o6O490ySdY1UoiyMZQRGS8yJC4Id/FXGEOlQUWZPdMGWGfhcrKgvNzAJ+h53+1e5y6 rfwo3RnP8YtAoE6w0edbhec38Q6iUuuBITQXI+Aw= Date: Tue, 14 Mar 2023 14:54:20 -0700 To: mm-commits@vger.kernel.org, tycho@tycho.pizza, shuah@kernel.org, rostedt@goodmis.org, quic_mojha@quicinc.com, pbonzini@redhat.com, mhiramat@kernel.org, me@tobin.cc, mark.rutland@arm.com, zwisler@google.com, akpm@linux-foundation.org From: Andrew Morton Subject: + selftests-use-canonical-ftrace-path.patch added to mm-nonmm-unstable branch Message-Id: <20230314215421.4745FC433EF@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: selftests: use canonical ftrace path has been added to the -mm mm-nonmm-unstable branch. Its filename is selftests-use-canonical-ftrace-path.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/selftests-use-canonical-ftrace-path.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Ross Zwisler Subject: selftests: use canonical ftrace path Date: Mon, 13 Mar 2023 15:17:43 -0600 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. Link: https://lkml.kernel.org/r/20230313211746.1541525-1-zwisler@kernel.org Signed-off-by: Ross Zwisler Reviewed-by: Steven Rostedt (Google) Reviewed-by: Mukesh Ojha Cc: Mark Rutland Cc: Masami Hiramatsu Cc: Paolo Bonzini Cc: Shuah Khan Cc: "Tobin C. Harding" Cc: Tycho Andersen Signed-off-by: Andrew Morton --- --- a/tools/testing/selftests/mm/protection_keys.c~selftests-use-canonical-ftrace-path +++ a/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 } --- a/tools/testing/selftests/user_events/dyn_test.c~selftests-use-canonical-ftrace-path +++ a/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) --- a/tools/testing/selftests/user_events/ftrace_test.c~selftests-use-canonical-ftrace-path +++ a/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) { --- a/tools/testing/selftests/user_events/perf_test.c~selftests-use-canonical-ftrace-path +++ a/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; _ Patches currently in -mm which might be from zwisler@google.com are selftests-use-canonical-ftrace-path.patch leaking_addresses-also-skip-canonical-ftrace-path.patch tools-kvm_stat-use-canonical-ftrace-path.patch