License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 07:07:57 -07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2013-12-09 09:14:24 -07:00
|
|
|
#include <api/fs/fs.h>
|
perf tools: Fix sparse CPU numbering related bugs
At present, the perf subcommands that do system-wide monitoring
(perf stat, perf record and perf top) don't work properly unless
the online cpus are numbered 0, 1, ..., N-1. These tools ask
for the number of online cpus with sysconf(_SC_NPROCESSORS_ONLN)
and then try to create events for cpus 0, 1, ..., N-1.
This creates problems for systems where the online cpus are
numbered sparsely. For example, a POWER6 system in
single-threaded mode (i.e. only running 1 hardware thread per
core) will have only even-numbered cpus online.
This fixes the problem by reading the /sys/devices/system/cpu/online
file to find out which cpus are online. The code that does that is in
tools/perf/util/cpumap.[ch], and consists of a read_cpu_map()
function that sets up a cpumap[] array and returns the number of
online cpus. If /sys/devices/system/cpu/online can't be read or
can't be parsed successfully, it falls back to using sysconf to
ask how many cpus are online and sets up an identity map in cpumap[].
The perf record, perf stat and perf top code then calls
read_cpu_map() in the system-wide monitoring case (instead of
sysconf) and uses cpumap[] to get the cpu numbers to pass to
perf_event_open.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
LKML-Reference: <20100310093609.GA3959@brick.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-03-10 02:36:09 -07:00
|
|
|
#include "cpumap.h"
|
2019-08-22 06:48:31 -07:00
|
|
|
#include "debug.h"
|
|
|
|
#include "event.h"
|
perf tools: Fix sparse CPU numbering related bugs
At present, the perf subcommands that do system-wide monitoring
(perf stat, perf record and perf top) don't work properly unless
the online cpus are numbered 0, 1, ..., N-1. These tools ask
for the number of online cpus with sysconf(_SC_NPROCESSORS_ONLN)
and then try to create events for cpus 0, 1, ..., N-1.
This creates problems for systems where the online cpus are
numbered sparsely. For example, a POWER6 system in
single-threaded mode (i.e. only running 1 hardware thread per
core) will have only even-numbered cpus online.
This fixes the problem by reading the /sys/devices/system/cpu/online
file to find out which cpus are online. The code that does that is in
tools/perf/util/cpumap.[ch], and consists of a read_cpu_map()
function that sets up a cpumap[] array and returns the number of
online cpus. If /sys/devices/system/cpu/online can't be read or
can't be parsed successfully, it falls back to using sysconf to
ask how many cpus are online and sets up an identity map in cpumap[].
The perf record, perf stat and perf top code then calls
read_cpu_map() in the system-wide monitoring case (instead of
sysconf) and uses cpumap[] to get the cpu numbers to pass to
perf_event_open.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
LKML-Reference: <20100310093609.GA3959@brick.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-03-10 02:36:09 -07:00
|
|
|
#include <assert.h>
|
2017-04-18 08:26:44 -07:00
|
|
|
#include <dirent.h>
|
perf tools: Fix sparse CPU numbering related bugs
At present, the perf subcommands that do system-wide monitoring
(perf stat, perf record and perf top) don't work properly unless
the online cpus are numbered 0, 1, ..., N-1. These tools ask
for the number of online cpus with sysconf(_SC_NPROCESSORS_ONLN)
and then try to create events for cpus 0, 1, ..., N-1.
This creates problems for systems where the online cpus are
numbered sparsely. For example, a POWER6 system in
single-threaded mode (i.e. only running 1 hardware thread per
core) will have only even-numbered cpus online.
This fixes the problem by reading the /sys/devices/system/cpu/online
file to find out which cpus are online. The code that does that is in
tools/perf/util/cpumap.[ch], and consists of a read_cpu_map()
function that sets up a cpumap[] array and returns the number of
online cpus. If /sys/devices/system/cpu/online can't be read or
can't be parsed successfully, it falls back to using sysconf to
ask how many cpus are online and sets up an identity map in cpumap[].
The perf record, perf stat and perf top code then calls
read_cpu_map() in the system-wide monitoring case (instead of
sysconf) and uses cpumap[] to get the cpu numbers to pass to
perf_event_open.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
LKML-Reference: <20100310093609.GA3959@brick.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-03-10 02:36:09 -07:00
|
|
|
#include <stdio.h>
|
2013-02-14 05:57:27 -07:00
|
|
|
#include <stdlib.h>
|
2015-10-25 07:51:25 -07:00
|
|
|
#include <linux/bitmap.h>
|
2015-06-22 15:36:04 -07:00
|
|
|
#include "asm/bug.h"
|
perf tools: Fix sparse CPU numbering related bugs
At present, the perf subcommands that do system-wide monitoring
(perf stat, perf record and perf top) don't work properly unless
the online cpus are numbered 0, 1, ..., N-1. These tools ask
for the number of online cpus with sysconf(_SC_NPROCESSORS_ONLN)
and then try to create events for cpus 0, 1, ..., N-1.
This creates problems for systems where the online cpus are
numbered sparsely. For example, a POWER6 system in
single-threaded mode (i.e. only running 1 hardware thread per
core) will have only even-numbered cpus online.
This fixes the problem by reading the /sys/devices/system/cpu/online
file to find out which cpus are online. The code that does that is in
tools/perf/util/cpumap.[ch], and consists of a read_cpu_map()
function that sets up a cpumap[] array and returns the number of
online cpus. If /sys/devices/system/cpu/online can't be read or
can't be parsed successfully, it falls back to using sysconf to
ask how many cpus are online and sets up an identity map in cpumap[].
The perf record, perf stat and perf top code then calls
read_cpu_map() in the system-wide monitoring case (instead of
sysconf) and uses cpumap[] to get the cpu numbers to pass to
perf_event_open.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
LKML-Reference: <20100310093609.GA3959@brick.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-03-10 02:36:09 -07:00
|
|
|
|
tools perf: Move from sane_ctype.h obtained from git to the Linux's original
We got the sane_ctype.h headers from git and kept using it so far, but
since that code originally came from the kernel sources to the git
sources, perhaps its better to just use the one in the kernel, so that
we can leverage tools/perf/check_headers.sh to be notified when our copy
gets out of sync, i.e. when fixes or goodies are added to the code we've
copied.
This will help with things like tools/lib/string.c where we want to have
more things in common with the kernel, such as strim(), skip_spaces(),
etc so as to go on removing the things that we have in tools/perf/util/
and instead using the code in the kernel, indirectly and removing things
like EXPORT_SYMBOL(), etc, getting notified when fixes and improvements
are made to the original code.
Hopefully this also should help with reducing the difference of code
hosted in tools/ to the one in the kernel proper.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-7k9868l713wqtgo01xxygn12@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-06-25 13:27:31 -07:00
|
|
|
#include <linux/ctype.h>
|
2019-07-04 07:32:27 -07:00
|
|
|
#include <linux/zalloc.h>
|
2022-11-09 11:49:13 -07:00
|
|
|
#include <internal/cpumap.h>
|
2017-04-17 12:10:49 -07:00
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
static struct perf_cpu max_cpu_num;
|
|
|
|
static struct perf_cpu max_present_cpu_num;
|
2016-01-26 11:51:46 -07:00
|
|
|
static int max_node_num;
|
2022-01-04 23:13:18 -07:00
|
|
|
/**
|
|
|
|
* The numa node X as read from /sys/devices/system/node/nodeX indexed by the
|
|
|
|
* CPU number.
|
|
|
|
*/
|
2016-01-26 11:51:46 -07:00
|
|
|
static int *cpunode_map;
|
|
|
|
|
2022-06-14 07:33:51 -07:00
|
|
|
bool perf_record_cpu_map_data__test_bit(int i,
|
|
|
|
const struct perf_record_cpu_map_data *data)
|
|
|
|
{
|
|
|
|
int bit_word32 = i / 32;
|
|
|
|
__u32 bit_mask32 = 1U << (i & 31);
|
|
|
|
int bit_word64 = i / 64;
|
|
|
|
__u64 bit_mask64 = ((__u64)1) << (i & 63);
|
|
|
|
|
|
|
|
return (data->mask32_data.long_size == 4)
|
|
|
|
? (bit_word32 < data->mask32_data.nr) &&
|
|
|
|
(data->mask32_data.mask[bit_word32] & bit_mask32) != 0
|
|
|
|
: (bit_word64 < data->mask64_data.nr) &&
|
|
|
|
(data->mask64_data.mask[bit_word64] & bit_mask64) != 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read ith mask value from data into the given 64-bit sized bitmap */
|
|
|
|
static void perf_record_cpu_map_data__read_one_mask(const struct perf_record_cpu_map_data *data,
|
|
|
|
int i, unsigned long *bitmap)
|
|
|
|
{
|
|
|
|
#if __SIZEOF_LONG__ == 8
|
|
|
|
if (data->mask32_data.long_size == 4)
|
|
|
|
bitmap[0] = data->mask32_data.mask[i];
|
|
|
|
else
|
|
|
|
bitmap[0] = data->mask64_data.mask[i];
|
|
|
|
#else
|
|
|
|
if (data->mask32_data.long_size == 4) {
|
|
|
|
bitmap[0] = data->mask32_data.mask[i];
|
|
|
|
bitmap[1] = 0;
|
|
|
|
} else {
|
|
|
|
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
|
|
|
bitmap[0] = (unsigned long)(data->mask64_data.mask[i] >> 32);
|
|
|
|
bitmap[1] = (unsigned long)data->mask64_data.mask[i];
|
|
|
|
#else
|
|
|
|
bitmap[0] = (unsigned long)data->mask64_data.mask[i];
|
|
|
|
bitmap[1] = (unsigned long)(data->mask64_data.mask[i] >> 32);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
static struct perf_cpu_map *cpu_map__from_entries(const struct perf_record_cpu_map_data *data)
|
2015-10-25 07:51:25 -07:00
|
|
|
{
|
2019-07-21 04:23:49 -07:00
|
|
|
struct perf_cpu_map *map;
|
2015-10-25 07:51:25 -07:00
|
|
|
|
2022-06-14 07:33:51 -07:00
|
|
|
map = perf_cpu_map__empty_new(data->cpus_data.nr);
|
2015-10-25 07:51:25 -07:00
|
|
|
if (map) {
|
|
|
|
unsigned i;
|
|
|
|
|
2022-06-14 07:33:51 -07:00
|
|
|
for (i = 0; i < data->cpus_data.nr; i++) {
|
2016-01-06 03:49:55 -07:00
|
|
|
/*
|
|
|
|
* Special treatment for -1, which is not real cpu number,
|
|
|
|
* and we need to use (int) -1 to initialize map[i],
|
|
|
|
* otherwise it would become 65535.
|
|
|
|
*/
|
2022-06-14 07:33:51 -07:00
|
|
|
if (data->cpus_data.cpu[i] == (u16) -1)
|
2023-04-17 12:50:02 -07:00
|
|
|
RC_CHK_ACCESS(map)->map[i].cpu = -1;
|
2016-01-06 03:49:55 -07:00
|
|
|
else
|
2023-04-17 12:50:02 -07:00
|
|
|
RC_CHK_ACCESS(map)->map[i].cpu = (int) data->cpus_data.cpu[i];
|
2016-01-06 03:49:55 -07:00
|
|
|
}
|
2015-10-25 07:51:25 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return map;
|
|
|
|
}
|
|
|
|
|
2022-06-14 07:33:51 -07:00
|
|
|
static struct perf_cpu_map *cpu_map__from_mask(const struct perf_record_cpu_map_data *data)
|
2015-10-25 07:51:25 -07:00
|
|
|
{
|
2022-06-14 07:33:51 -07:00
|
|
|
DECLARE_BITMAP(local_copy, 64);
|
|
|
|
int weight = 0, mask_nr = data->mask32_data.nr;
|
2019-07-21 04:23:49 -07:00
|
|
|
struct perf_cpu_map *map;
|
2015-10-25 07:51:25 -07:00
|
|
|
|
2022-06-14 07:33:51 -07:00
|
|
|
for (int i = 0; i < mask_nr; i++) {
|
|
|
|
perf_record_cpu_map_data__read_one_mask(data, i, local_copy);
|
|
|
|
weight += bitmap_weight(local_copy, 64);
|
|
|
|
}
|
2015-10-25 07:51:25 -07:00
|
|
|
|
2022-06-14 07:33:51 -07:00
|
|
|
map = perf_cpu_map__empty_new(weight);
|
|
|
|
if (!map)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (int i = 0, j = 0; i < mask_nr; i++) {
|
|
|
|
int cpus_per_i = (i * data->mask32_data.long_size * BITS_PER_BYTE);
|
|
|
|
int cpu;
|
2015-10-25 07:51:25 -07:00
|
|
|
|
2022-06-14 07:33:51 -07:00
|
|
|
perf_record_cpu_map_data__read_one_mask(data, i, local_copy);
|
|
|
|
for_each_set_bit(cpu, local_copy, 64)
|
2023-04-17 12:50:02 -07:00
|
|
|
RC_CHK_ACCESS(map)->map[j++].cpu = cpu + cpus_per_i;
|
2015-10-25 07:51:25 -07:00
|
|
|
}
|
|
|
|
return map;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2022-06-14 07:33:53 -07:00
|
|
|
static struct perf_cpu_map *cpu_map__from_range(const struct perf_record_cpu_map_data *data)
|
|
|
|
{
|
|
|
|
struct perf_cpu_map *map;
|
|
|
|
unsigned int i = 0;
|
|
|
|
|
|
|
|
map = perf_cpu_map__empty_new(data->range_cpu_data.end_cpu -
|
|
|
|
data->range_cpu_data.start_cpu + 1 + data->range_cpu_data.any_cpu);
|
|
|
|
if (!map)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (data->range_cpu_data.any_cpu)
|
2023-04-17 12:50:02 -07:00
|
|
|
RC_CHK_ACCESS(map)->map[i++].cpu = -1;
|
2022-06-14 07:33:53 -07:00
|
|
|
|
|
|
|
for (int cpu = data->range_cpu_data.start_cpu; cpu <= data->range_cpu_data.end_cpu;
|
|
|
|
i++, cpu++)
|
2023-04-17 12:50:02 -07:00
|
|
|
RC_CHK_ACCESS(map)->map[i].cpu = cpu;
|
2022-06-14 07:33:53 -07:00
|
|
|
|
|
|
|
return map;
|
|
|
|
}
|
|
|
|
|
2022-06-14 07:33:51 -07:00
|
|
|
struct perf_cpu_map *cpu_map__new_data(const struct perf_record_cpu_map_data *data)
|
2015-10-25 07:51:25 -07:00
|
|
|
{
|
2022-06-14 07:33:53 -07:00
|
|
|
switch (data->type) {
|
|
|
|
case PERF_CPU_MAP__CPUS:
|
2022-06-14 07:33:51 -07:00
|
|
|
return cpu_map__from_entries(data);
|
2022-06-14 07:33:53 -07:00
|
|
|
case PERF_CPU_MAP__MASK:
|
2022-06-14 07:33:51 -07:00
|
|
|
return cpu_map__from_mask(data);
|
2022-06-14 07:33:53 -07:00
|
|
|
case PERF_CPU_MAP__RANGE_CPUS:
|
|
|
|
return cpu_map__from_range(data);
|
|
|
|
default:
|
|
|
|
pr_err("cpu_map__new_data unknown type %d\n", data->type);
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-10-25 07:51:25 -07:00
|
|
|
}
|
|
|
|
|
2019-07-21 04:23:49 -07:00
|
|
|
size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp)
|
2012-01-19 09:07:23 -07:00
|
|
|
{
|
2016-06-28 04:29:04 -07:00
|
|
|
#define BUFSIZE 1024
|
|
|
|
char buf[BUFSIZE];
|
2012-01-19 09:07:23 -07:00
|
|
|
|
2016-06-28 04:29:04 -07:00
|
|
|
cpu_map__snprint(map, buf, sizeof(buf));
|
|
|
|
return fprintf(fp, "%s\n", buf);
|
|
|
|
#undef BUFSIZE
|
2012-01-19 09:07:23 -07:00
|
|
|
}
|
|
|
|
|
2019-08-22 04:11:39 -07:00
|
|
|
struct perf_cpu_map *perf_cpu_map__empty_new(int nr)
|
2015-10-25 07:51:17 -07:00
|
|
|
{
|
2023-04-12 08:54:44 -07:00
|
|
|
struct perf_cpu_map *cpus = perf_cpu_map__alloc(nr);
|
2015-10-25 07:51:17 -07:00
|
|
|
|
|
|
|
if (cpus != NULL) {
|
2023-04-17 12:19:38 -07:00
|
|
|
for (int i = 0; i < nr; i++)
|
2023-04-17 12:50:02 -07:00
|
|
|
RC_CHK_ACCESS(cpus)->map[i].cpu = -1;
|
2015-10-25 07:51:17 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return cpus;
|
|
|
|
}
|
|
|
|
|
2020-11-26 07:13:21 -07:00
|
|
|
struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr)
|
|
|
|
{
|
2020-11-26 07:13:23 -07:00
|
|
|
struct cpu_aggr_map *cpus = malloc(sizeof(*cpus) + sizeof(struct aggr_cpu_id) * nr);
|
2020-11-26 07:13:21 -07:00
|
|
|
|
|
|
|
if (cpus != NULL) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
cpus->nr = nr;
|
|
|
|
for (i = 0; i < nr; i++)
|
2022-01-04 23:13:17 -07:00
|
|
|
cpus->map[i] = aggr_cpu_id__empty();
|
2020-11-26 07:13:21 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return cpus;
|
|
|
|
}
|
|
|
|
|
2015-09-11 06:49:45 -07:00
|
|
|
static int cpu__get_topology_int(int cpu, const char *name, int *value)
|
2013-02-06 07:46:01 -07:00
|
|
|
{
|
|
|
|
char path[PATH_MAX];
|
|
|
|
|
2013-02-14 05:57:27 -07:00
|
|
|
snprintf(path, PATH_MAX,
|
2015-09-11 06:49:45 -07:00
|
|
|
"devices/system/cpu/cpu%d/topology/%s", cpu, name);
|
2013-02-06 07:46:01 -07:00
|
|
|
|
2015-09-11 06:49:45 -07:00
|
|
|
return sysfs__read_int(path, value);
|
|
|
|
}
|
2015-09-01 06:58:11 -07:00
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
int cpu__get_socket_id(struct perf_cpu cpu)
|
2015-09-11 06:49:45 -07:00
|
|
|
{
|
2022-01-04 23:13:51 -07:00
|
|
|
int value, ret = cpu__get_topology_int(cpu.cpu, "physical_package_id", &value);
|
2015-09-11 06:49:45 -07:00
|
|
|
return ret ?: value;
|
2015-09-01 06:58:11 -07:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
struct aggr_cpu_id aggr_cpu_id__socket(struct perf_cpu cpu, void *data __maybe_unused)
|
2015-09-01 06:58:11 -07:00
|
|
|
{
|
2022-01-04 23:13:17 -07:00
|
|
|
struct aggr_cpu_id id = aggr_cpu_id__empty();
|
2015-09-01 06:58:11 -07:00
|
|
|
|
2022-01-04 23:13:19 -07:00
|
|
|
id.socket = cpu__get_socket_id(cpu);
|
2020-11-26 07:13:20 -07:00
|
|
|
return id;
|
2013-02-06 07:46:01 -07:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:21 -07:00
|
|
|
static int aggr_cpu_id__cmp(const void *a_pointer, const void *b_pointer)
|
2013-02-06 07:46:01 -07:00
|
|
|
{
|
2020-11-26 07:13:20 -07:00
|
|
|
struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer;
|
|
|
|
struct aggr_cpu_id *b = (struct aggr_cpu_id *)b_pointer;
|
|
|
|
|
2020-11-26 07:13:28 -07:00
|
|
|
if (a->node != b->node)
|
2020-11-26 07:13:24 -07:00
|
|
|
return a->node - b->node;
|
2020-11-26 07:13:26 -07:00
|
|
|
else if (a->socket != b->socket)
|
2020-11-26 07:13:25 -07:00
|
|
|
return a->socket - b->socket;
|
2020-11-26 07:13:27 -07:00
|
|
|
else if (a->die != b->die)
|
2020-11-26 07:13:26 -07:00
|
|
|
return a->die - b->die;
|
perf stat: Support per-cluster aggregation
Some platforms have 'cluster' topology and CPUs in the cluster will
share resources like L3 Cache Tag (for HiSilicon Kunpeng SoC) or L2
cache (for Intel Jacobsville). Currently parsing and building cluster
topology have been supported since [1].
perf stat has already supported aggregation for other topologies like
die or socket, etc. It'll be useful to aggregate per-cluster to find
problems like L3T bandwidth contention.
This patch add support for "--per-cluster" option for per-cluster
aggregation. Also update the docs and related test. The output will
be like:
[root@localhost tmp]# perf stat -a -e LLC-load --per-cluster -- sleep 5
Performance counter stats for 'system wide':
S56-D0-CLS158 4 1,321,521,570 LLC-load
S56-D0-CLS594 4 794,211,453 LLC-load
S56-D0-CLS1030 4 41,623 LLC-load
S56-D0-CLS1466 4 41,646 LLC-load
S56-D0-CLS1902 4 16,863 LLC-load
S56-D0-CLS2338 4 15,721 LLC-load
S56-D0-CLS2774 4 22,671 LLC-load
[...]
On a legacy system without cluster or cluster support, the output will
be look like:
[root@localhost perf]# perf stat -a -e cycles --per-cluster -- sleep 1
Performance counter stats for 'system wide':
S56-D0-CLS0 64 18,011,485 cycles
S7182-D0-CLS0 64 16,548,835 cycles
Note that this patch doesn't mix the cluster information in the outputs
of --per-core to avoid breaking any tools/scripts using it.
Note that perf recently supports "--per-cache" aggregation, but it's not
the same with the cluster although cluster CPUs may share some cache
resources. For example on my machine all clusters within a die share the
same L3 cache:
$ cat /sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_list
0-31
$ cat /sys/devices/system/cpu/cpu0/topology/cluster_cpus_list
0-3
[1] commit c5e22feffdd7 ("topology: Represent clusters of CPUs within a die")
Tested-by: Jie Zhan <zhanjie9@hisilicon.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: james.clark@arm.com
Cc: 21cnbao@gmail.com
Cc: prime.zeng@hisilicon.com
Cc: Jonathan.Cameron@huawei.com
Cc: fanghao11@huawei.com
Cc: linuxarm@huawei.com
Cc: tim.c.chen@intel.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240208024026.2691-1-yangyicong@huawei.com
2024-02-07 19:40:26 -07:00
|
|
|
else if (a->cluster != b->cluster)
|
|
|
|
return a->cluster - b->cluster;
|
2023-05-17 10:27:42 -07:00
|
|
|
else if (a->cache_lvl != b->cache_lvl)
|
|
|
|
return a->cache_lvl - b->cache_lvl;
|
|
|
|
else if (a->cache != b->cache)
|
|
|
|
return a->cache - b->cache;
|
2020-11-26 07:13:28 -07:00
|
|
|
else if (a->core != b->core)
|
2020-11-26 07:13:27 -07:00
|
|
|
return a->core - b->core;
|
2020-11-26 07:13:28 -07:00
|
|
|
else
|
2022-09-30 13:21:10 -07:00
|
|
|
return a->thread_idx - b->thread_idx;
|
2013-02-14 05:57:27 -07:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:21 -07:00
|
|
|
struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus,
|
|
|
|
aggr_cpu_id_get_t get_id,
|
2022-10-17 19:02:13 -07:00
|
|
|
void *data, bool needs_sort)
|
2013-02-14 05:57:27 -07:00
|
|
|
{
|
2022-01-04 23:13:51 -07:00
|
|
|
int idx;
|
|
|
|
struct perf_cpu cpu;
|
2023-04-12 08:45:45 -07:00
|
|
|
struct cpu_aggr_map *c = cpu_aggr_map__empty_new(perf_cpu_map__nr(cpus));
|
2013-02-06 07:46:01 -07:00
|
|
|
|
2013-02-14 05:57:27 -07:00
|
|
|
if (!c)
|
2022-01-04 23:13:21 -07:00
|
|
|
return NULL;
|
2013-02-06 07:46:01 -07:00
|
|
|
|
2020-11-26 07:13:18 -07:00
|
|
|
/* Reset size as it may only be partially filled */
|
|
|
|
c->nr = 0;
|
|
|
|
|
2022-01-04 23:13:21 -07:00
|
|
|
perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
|
|
|
|
bool duplicate = false;
|
|
|
|
struct aggr_cpu_id cpu_id = get_id(cpu, data);
|
|
|
|
|
|
|
|
for (int j = 0; j < c->nr; j++) {
|
|
|
|
if (aggr_cpu_id__equal(&cpu_id, &c->map[j])) {
|
|
|
|
duplicate = true;
|
2013-02-06 07:46:01 -07:00
|
|
|
break;
|
2022-01-04 23:13:21 -07:00
|
|
|
}
|
2013-02-06 07:46:01 -07:00
|
|
|
}
|
2022-01-04 23:13:21 -07:00
|
|
|
if (!duplicate) {
|
|
|
|
c->map[c->nr] = cpu_id;
|
2013-02-14 05:57:27 -07:00
|
|
|
c->nr++;
|
2013-02-06 07:46:01 -07:00
|
|
|
}
|
|
|
|
}
|
2022-01-04 23:13:25 -07:00
|
|
|
/* Trim. */
|
2023-04-12 08:45:45 -07:00
|
|
|
if (c->nr != perf_cpu_map__nr(cpus)) {
|
2022-01-04 23:13:25 -07:00
|
|
|
struct cpu_aggr_map *trimmed_c =
|
|
|
|
realloc(c,
|
|
|
|
sizeof(struct cpu_aggr_map) + sizeof(struct aggr_cpu_id) * c->nr);
|
|
|
|
|
|
|
|
if (trimmed_c)
|
|
|
|
c = trimmed_c;
|
|
|
|
}
|
2022-10-17 19:02:13 -07:00
|
|
|
|
2013-02-14 05:57:27 -07:00
|
|
|
/* ensure we process id in increasing order */
|
2022-10-17 19:02:13 -07:00
|
|
|
if (needs_sort)
|
|
|
|
qsort(c->map, c->nr, sizeof(struct aggr_cpu_id), aggr_cpu_id__cmp);
|
2022-01-04 23:13:21 -07:00
|
|
|
|
|
|
|
return c;
|
2013-02-14 05:57:27 -07:00
|
|
|
|
2013-02-06 07:46:01 -07:00
|
|
|
}
|
2013-02-14 05:57:27 -07:00
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
int cpu__get_die_id(struct perf_cpu cpu)
|
2019-06-04 15:50:40 -07:00
|
|
|
{
|
2022-01-04 23:13:51 -07:00
|
|
|
int value, ret = cpu__get_topology_int(cpu.cpu, "die_id", &value);
|
2019-06-04 15:50:40 -07:00
|
|
|
|
|
|
|
return ret ?: value;
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
struct aggr_cpu_id aggr_cpu_id__die(struct perf_cpu cpu, void *data)
|
2019-06-04 15:50:42 -07:00
|
|
|
{
|
2022-01-04 23:13:05 -07:00
|
|
|
struct aggr_cpu_id id;
|
|
|
|
int die;
|
2019-06-04 15:50:42 -07:00
|
|
|
|
2022-01-04 23:13:19 -07:00
|
|
|
die = cpu__get_die_id(cpu);
|
2019-06-04 15:50:42 -07:00
|
|
|
/* There is no die_id on legacy system. */
|
2020-11-26 07:13:25 -07:00
|
|
|
if (die == -1)
|
|
|
|
die = 0;
|
2019-06-04 15:50:42 -07:00
|
|
|
|
|
|
|
/*
|
2020-11-26 07:13:25 -07:00
|
|
|
* die_id is relative to socket, so start
|
|
|
|
* with the socket ID and then add die to
|
|
|
|
* make a unique ID.
|
2019-06-04 15:50:42 -07:00
|
|
|
*/
|
2022-01-04 23:13:22 -07:00
|
|
|
id = aggr_cpu_id__socket(cpu, data);
|
2022-01-04 23:13:17 -07:00
|
|
|
if (aggr_cpu_id__is_empty(&id))
|
2020-11-26 07:13:25 -07:00
|
|
|
return id;
|
2019-06-04 15:50:42 -07:00
|
|
|
|
2020-11-26 07:13:26 -07:00
|
|
|
id.die = die;
|
2020-11-26 07:13:20 -07:00
|
|
|
return id;
|
2019-06-04 15:50:42 -07:00
|
|
|
}
|
|
|
|
|
perf stat: Support per-cluster aggregation
Some platforms have 'cluster' topology and CPUs in the cluster will
share resources like L3 Cache Tag (for HiSilicon Kunpeng SoC) or L2
cache (for Intel Jacobsville). Currently parsing and building cluster
topology have been supported since [1].
perf stat has already supported aggregation for other topologies like
die or socket, etc. It'll be useful to aggregate per-cluster to find
problems like L3T bandwidth contention.
This patch add support for "--per-cluster" option for per-cluster
aggregation. Also update the docs and related test. The output will
be like:
[root@localhost tmp]# perf stat -a -e LLC-load --per-cluster -- sleep 5
Performance counter stats for 'system wide':
S56-D0-CLS158 4 1,321,521,570 LLC-load
S56-D0-CLS594 4 794,211,453 LLC-load
S56-D0-CLS1030 4 41,623 LLC-load
S56-D0-CLS1466 4 41,646 LLC-load
S56-D0-CLS1902 4 16,863 LLC-load
S56-D0-CLS2338 4 15,721 LLC-load
S56-D0-CLS2774 4 22,671 LLC-load
[...]
On a legacy system without cluster or cluster support, the output will
be look like:
[root@localhost perf]# perf stat -a -e cycles --per-cluster -- sleep 1
Performance counter stats for 'system wide':
S56-D0-CLS0 64 18,011,485 cycles
S7182-D0-CLS0 64 16,548,835 cycles
Note that this patch doesn't mix the cluster information in the outputs
of --per-core to avoid breaking any tools/scripts using it.
Note that perf recently supports "--per-cache" aggregation, but it's not
the same with the cluster although cluster CPUs may share some cache
resources. For example on my machine all clusters within a die share the
same L3 cache:
$ cat /sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_list
0-31
$ cat /sys/devices/system/cpu/cpu0/topology/cluster_cpus_list
0-3
[1] commit c5e22feffdd7 ("topology: Represent clusters of CPUs within a die")
Tested-by: Jie Zhan <zhanjie9@hisilicon.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: james.clark@arm.com
Cc: 21cnbao@gmail.com
Cc: prime.zeng@hisilicon.com
Cc: Jonathan.Cameron@huawei.com
Cc: fanghao11@huawei.com
Cc: linuxarm@huawei.com
Cc: tim.c.chen@intel.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240208024026.2691-1-yangyicong@huawei.com
2024-02-07 19:40:26 -07:00
|
|
|
int cpu__get_cluster_id(struct perf_cpu cpu)
|
|
|
|
{
|
|
|
|
int value, ret = cpu__get_topology_int(cpu.cpu, "cluster_id", &value);
|
|
|
|
|
|
|
|
return ret ?: value;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct aggr_cpu_id aggr_cpu_id__cluster(struct perf_cpu cpu, void *data)
|
|
|
|
{
|
|
|
|
int cluster = cpu__get_cluster_id(cpu);
|
|
|
|
struct aggr_cpu_id id;
|
|
|
|
|
|
|
|
/* There is no cluster_id on legacy system. */
|
|
|
|
if (cluster == -1)
|
|
|
|
cluster = 0;
|
|
|
|
|
|
|
|
id = aggr_cpu_id__die(cpu, data);
|
|
|
|
if (aggr_cpu_id__is_empty(&id))
|
|
|
|
return id;
|
|
|
|
|
|
|
|
id.cluster = cluster;
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
int cpu__get_core_id(struct perf_cpu cpu)
|
2013-02-14 05:57:29 -07:00
|
|
|
{
|
2022-01-04 23:13:51 -07:00
|
|
|
int value, ret = cpu__get_topology_int(cpu.cpu, "core_id", &value);
|
2015-09-11 06:49:45 -07:00
|
|
|
return ret ?: value;
|
2015-09-01 06:58:11 -07:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
struct aggr_cpu_id aggr_cpu_id__core(struct perf_cpu cpu, void *data)
|
2015-09-01 06:58:11 -07:00
|
|
|
{
|
2022-01-04 23:13:05 -07:00
|
|
|
struct aggr_cpu_id id;
|
2022-01-04 23:13:19 -07:00
|
|
|
int core = cpu__get_core_id(cpu);
|
2015-09-01 06:58:11 -07:00
|
|
|
|
perf stat: Support per-cluster aggregation
Some platforms have 'cluster' topology and CPUs in the cluster will
share resources like L3 Cache Tag (for HiSilicon Kunpeng SoC) or L2
cache (for Intel Jacobsville). Currently parsing and building cluster
topology have been supported since [1].
perf stat has already supported aggregation for other topologies like
die or socket, etc. It'll be useful to aggregate per-cluster to find
problems like L3T bandwidth contention.
This patch add support for "--per-cluster" option for per-cluster
aggregation. Also update the docs and related test. The output will
be like:
[root@localhost tmp]# perf stat -a -e LLC-load --per-cluster -- sleep 5
Performance counter stats for 'system wide':
S56-D0-CLS158 4 1,321,521,570 LLC-load
S56-D0-CLS594 4 794,211,453 LLC-load
S56-D0-CLS1030 4 41,623 LLC-load
S56-D0-CLS1466 4 41,646 LLC-load
S56-D0-CLS1902 4 16,863 LLC-load
S56-D0-CLS2338 4 15,721 LLC-load
S56-D0-CLS2774 4 22,671 LLC-load
[...]
On a legacy system without cluster or cluster support, the output will
be look like:
[root@localhost perf]# perf stat -a -e cycles --per-cluster -- sleep 1
Performance counter stats for 'system wide':
S56-D0-CLS0 64 18,011,485 cycles
S7182-D0-CLS0 64 16,548,835 cycles
Note that this patch doesn't mix the cluster information in the outputs
of --per-core to avoid breaking any tools/scripts using it.
Note that perf recently supports "--per-cache" aggregation, but it's not
the same with the cluster although cluster CPUs may share some cache
resources. For example on my machine all clusters within a die share the
same L3 cache:
$ cat /sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_list
0-31
$ cat /sys/devices/system/cpu/cpu0/topology/cluster_cpus_list
0-3
[1] commit c5e22feffdd7 ("topology: Represent clusters of CPUs within a die")
Tested-by: Jie Zhan <zhanjie9@hisilicon.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: james.clark@arm.com
Cc: 21cnbao@gmail.com
Cc: prime.zeng@hisilicon.com
Cc: Jonathan.Cameron@huawei.com
Cc: fanghao11@huawei.com
Cc: linuxarm@huawei.com
Cc: tim.c.chen@intel.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240208024026.2691-1-yangyicong@huawei.com
2024-02-07 19:40:26 -07:00
|
|
|
/* aggr_cpu_id__die returns a struct with socket die, and cluster set. */
|
|
|
|
id = aggr_cpu_id__cluster(cpu, data);
|
2022-01-04 23:13:17 -07:00
|
|
|
if (aggr_cpu_id__is_empty(&id))
|
2020-11-26 07:13:20 -07:00
|
|
|
return id;
|
2013-02-14 05:57:29 -07:00
|
|
|
|
|
|
|
/*
|
2020-11-26 07:13:26 -07:00
|
|
|
* core_id is relative to socket and die, we need a global id.
|
|
|
|
* So we combine the result from cpu_map__get_die with the core id
|
2013-02-14 05:57:29 -07:00
|
|
|
*/
|
2022-01-04 23:13:05 -07:00
|
|
|
id.core = core;
|
2020-11-26 07:13:20 -07:00
|
|
|
return id;
|
2022-01-04 23:13:05 -07:00
|
|
|
|
2013-02-14 05:57:29 -07:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
struct aggr_cpu_id aggr_cpu_id__cpu(struct perf_cpu cpu, void *data)
|
2022-01-04 23:13:27 -07:00
|
|
|
{
|
|
|
|
struct aggr_cpu_id id;
|
|
|
|
|
|
|
|
/* aggr_cpu_id__core returns a struct with socket, die and core set. */
|
|
|
|
id = aggr_cpu_id__core(cpu, data);
|
|
|
|
if (aggr_cpu_id__is_empty(&id))
|
|
|
|
return id;
|
|
|
|
|
|
|
|
id.cpu = cpu;
|
|
|
|
return id;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
struct aggr_cpu_id aggr_cpu_id__node(struct perf_cpu cpu, void *data __maybe_unused)
|
perf stat: Add --per-node agregation support
Adding new --per-node option to aggregate counts per NUMA
nodes for system-wide mode measurements.
You can specify --per-node in live mode:
# perf stat -a -I 1000 -e cycles --per-node
# time node cpus counts unit events
1.000542550 N0 20 6,202,097 cycles
1.000542550 N1 20 639,559 cycles
2.002040063 N0 20 7,412,495 cycles
2.002040063 N1 20 2,185,577 cycles
3.003451699 N0 20 6,508,917 cycles
3.003451699 N1 20 765,607 cycles
...
Or in the record/report stat session:
# perf stat record -a -I 1000 -e cycles
# time counts unit events
1.000536937 10,008,468 cycles
2.002090152 9,578,539 cycles
3.003625233 7,647,869 cycles
4.005135036 7,032,086 cycles
^C 4.340902364 3,923,893 cycles
# perf stat report --per-node
# time node cpus counts unit events
1.000536937 N0 20 9,355,086 cycles
1.000536937 N1 20 653,382 cycles
2.002090152 N0 20 7,712,838 cycles
2.002090152 N1 20 1,865,701 cycles
3.003625233 N0 20 6,604,441 cycles
3.003625233 N1 20 1,043,428 cycles
4.005135036 N0 20 6,350,522 cycles
4.005135036 N1 20 681,564 cycles
4.340902364 N0 20 3,403,188 cycles
4.340902364 N1 20 520,705 cycles
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20190904073415.723-4-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-08-28 01:17:43 -07:00
|
|
|
{
|
2022-01-04 23:13:17 -07:00
|
|
|
struct aggr_cpu_id id = aggr_cpu_id__empty();
|
2020-11-26 07:13:20 -07:00
|
|
|
|
2022-01-04 23:13:18 -07:00
|
|
|
id.node = cpu__get_node(cpu);
|
2022-01-04 23:13:05 -07:00
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2022-10-17 19:02:11 -07:00
|
|
|
struct aggr_cpu_id aggr_cpu_id__global(struct perf_cpu cpu, void *data __maybe_unused)
|
|
|
|
{
|
|
|
|
struct aggr_cpu_id id = aggr_cpu_id__empty();
|
|
|
|
|
|
|
|
/* it always aggregates to the cpu 0 */
|
|
|
|
cpu.cpu = 0;
|
|
|
|
id.cpu = cpu;
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2014-04-07 11:55:21 -07:00
|
|
|
/* setup simple routines to easily access node numbers given a cpu number */
|
|
|
|
static int get_max_num(char *path, int *max)
|
|
|
|
{
|
|
|
|
size_t num;
|
|
|
|
char *buf;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (filename__read_str(path, &buf, &num))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
buf[num] = '\0';
|
|
|
|
|
|
|
|
/* start on the right, to find highest node num */
|
|
|
|
while (--num) {
|
|
|
|
if ((buf[num] == ',') || (buf[num] == '-')) {
|
|
|
|
num++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (sscanf(&buf[num], "%d", max) < 1) {
|
|
|
|
err = -1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* convert from 0-based to 1-based */
|
|
|
|
(*max)++;
|
|
|
|
|
|
|
|
out:
|
|
|
|
free(buf);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Determine highest possible cpu in the system for sparse allocation */
|
|
|
|
static void set_max_cpu_num(void)
|
|
|
|
{
|
|
|
|
const char *mnt;
|
|
|
|
char path[PATH_MAX];
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
/* set up default */
|
2022-01-04 23:13:51 -07:00
|
|
|
max_cpu_num.cpu = 4096;
|
|
|
|
max_present_cpu_num.cpu = 4096;
|
2014-04-07 11:55:21 -07:00
|
|
|
|
|
|
|
mnt = sysfs__mountpoint();
|
|
|
|
if (!mnt)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* get the highest possible cpu number for a sparse allocation */
|
2014-04-07 11:55:22 -07:00
|
|
|
ret = snprintf(path, PATH_MAX, "%s/devices/system/cpu/possible", mnt);
|
2020-03-24 00:03:19 -07:00
|
|
|
if (ret >= PATH_MAX) {
|
2014-04-07 11:55:21 -07:00
|
|
|
pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
ret = get_max_num(path, &max_cpu_num.cpu);
|
2017-02-17 04:10:24 -07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* get the highest present cpu number for a sparse allocation */
|
|
|
|
ret = snprintf(path, PATH_MAX, "%s/devices/system/cpu/present", mnt);
|
2020-03-24 00:03:19 -07:00
|
|
|
if (ret >= PATH_MAX) {
|
2017-02-17 04:10:24 -07:00
|
|
|
pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
ret = get_max_num(path, &max_present_cpu_num.cpu);
|
2014-04-07 11:55:21 -07:00
|
|
|
|
|
|
|
out:
|
|
|
|
if (ret)
|
2022-01-04 23:13:51 -07:00
|
|
|
pr_err("Failed to read max cpus, using default of %d\n", max_cpu_num.cpu);
|
2014-04-07 11:55:21 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Determine highest possible node in the system for sparse allocation */
|
|
|
|
static void set_max_node_num(void)
|
|
|
|
{
|
|
|
|
const char *mnt;
|
|
|
|
char path[PATH_MAX];
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
/* set up default */
|
|
|
|
max_node_num = 8;
|
|
|
|
|
|
|
|
mnt = sysfs__mountpoint();
|
|
|
|
if (!mnt)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* get the highest possible cpu number for a sparse allocation */
|
|
|
|
ret = snprintf(path, PATH_MAX, "%s/devices/system/node/possible", mnt);
|
2020-03-24 00:03:19 -07:00
|
|
|
if (ret >= PATH_MAX) {
|
2014-04-07 11:55:21 -07:00
|
|
|
pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = get_max_num(path, &max_node_num);
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (ret)
|
|
|
|
pr_err("Failed to read max nodes, using default of %d\n", max_node_num);
|
|
|
|
}
|
|
|
|
|
2016-01-26 11:51:46 -07:00
|
|
|
int cpu__max_node(void)
|
|
|
|
{
|
|
|
|
if (unlikely(!max_node_num))
|
|
|
|
set_max_node_num();
|
|
|
|
|
|
|
|
return max_node_num;
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
struct perf_cpu cpu__max_cpu(void)
|
2016-01-26 11:51:46 -07:00
|
|
|
{
|
2022-01-04 23:13:51 -07:00
|
|
|
if (unlikely(!max_cpu_num.cpu))
|
2016-01-26 11:51:46 -07:00
|
|
|
set_max_cpu_num();
|
|
|
|
|
|
|
|
return max_cpu_num;
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
struct perf_cpu cpu__max_present_cpu(void)
|
2017-02-17 04:10:24 -07:00
|
|
|
{
|
2022-01-04 23:13:51 -07:00
|
|
|
if (unlikely(!max_present_cpu_num.cpu))
|
2017-02-17 04:10:24 -07:00
|
|
|
set_max_cpu_num();
|
|
|
|
|
|
|
|
return max_present_cpu_num;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
int cpu__get_node(struct perf_cpu cpu)
|
2016-01-26 11:51:46 -07:00
|
|
|
{
|
|
|
|
if (unlikely(cpunode_map == NULL)) {
|
|
|
|
pr_debug("cpu_map not initialized\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
return cpunode_map[cpu.cpu];
|
2016-01-26 11:51:46 -07:00
|
|
|
}
|
|
|
|
|
2014-04-07 11:55:21 -07:00
|
|
|
static int init_cpunode_map(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
set_max_cpu_num();
|
|
|
|
set_max_node_num();
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
cpunode_map = calloc(max_cpu_num.cpu, sizeof(int));
|
2014-04-07 11:55:21 -07:00
|
|
|
if (!cpunode_map) {
|
|
|
|
pr_err("%s: calloc failed\n", __func__);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
for (i = 0; i < max_cpu_num.cpu; i++)
|
2014-04-07 11:55:21 -07:00
|
|
|
cpunode_map[i] = -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int cpu__setup_cpunode_map(void)
|
|
|
|
{
|
|
|
|
struct dirent *dent1, *dent2;
|
|
|
|
DIR *dir1, *dir2;
|
|
|
|
unsigned int cpu, mem;
|
|
|
|
char buf[PATH_MAX];
|
|
|
|
char path[PATH_MAX];
|
|
|
|
const char *mnt;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
/* initialize globals */
|
|
|
|
if (init_cpunode_map())
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
mnt = sysfs__mountpoint();
|
|
|
|
if (!mnt)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
n = snprintf(path, PATH_MAX, "%s/devices/system/node", mnt);
|
2020-03-24 00:03:19 -07:00
|
|
|
if (n >= PATH_MAX) {
|
2014-04-07 11:55:21 -07:00
|
|
|
pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
dir1 = opendir(path);
|
|
|
|
if (!dir1)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* walk tree and setup map */
|
|
|
|
while ((dent1 = readdir(dir1)) != NULL) {
|
|
|
|
if (dent1->d_type != DT_DIR || sscanf(dent1->d_name, "node%u", &mem) < 1)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
n = snprintf(buf, PATH_MAX, "%s/%s", path, dent1->d_name);
|
2020-03-24 00:03:19 -07:00
|
|
|
if (n >= PATH_MAX) {
|
2014-04-07 11:55:21 -07:00
|
|
|
pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
dir2 = opendir(buf);
|
|
|
|
if (!dir2)
|
|
|
|
continue;
|
|
|
|
while ((dent2 = readdir(dir2)) != NULL) {
|
|
|
|
if (dent2->d_type != DT_LNK || sscanf(dent2->d_name, "cpu%u", &cpu) < 1)
|
|
|
|
continue;
|
|
|
|
cpunode_map[cpu] = mem;
|
|
|
|
}
|
|
|
|
closedir(dir2);
|
|
|
|
}
|
|
|
|
closedir(dir1);
|
|
|
|
return 0;
|
|
|
|
}
|
2016-04-12 06:29:25 -07:00
|
|
|
|
2019-07-21 04:23:49 -07:00
|
|
|
size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size)
|
2016-06-28 04:29:04 -07:00
|
|
|
{
|
2022-01-04 23:13:51 -07:00
|
|
|
int i, start = -1;
|
2016-06-28 04:29:04 -07:00
|
|
|
bool first = true;
|
|
|
|
size_t ret = 0;
|
|
|
|
|
|
|
|
#define COMMA first ? "" : ","
|
|
|
|
|
2023-04-12 08:45:45 -07:00
|
|
|
for (i = 0; i < perf_cpu_map__nr(map) + 1; i++) {
|
2022-01-04 23:13:51 -07:00
|
|
|
struct perf_cpu cpu = { .cpu = INT_MAX };
|
2023-04-12 08:45:45 -07:00
|
|
|
bool last = i == perf_cpu_map__nr(map);
|
2016-06-28 04:29:04 -07:00
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
if (!last)
|
2023-04-17 12:28:28 -07:00
|
|
|
cpu = perf_cpu_map__cpu(map, i);
|
2016-06-28 04:29:04 -07:00
|
|
|
|
|
|
|
if (start == -1) {
|
|
|
|
start = i;
|
|
|
|
if (last) {
|
|
|
|
ret += snprintf(buf + ret, size - ret,
|
|
|
|
"%s%d", COMMA,
|
2023-04-17 12:28:28 -07:00
|
|
|
perf_cpu_map__cpu(map, i).cpu);
|
2016-06-28 04:29:04 -07:00
|
|
|
}
|
2023-04-17 12:28:28 -07:00
|
|
|
} else if (((i - start) != (cpu.cpu - perf_cpu_map__cpu(map, start).cpu)) || last) {
|
2016-06-28 04:29:04 -07:00
|
|
|
int end = i - 1;
|
|
|
|
|
|
|
|
if (start == end) {
|
|
|
|
ret += snprintf(buf + ret, size - ret,
|
|
|
|
"%s%d", COMMA,
|
2023-04-17 12:28:28 -07:00
|
|
|
perf_cpu_map__cpu(map, start).cpu);
|
2016-06-28 04:29:04 -07:00
|
|
|
} else {
|
|
|
|
ret += snprintf(buf + ret, size - ret,
|
|
|
|
"%s%d-%d", COMMA,
|
2023-04-17 12:28:28 -07:00
|
|
|
perf_cpu_map__cpu(map, start).cpu, perf_cpu_map__cpu(map, end).cpu);
|
2016-06-28 04:29:04 -07:00
|
|
|
}
|
|
|
|
first = false;
|
|
|
|
start = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef COMMA
|
|
|
|
|
2019-02-20 05:27:59 -07:00
|
|
|
pr_debug2("cpumask list: %s\n", buf);
|
2016-06-28 04:29:04 -07:00
|
|
|
return ret;
|
|
|
|
}
|
2017-02-23 18:12:49 -07:00
|
|
|
|
|
|
|
static char hex_char(unsigned char val)
|
|
|
|
{
|
|
|
|
if (val < 10)
|
|
|
|
return val + '0';
|
|
|
|
if (val < 16)
|
|
|
|
return val - 10 + 'a';
|
|
|
|
return '?';
|
|
|
|
}
|
|
|
|
|
2019-07-21 04:23:49 -07:00
|
|
|
size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size)
|
2017-02-23 18:12:49 -07:00
|
|
|
{
|
2024-02-02 16:40:57 -07:00
|
|
|
int idx;
|
2017-02-23 18:12:49 -07:00
|
|
|
char *ptr = buf;
|
|
|
|
unsigned char *bitmap;
|
2024-02-02 16:40:57 -07:00
|
|
|
struct perf_cpu c, last_cpu = perf_cpu_map__max(map);
|
2017-02-23 18:12:49 -07:00
|
|
|
|
2019-08-02 01:29:52 -07:00
|
|
|
if (buf == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2022-01-04 23:13:51 -07:00
|
|
|
bitmap = zalloc(last_cpu.cpu / 8 + 1);
|
2017-02-23 18:12:49 -07:00
|
|
|
if (bitmap == NULL) {
|
|
|
|
buf[0] = '\0';
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2024-02-02 16:40:57 -07:00
|
|
|
perf_cpu_map__for_each_cpu(c, idx, map)
|
|
|
|
bitmap[c.cpu / 8] |= 1 << (c.cpu % 8);
|
2017-02-23 18:12:49 -07:00
|
|
|
|
2024-02-02 16:40:57 -07:00
|
|
|
for (int cpu = last_cpu.cpu / 4 * 4; cpu >= 0; cpu -= 4) {
|
2017-02-23 18:12:49 -07:00
|
|
|
unsigned char bits = bitmap[cpu / 8];
|
|
|
|
|
|
|
|
if (cpu % 8)
|
|
|
|
bits >>= 4;
|
|
|
|
else
|
|
|
|
bits &= 0xf;
|
|
|
|
|
|
|
|
*ptr++ = hex_char(bits);
|
|
|
|
if ((cpu % 32) == 0 && cpu > 0)
|
|
|
|
*ptr++ = ',';
|
|
|
|
}
|
|
|
|
*ptr = '\0';
|
|
|
|
free(bitmap);
|
|
|
|
|
|
|
|
buf[size - 1] = '\0';
|
|
|
|
return ptr - buf;
|
|
|
|
}
|
2019-01-22 10:50:57 -07:00
|
|
|
|
2023-05-27 00:21:43 -07:00
|
|
|
struct perf_cpu_map *cpu_map__online(void) /* thread unsafe */
|
2019-01-22 10:50:57 -07:00
|
|
|
{
|
2023-05-27 00:21:43 -07:00
|
|
|
static struct perf_cpu_map *online;
|
2019-01-22 10:50:57 -07:00
|
|
|
|
|
|
|
if (!online)
|
2023-11-28 23:02:01 -07:00
|
|
|
online = perf_cpu_map__new_online_cpus(); /* from /sys/devices/system/cpu/online */
|
2019-01-22 10:50:57 -07:00
|
|
|
|
|
|
|
return online;
|
|
|
|
}
|
2020-11-26 07:13:19 -07:00
|
|
|
|
2022-01-04 23:13:16 -07:00
|
|
|
bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b)
|
2020-11-26 07:13:19 -07:00
|
|
|
{
|
2022-09-30 13:21:10 -07:00
|
|
|
return a->thread_idx == b->thread_idx &&
|
2022-01-04 23:13:16 -07:00
|
|
|
a->node == b->node &&
|
|
|
|
a->socket == b->socket &&
|
|
|
|
a->die == b->die &&
|
perf stat: Support per-cluster aggregation
Some platforms have 'cluster' topology and CPUs in the cluster will
share resources like L3 Cache Tag (for HiSilicon Kunpeng SoC) or L2
cache (for Intel Jacobsville). Currently parsing and building cluster
topology have been supported since [1].
perf stat has already supported aggregation for other topologies like
die or socket, etc. It'll be useful to aggregate per-cluster to find
problems like L3T bandwidth contention.
This patch add support for "--per-cluster" option for per-cluster
aggregation. Also update the docs and related test. The output will
be like:
[root@localhost tmp]# perf stat -a -e LLC-load --per-cluster -- sleep 5
Performance counter stats for 'system wide':
S56-D0-CLS158 4 1,321,521,570 LLC-load
S56-D0-CLS594 4 794,211,453 LLC-load
S56-D0-CLS1030 4 41,623 LLC-load
S56-D0-CLS1466 4 41,646 LLC-load
S56-D0-CLS1902 4 16,863 LLC-load
S56-D0-CLS2338 4 15,721 LLC-load
S56-D0-CLS2774 4 22,671 LLC-load
[...]
On a legacy system without cluster or cluster support, the output will
be look like:
[root@localhost perf]# perf stat -a -e cycles --per-cluster -- sleep 1
Performance counter stats for 'system wide':
S56-D0-CLS0 64 18,011,485 cycles
S7182-D0-CLS0 64 16,548,835 cycles
Note that this patch doesn't mix the cluster information in the outputs
of --per-core to avoid breaking any tools/scripts using it.
Note that perf recently supports "--per-cache" aggregation, but it's not
the same with the cluster although cluster CPUs may share some cache
resources. For example on my machine all clusters within a die share the
same L3 cache:
$ cat /sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_list
0-31
$ cat /sys/devices/system/cpu/cpu0/topology/cluster_cpus_list
0-3
[1] commit c5e22feffdd7 ("topology: Represent clusters of CPUs within a die")
Tested-by: Jie Zhan <zhanjie9@hisilicon.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: james.clark@arm.com
Cc: 21cnbao@gmail.com
Cc: prime.zeng@hisilicon.com
Cc: Jonathan.Cameron@huawei.com
Cc: fanghao11@huawei.com
Cc: linuxarm@huawei.com
Cc: tim.c.chen@intel.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240208024026.2691-1-yangyicong@huawei.com
2024-02-07 19:40:26 -07:00
|
|
|
a->cluster == b->cluster &&
|
2023-05-17 10:27:42 -07:00
|
|
|
a->cache_lvl == b->cache_lvl &&
|
|
|
|
a->cache == b->cache &&
|
2022-01-04 23:13:27 -07:00
|
|
|
a->core == b->core &&
|
2022-01-04 23:13:51 -07:00
|
|
|
a->cpu.cpu == b->cpu.cpu;
|
2020-11-26 07:13:19 -07:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:17 -07:00
|
|
|
bool aggr_cpu_id__is_empty(const struct aggr_cpu_id *a)
|
2020-11-26 07:13:19 -07:00
|
|
|
{
|
2022-09-30 13:21:10 -07:00
|
|
|
return a->thread_idx == -1 &&
|
2022-01-04 23:13:17 -07:00
|
|
|
a->node == -1 &&
|
|
|
|
a->socket == -1 &&
|
|
|
|
a->die == -1 &&
|
perf stat: Support per-cluster aggregation
Some platforms have 'cluster' topology and CPUs in the cluster will
share resources like L3 Cache Tag (for HiSilicon Kunpeng SoC) or L2
cache (for Intel Jacobsville). Currently parsing and building cluster
topology have been supported since [1].
perf stat has already supported aggregation for other topologies like
die or socket, etc. It'll be useful to aggregate per-cluster to find
problems like L3T bandwidth contention.
This patch add support for "--per-cluster" option for per-cluster
aggregation. Also update the docs and related test. The output will
be like:
[root@localhost tmp]# perf stat -a -e LLC-load --per-cluster -- sleep 5
Performance counter stats for 'system wide':
S56-D0-CLS158 4 1,321,521,570 LLC-load
S56-D0-CLS594 4 794,211,453 LLC-load
S56-D0-CLS1030 4 41,623 LLC-load
S56-D0-CLS1466 4 41,646 LLC-load
S56-D0-CLS1902 4 16,863 LLC-load
S56-D0-CLS2338 4 15,721 LLC-load
S56-D0-CLS2774 4 22,671 LLC-load
[...]
On a legacy system without cluster or cluster support, the output will
be look like:
[root@localhost perf]# perf stat -a -e cycles --per-cluster -- sleep 1
Performance counter stats for 'system wide':
S56-D0-CLS0 64 18,011,485 cycles
S7182-D0-CLS0 64 16,548,835 cycles
Note that this patch doesn't mix the cluster information in the outputs
of --per-core to avoid breaking any tools/scripts using it.
Note that perf recently supports "--per-cache" aggregation, but it's not
the same with the cluster although cluster CPUs may share some cache
resources. For example on my machine all clusters within a die share the
same L3 cache:
$ cat /sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_list
0-31
$ cat /sys/devices/system/cpu/cpu0/topology/cluster_cpus_list
0-3
[1] commit c5e22feffdd7 ("topology: Represent clusters of CPUs within a die")
Tested-by: Jie Zhan <zhanjie9@hisilicon.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: james.clark@arm.com
Cc: 21cnbao@gmail.com
Cc: prime.zeng@hisilicon.com
Cc: Jonathan.Cameron@huawei.com
Cc: fanghao11@huawei.com
Cc: linuxarm@huawei.com
Cc: tim.c.chen@intel.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240208024026.2691-1-yangyicong@huawei.com
2024-02-07 19:40:26 -07:00
|
|
|
a->cluster == -1 &&
|
2023-05-17 10:27:42 -07:00
|
|
|
a->cache_lvl == -1 &&
|
|
|
|
a->cache == -1 &&
|
2022-01-04 23:13:27 -07:00
|
|
|
a->core == -1 &&
|
2022-01-04 23:13:51 -07:00
|
|
|
a->cpu.cpu == -1;
|
2020-11-26 07:13:19 -07:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:17 -07:00
|
|
|
struct aggr_cpu_id aggr_cpu_id__empty(void)
|
2020-11-26 07:13:19 -07:00
|
|
|
{
|
|
|
|
struct aggr_cpu_id ret = {
|
2022-09-30 13:21:10 -07:00
|
|
|
.thread_idx = -1,
|
2020-11-26 07:13:25 -07:00
|
|
|
.node = -1,
|
2020-11-26 07:13:26 -07:00
|
|
|
.socket = -1,
|
2020-11-26 07:13:27 -07:00
|
|
|
.die = -1,
|
perf stat: Support per-cluster aggregation
Some platforms have 'cluster' topology and CPUs in the cluster will
share resources like L3 Cache Tag (for HiSilicon Kunpeng SoC) or L2
cache (for Intel Jacobsville). Currently parsing and building cluster
topology have been supported since [1].
perf stat has already supported aggregation for other topologies like
die or socket, etc. It'll be useful to aggregate per-cluster to find
problems like L3T bandwidth contention.
This patch add support for "--per-cluster" option for per-cluster
aggregation. Also update the docs and related test. The output will
be like:
[root@localhost tmp]# perf stat -a -e LLC-load --per-cluster -- sleep 5
Performance counter stats for 'system wide':
S56-D0-CLS158 4 1,321,521,570 LLC-load
S56-D0-CLS594 4 794,211,453 LLC-load
S56-D0-CLS1030 4 41,623 LLC-load
S56-D0-CLS1466 4 41,646 LLC-load
S56-D0-CLS1902 4 16,863 LLC-load
S56-D0-CLS2338 4 15,721 LLC-load
S56-D0-CLS2774 4 22,671 LLC-load
[...]
On a legacy system without cluster or cluster support, the output will
be look like:
[root@localhost perf]# perf stat -a -e cycles --per-cluster -- sleep 1
Performance counter stats for 'system wide':
S56-D0-CLS0 64 18,011,485 cycles
S7182-D0-CLS0 64 16,548,835 cycles
Note that this patch doesn't mix the cluster information in the outputs
of --per-core to avoid breaking any tools/scripts using it.
Note that perf recently supports "--per-cache" aggregation, but it's not
the same with the cluster although cluster CPUs may share some cache
resources. For example on my machine all clusters within a die share the
same L3 cache:
$ cat /sys/devices/system/cpu/cpu0/cache/index3/shared_cpu_list
0-31
$ cat /sys/devices/system/cpu/cpu0/topology/cluster_cpus_list
0-3
[1] commit c5e22feffdd7 ("topology: Represent clusters of CPUs within a die")
Tested-by: Jie Zhan <zhanjie9@hisilicon.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: james.clark@arm.com
Cc: 21cnbao@gmail.com
Cc: prime.zeng@hisilicon.com
Cc: Jonathan.Cameron@huawei.com
Cc: fanghao11@huawei.com
Cc: linuxarm@huawei.com
Cc: tim.c.chen@intel.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240208024026.2691-1-yangyicong@huawei.com
2024-02-07 19:40:26 -07:00
|
|
|
.cluster = -1,
|
2023-05-17 10:27:42 -07:00
|
|
|
.cache_lvl = -1,
|
|
|
|
.cache = -1,
|
2022-01-04 23:13:27 -07:00
|
|
|
.core = -1,
|
2022-01-04 23:13:51 -07:00
|
|
|
.cpu = (struct perf_cpu){ .cpu = -1 },
|
2020-11-26 07:13:19 -07:00
|
|
|
};
|
|
|
|
return ret;
|
|
|
|
}
|