| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <70aec50b-09a3-45b4-8eb9-138518a8476a@linux.intel.com>
Date: Wed, 19 Feb 2025 13:37:40 -0500
From: "Liang, Kan" <kan.liang@...ux.intel.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linux-kernel@...r.kernel.org
Cc: stable <stable@...nel.org>, Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>, Arnaldo Carvalho de Melo <acme@...nel.org>,
Namhyung Kim <namhyung@...nel.org>, Mark Rutland <mark.rutland@....com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...nel.org>, Ian Rogers <irogers@...gle.com>,
Adrian Hunter <adrian.hunter@...el.com>, linux-perf-users@...r.kernel.org
Subject: Re: [PATCH] perf: fix up some comments and code to properly use the
event_source bus
On 2025-02-19 8:40 a.m., Greg Kroah-Hartman wrote:
> In sysfs, the perf events are all located in
> /sys/bus/event_source/devices/ but some places ended up hard-coding the
> location to be at the root of /sys/devices/ which could be very risky as
> you do not exactly know what type of device you are accessing in sysfs
> at that location.
>
> So fix this all up by properly pointing everything at the bus device
> list instead of the root of the sysfs devices/ tree.
>
> Cc: stable <stable@...nel.org>
> Cc: Peter Zijlstra <peterz@...radead.org>
> Cc: Ingo Molnar <mingo@...hat.com>
> Cc: Arnaldo Carvalho de Melo <acme@...nel.org>
> Cc: Namhyung Kim <namhyung@...nel.org>
> Cc: Mark Rutland <mark.rutland@....com>
> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
> Cc: Jiri Olsa <jolsa@...nel.org>
> Cc: Ian Rogers <irogers@...gle.com>
> Cc: Adrian Hunter <adrian.hunter@...el.com>
> Cc: "Liang, Kan" <kan.liang@...ux.intel.com>
> Cc: linux-perf-users@...r.kernel.org
> Cc: linux-kernel@...r.kernel.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Reviewed-by: Kan Liang <kan.liang@...ux.intel.com>
Thanks,
Kan
> ---
> tools/perf/Documentation/intel-hybrid.txt | 12 ++++++------
> tools/perf/Documentation/perf-list.txt | 2 +-
> tools/perf/arch/x86/util/iostat.c | 2 +-
> tools/perf/builtin-stat.c | 2 +-
> tools/perf/util/mem-events.c | 2 +-
> tools/perf/util/pmu.c | 4 ++--
> 6 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/tools/perf/Documentation/intel-hybrid.txt b/tools/perf/Documentation/intel-hybrid.txt
> index e7a776ad25d7..0379903673a4 100644
> --- a/tools/perf/Documentation/intel-hybrid.txt
> +++ b/tools/perf/Documentation/intel-hybrid.txt
> @@ -8,15 +8,15 @@ Part of events are available on core cpu, part of events are available
> on atom cpu and even part of events are available on both.
>
> Kernel exports two new cpu pmus via sysfs:
> -/sys/devices/cpu_core
> -/sys/devices/cpu_atom
> +/sys/bus/event_source/devices/cpu_core
> +/sys/bus/event_source/devices/cpu_atom
>
> The 'cpus' files are created under the directories. For example,
>
> -cat /sys/devices/cpu_core/cpus
> +cat /sys/bus/event_source/devices/cpu_core/cpus
> 0-15
>
> -cat /sys/devices/cpu_atom/cpus
> +cat /sys/bus/event_source/devices/cpu_atom/cpus
> 16-23
>
> It indicates cpu0-cpu15 are core cpus and cpu16-cpu23 are atom cpus.
> @@ -60,8 +60,8 @@ can't carry pmu information. So now this type is extended to be PMU aware
> type. The PMU type ID is stored at attr.config[63:32].
>
> PMU type ID is retrieved from sysfs.
> -/sys/devices/cpu_atom/type
> -/sys/devices/cpu_core/type
> +/sys/bus/event_source/devices/cpu_atom/type
> +/sys/bus/event_source/devices/cpu_core/type
>
> The new attr.config layout for PERF_TYPE_HARDWARE:
>
> diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt
> index d0c65fad419a..c3ffd93f94d7 100644
> --- a/tools/perf/Documentation/perf-list.txt
> +++ b/tools/perf/Documentation/perf-list.txt
> @@ -188,7 +188,7 @@ in the CPU vendor specific documentation.
>
> The available PMUs and their raw parameters can be listed with
>
> - ls /sys/devices/*/format
> + ls /sys/bus/event_source/devices/*/format
>
> For example the raw event "LSD.UOPS" core pmu event above could
> be specified as
> diff --git a/tools/perf/arch/x86/util/iostat.c b/tools/perf/arch/x86/util/iostat.c
> index 00f645a0c18a..7442a2cd87ed 100644
> --- a/tools/perf/arch/x86/util/iostat.c
> +++ b/tools/perf/arch/x86/util/iostat.c
> @@ -32,7 +32,7 @@
> #define MAX_PATH 1024
> #endif
>
> -#define UNCORE_IIO_PMU_PATH "devices/uncore_iio_%d"
> +#define UNCORE_IIO_PMU_PATH "bus/event_source/devices/uncore_iio_%d"
> #define SYSFS_UNCORE_PMU_PATH "%s/"UNCORE_IIO_PMU_PATH
> #define PLATFORM_MAPPING_PATH UNCORE_IIO_PMU_PATH"/die%d"
>
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index 77e327d4a9a7..68ea7589c143 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -97,7 +97,7 @@
> #include <internal/threadmap.h>
>
> #define DEFAULT_SEPARATOR " "
> -#define FREEZE_ON_SMI_PATH "devices/cpu/freeze_on_smi"
> +#define FREEZE_ON_SMI_PATH "bus/event_source/devices/cpu/freeze_on_smi"
>
> static void print_counters(struct timespec *ts, int argc, const char **argv);
>
> diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
> index 3692e988c86e..0277d3e1505c 100644
> --- a/tools/perf/util/mem-events.c
> +++ b/tools/perf/util/mem-events.c
> @@ -189,7 +189,7 @@ static bool perf_pmu__mem_events_supported(const char *mnt, struct perf_pmu *pmu
> if (!e->event_name)
> return true;
>
> - scnprintf(path, PATH_MAX, "%s/devices/%s/events/%s", mnt, pmu->name, e->event_name);
> + scnprintf(path, PATH_MAX, "%s/bus/event_source/devices/%s/events/%s", mnt, pmu->name, e->event_name);
>
> return !stat(path, &st);
> }
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index 6206c8fe2bf9..a8193ac8f2e7 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -36,12 +36,12 @@
> #define UNIT_MAX_LEN 31 /* max length for event unit name */
>
> enum event_source {
> - /* An event loaded from /sys/devices/<pmu>/events. */
> + /* An event loaded from /sys/bus/event_source/devices/<pmu>/events. */
> EVENT_SRC_SYSFS,
> /* An event loaded from a CPUID matched json file. */
> EVENT_SRC_CPU_JSON,
> /*
> - * An event loaded from a /sys/devices/<pmu>/identifier matched json
> + * An event loaded from a /sys/bus/event_source/devices/<pmu>/identifier matched json
> * file.
> */
> EVENT_SRC_SYS_JSON,
Powered by blists - more mailing lists