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
|
2017-04-18 06:46:11 -07:00
|
|
|
#include <errno.h>
|
2022-04-13 02:33:02 -07:00
|
|
|
#include <linux/err.h>
|
2017-04-17 11:23:08 -07:00
|
|
|
#include <inttypes.h>
|
2012-09-17 01:31:14 -07:00
|
|
|
#include <math.h>
|
2019-08-30 10:45:20 -07:00
|
|
|
#include <string.h>
|
2019-08-21 10:02:05 -07:00
|
|
|
#include "counts.h"
|
2019-09-10 08:29:02 -07:00
|
|
|
#include "cpumap.h"
|
2019-08-29 11:56:40 -07:00
|
|
|
#include "debug.h"
|
2019-08-30 10:45:20 -07:00
|
|
|
#include "header.h"
|
2012-09-17 01:31:14 -07:00
|
|
|
#include "stat.h"
|
2019-08-30 10:45:20 -07:00
|
|
|
#include "session.h"
|
2019-08-22 11:40:29 -07:00
|
|
|
#include "target.h"
|
2015-06-26 02:29:16 -07:00
|
|
|
#include "evlist.h"
|
2015-06-04 06:50:55 -07:00
|
|
|
#include "evsel.h"
|
2015-06-26 02:29:16 -07:00
|
|
|
#include "thread_map.h"
|
2022-08-23 22:06:04 -07:00
|
|
|
#include "util/hashmap.h"
|
2019-07-04 07:32:27 -07:00
|
|
|
#include <linux/zalloc.h>
|
2012-09-17 01:31:14 -07:00
|
|
|
|
|
|
|
void update_stats(struct stats *stats, u64 val)
|
|
|
|
{
|
|
|
|
double delta;
|
|
|
|
|
|
|
|
stats->n++;
|
|
|
|
delta = val - stats->mean;
|
|
|
|
stats->mean += delta / stats->n;
|
|
|
|
stats->M2 += delta*(val - stats->mean);
|
2013-08-02 13:05:40 -07:00
|
|
|
|
|
|
|
if (val > stats->max)
|
|
|
|
stats->max = val;
|
|
|
|
|
|
|
|
if (val < stats->min)
|
|
|
|
stats->min = val;
|
2012-09-17 01:31:14 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
double avg_stats(struct stats *stats)
|
|
|
|
{
|
|
|
|
return stats->mean;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* http://en.wikipedia.org/wiki/Algorithms_for_calculating_variance
|
|
|
|
*
|
|
|
|
* (\Sum n_i^2) - ((\Sum n_i)^2)/n
|
|
|
|
* s^2 = -------------------------------
|
|
|
|
* n - 1
|
|
|
|
*
|
|
|
|
* http://en.wikipedia.org/wiki/Stddev
|
|
|
|
*
|
|
|
|
* The std dev of the mean is related to the std dev by:
|
|
|
|
*
|
|
|
|
* s
|
|
|
|
* s_mean = -------
|
|
|
|
* sqrt(n)
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
double stddev_stats(struct stats *stats)
|
|
|
|
{
|
|
|
|
double variance, variance_mean;
|
|
|
|
|
2013-05-25 17:24:48 -07:00
|
|
|
if (stats->n < 2)
|
2012-09-17 01:31:14 -07:00
|
|
|
return 0.0;
|
|
|
|
|
|
|
|
variance = stats->M2 / (stats->n - 1);
|
|
|
|
variance_mean = variance / stats->n;
|
|
|
|
|
|
|
|
return sqrt(variance_mean);
|
|
|
|
}
|
|
|
|
|
|
|
|
double rel_stddev_stats(double stddev, double avg)
|
|
|
|
{
|
|
|
|
double pct = 0.0;
|
|
|
|
|
|
|
|
if (avg)
|
|
|
|
pct = 100.0 * stddev/avg;
|
|
|
|
|
|
|
|
return pct;
|
|
|
|
}
|
2015-06-04 06:50:55 -07:00
|
|
|
|
2022-10-17 19:02:20 -07:00
|
|
|
static void evsel__reset_aggr_stats(struct evsel *evsel)
|
2015-06-26 02:29:14 -07:00
|
|
|
{
|
2017-10-26 10:22:34 -07:00
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
2022-10-17 19:02:14 -07:00
|
|
|
struct perf_stat_aggr *aggr = ps->aggr;
|
2015-06-26 02:29:14 -07:00
|
|
|
|
2022-10-17 19:02:14 -07:00
|
|
|
if (aggr)
|
|
|
|
memset(aggr, 0, sizeof(*aggr) * ps->nr_aggr);
|
2015-06-26 02:29:14 -07:00
|
|
|
}
|
|
|
|
|
2022-10-17 19:02:20 -07:00
|
|
|
static void evsel__reset_stat_priv(struct evsel *evsel)
|
|
|
|
{
|
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
|
|
|
|
|
|
|
init_stats(&ps->res_stats);
|
|
|
|
evsel__reset_aggr_stats(evsel);
|
|
|
|
}
|
|
|
|
|
2022-10-17 19:02:19 -07:00
|
|
|
static int evsel__alloc_aggr_stats(struct evsel *evsel, int nr_aggr)
|
|
|
|
{
|
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
|
|
|
|
|
|
|
if (ps == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ps->nr_aggr = nr_aggr;
|
|
|
|
ps->aggr = calloc(nr_aggr, sizeof(*ps->aggr));
|
|
|
|
if (ps->aggr == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int evlist__alloc_aggr_stats(struct evlist *evlist, int nr_aggr)
|
|
|
|
{
|
|
|
|
struct evsel *evsel;
|
|
|
|
|
|
|
|
evlist__for_each_entry(evlist, evsel) {
|
|
|
|
if (evsel__alloc_aggr_stats(evsel, nr_aggr) < 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2022-10-17 19:02:14 -07:00
|
|
|
|
|
|
|
static int evsel__alloc_stat_priv(struct evsel *evsel, int nr_aggr)
|
2015-06-26 02:29:14 -07:00
|
|
|
{
|
2022-10-17 19:02:14 -07:00
|
|
|
struct perf_stat_evsel *ps;
|
|
|
|
|
|
|
|
ps = zalloc(sizeof(*ps));
|
|
|
|
if (ps == NULL)
|
2015-06-26 02:29:14 -07:00
|
|
|
return -ENOMEM;
|
2022-10-17 19:02:14 -07:00
|
|
|
|
2022-10-17 19:02:19 -07:00
|
|
|
evsel->stats = ps;
|
|
|
|
|
|
|
|
if (nr_aggr && evsel__alloc_aggr_stats(evsel, nr_aggr) < 0) {
|
|
|
|
evsel->stats = NULL;
|
|
|
|
free(ps);
|
|
|
|
return -ENOMEM;
|
2022-10-17 19:02:14 -07:00
|
|
|
}
|
|
|
|
|
2020-05-06 09:38:26 -07:00
|
|
|
evsel__reset_stat_priv(evsel);
|
2015-06-26 02:29:14 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-05-06 09:38:26 -07:00
|
|
|
static void evsel__free_stat_priv(struct evsel *evsel)
|
2015-06-26 02:29:14 -07:00
|
|
|
{
|
2017-10-26 10:22:34 -07:00
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
2017-07-26 05:02:05 -07:00
|
|
|
|
2022-10-17 19:02:14 -07:00
|
|
|
if (ps) {
|
|
|
|
zfree(&ps->aggr);
|
2019-07-04 08:06:20 -07:00
|
|
|
zfree(&ps->group_data);
|
2022-10-17 19:02:14 -07:00
|
|
|
}
|
2017-10-26 10:22:34 -07:00
|
|
|
zfree(&evsel->stats);
|
2015-06-26 02:29:14 -07:00
|
|
|
}
|
2015-06-26 02:29:15 -07:00
|
|
|
|
2022-01-04 23:13:29 -07:00
|
|
|
static int evsel__alloc_prev_raw_counts(struct evsel *evsel)
|
2015-06-26 02:29:15 -07:00
|
|
|
{
|
2022-01-04 23:13:29 -07:00
|
|
|
int cpu_map_nr = evsel__nr_cpus(evsel);
|
|
|
|
int nthreads = perf_thread_map__nr(evsel->core.threads);
|
2015-06-26 02:29:15 -07:00
|
|
|
struct perf_counts *counts;
|
|
|
|
|
2022-01-04 23:13:29 -07:00
|
|
|
counts = perf_counts__new(cpu_map_nr, nthreads);
|
2015-06-26 02:29:15 -07:00
|
|
|
if (counts)
|
|
|
|
evsel->prev_raw_counts = counts;
|
|
|
|
|
|
|
|
return counts ? 0 : -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2020-05-06 09:38:26 -07:00
|
|
|
static void evsel__free_prev_raw_counts(struct evsel *evsel)
|
2015-06-26 02:29:15 -07:00
|
|
|
{
|
|
|
|
perf_counts__delete(evsel->prev_raw_counts);
|
|
|
|
evsel->prev_raw_counts = NULL;
|
|
|
|
}
|
2015-06-26 02:29:16 -07:00
|
|
|
|
2020-05-06 09:38:26 -07:00
|
|
|
static void evsel__reset_prev_raw_counts(struct evsel *evsel)
|
perf stat: Reset previous counts on repeat with interval
When using 'perf stat' with repeat and interval option, it shows wrong
values for events.
The wrong values will be shown for the first interval on the second and
subsequent repetitions.
Without the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.000282489 53 faults
2.000282489 513 sched:sched_switch
4.005478208 3,721 faults
4.005478208 2,666 sched:sched_switch
5.025470933 395 faults
5.025470933 1,307 sched:sched_switch
2.009602825 1,84,46,74,40,73,70,95,47,520 faults <------
2.009602825 1,84,46,74,40,73,70,95,49,568 sched:sched_switch <------
4.019612206 4,730 faults
4.019612206 2,746 sched:sched_switch
5.039615484 3,953 faults
5.039615484 1,496 sched:sched_switch
2.000274620 1,84,46,74,40,73,70,95,47,520 faults <------
2.000274620 1,84,46,74,40,73,70,95,47,520 sched:sched_switch <------
4.000480342 4,282 faults
4.000480342 2,303 sched:sched_switch
5.000916811 1,322 faults
5.000916811 1,064 sched:sched_switch
#
prev_raw_counts is allocated when using intervals. This is used when
calculating the difference in the counts of events when using interval.
The current counts are stored in prev_raw_counts to calculate the
differences in the next iteration.
On the first interval of the second and subsequent repetitions,
prev_raw_counts would be the values stored in the last interval of the
previous repetitions, while the current counts will only be for the
first interval of the current repetition.
Hence there is a possibility of events showing up as big number.
Fix this by resetting prev_raw_counts whenever perf stat repeats the
command.
With the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.019349347 2,597 faults
2.019349347 2,753 sched:sched_switch
4.019577372 3,098 faults
4.019577372 2,532 sched:sched_switch
5.019415481 1,879 faults
5.019415481 1,356 sched:sched_switch
2.000178813 8,468 faults
2.000178813 2,254 sched:sched_switch
4.000404621 7,440 faults
4.000404621 1,266 sched:sched_switch
5.040196079 2,458 faults
5.040196079 556 sched:sched_switch
2.000191939 6,870 faults
2.000191939 1,170 sched:sched_switch
4.000414103 541 faults
4.000414103 902 sched:sched_switch
5.000809863 450 faults
5.000809863 364 sched:sched_switch
#
Committer notes:
This was broken since the cset introducing the --interval feature, i.e.
--repeat + --interval wasn't tested at that point, add the Fixes tag so
that automatic scripts can pick this up.
Fixes: 13370a9b5bb8 ("perf stat: Add interval printing")
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: stable@vger.kernel.org # v3.9+
Link: http://lore.kernel.org/lkml/20190904094738.9558-2-srikar@linux.vnet.ibm.com
[ Fixed up conflicts with libperf, i.e. some perf_{evsel,evlist} lost the 'perf' prefix ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-09-04 02:47:37 -07:00
|
|
|
{
|
2020-05-19 21:27:34 -07:00
|
|
|
if (evsel->prev_raw_counts)
|
|
|
|
perf_counts__reset(evsel->prev_raw_counts);
|
perf stat: Reset previous counts on repeat with interval
When using 'perf stat' with repeat and interval option, it shows wrong
values for events.
The wrong values will be shown for the first interval on the second and
subsequent repetitions.
Without the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.000282489 53 faults
2.000282489 513 sched:sched_switch
4.005478208 3,721 faults
4.005478208 2,666 sched:sched_switch
5.025470933 395 faults
5.025470933 1,307 sched:sched_switch
2.009602825 1,84,46,74,40,73,70,95,47,520 faults <------
2.009602825 1,84,46,74,40,73,70,95,49,568 sched:sched_switch <------
4.019612206 4,730 faults
4.019612206 2,746 sched:sched_switch
5.039615484 3,953 faults
5.039615484 1,496 sched:sched_switch
2.000274620 1,84,46,74,40,73,70,95,47,520 faults <------
2.000274620 1,84,46,74,40,73,70,95,47,520 sched:sched_switch <------
4.000480342 4,282 faults
4.000480342 2,303 sched:sched_switch
5.000916811 1,322 faults
5.000916811 1,064 sched:sched_switch
#
prev_raw_counts is allocated when using intervals. This is used when
calculating the difference in the counts of events when using interval.
The current counts are stored in prev_raw_counts to calculate the
differences in the next iteration.
On the first interval of the second and subsequent repetitions,
prev_raw_counts would be the values stored in the last interval of the
previous repetitions, while the current counts will only be for the
first interval of the current repetition.
Hence there is a possibility of events showing up as big number.
Fix this by resetting prev_raw_counts whenever perf stat repeats the
command.
With the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.019349347 2,597 faults
2.019349347 2,753 sched:sched_switch
4.019577372 3,098 faults
4.019577372 2,532 sched:sched_switch
5.019415481 1,879 faults
5.019415481 1,356 sched:sched_switch
2.000178813 8,468 faults
2.000178813 2,254 sched:sched_switch
4.000404621 7,440 faults
4.000404621 1,266 sched:sched_switch
5.040196079 2,458 faults
5.040196079 556 sched:sched_switch
2.000191939 6,870 faults
2.000191939 1,170 sched:sched_switch
4.000414103 541 faults
4.000414103 902 sched:sched_switch
5.000809863 450 faults
5.000809863 364 sched:sched_switch
#
Committer notes:
This was broken since the cset introducing the --interval feature, i.e.
--repeat + --interval wasn't tested at that point, add the Fixes tag so
that automatic scripts can pick this up.
Fixes: 13370a9b5bb8 ("perf stat: Add interval printing")
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: stable@vger.kernel.org # v3.9+
Link: http://lore.kernel.org/lkml/20190904094738.9558-2-srikar@linux.vnet.ibm.com
[ Fixed up conflicts with libperf, i.e. some perf_{evsel,evlist} lost the 'perf' prefix ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-09-04 02:47:37 -07:00
|
|
|
}
|
|
|
|
|
2022-10-17 19:02:14 -07:00
|
|
|
static int evsel__alloc_stats(struct evsel *evsel, int nr_aggr, bool alloc_raw)
|
2015-06-26 02:29:17 -07:00
|
|
|
{
|
2022-10-17 19:02:14 -07:00
|
|
|
if (evsel__alloc_stat_priv(evsel, nr_aggr) < 0 ||
|
2022-01-04 23:13:29 -07:00
|
|
|
evsel__alloc_counts(evsel) < 0 ||
|
|
|
|
(alloc_raw && evsel__alloc_prev_raw_counts(evsel) < 0))
|
2015-06-26 02:29:17 -07:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-10-17 19:02:15 -07:00
|
|
|
int evlist__alloc_stats(struct perf_stat_config *config,
|
|
|
|
struct evlist *evlist, bool alloc_raw)
|
2015-06-26 02:29:16 -07:00
|
|
|
{
|
2019-07-21 04:23:51 -07:00
|
|
|
struct evsel *evsel;
|
2022-10-17 19:02:15 -07:00
|
|
|
int nr_aggr = 0;
|
|
|
|
|
|
|
|
if (config && config->aggr_map)
|
|
|
|
nr_aggr = config->aggr_map->nr;
|
2015-06-26 02:29:16 -07:00
|
|
|
|
2016-06-23 07:26:15 -07:00
|
|
|
evlist__for_each_entry(evlist, evsel) {
|
2022-10-17 19:02:15 -07:00
|
|
|
if (evsel__alloc_stats(evsel, nr_aggr, alloc_raw))
|
2015-06-26 02:29:16 -07:00
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_free:
|
2020-11-30 05:31:04 -07:00
|
|
|
evlist__free_stats(evlist);
|
2015-06-26 02:29:16 -07:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2020-11-30 05:31:04 -07:00
|
|
|
void evlist__free_stats(struct evlist *evlist)
|
2015-06-26 02:29:16 -07:00
|
|
|
{
|
2019-07-21 04:23:51 -07:00
|
|
|
struct evsel *evsel;
|
2015-06-26 02:29:16 -07:00
|
|
|
|
2016-06-23 07:26:15 -07:00
|
|
|
evlist__for_each_entry(evlist, evsel) {
|
2020-05-06 09:38:26 -07:00
|
|
|
evsel__free_stat_priv(evsel);
|
|
|
|
evsel__free_counts(evsel);
|
|
|
|
evsel__free_prev_raw_counts(evsel);
|
2015-06-26 02:29:16 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-11-30 05:31:04 -07:00
|
|
|
void evlist__reset_stats(struct evlist *evlist)
|
2015-06-26 02:29:16 -07:00
|
|
|
{
|
2019-07-21 04:23:51 -07:00
|
|
|
struct evsel *evsel;
|
2015-06-26 02:29:16 -07:00
|
|
|
|
2016-06-23 07:26:15 -07:00
|
|
|
evlist__for_each_entry(evlist, evsel) {
|
2020-05-06 09:38:26 -07:00
|
|
|
evsel__reset_stat_priv(evsel);
|
|
|
|
evsel__reset_counts(evsel);
|
2015-06-26 02:29:16 -07:00
|
|
|
}
|
|
|
|
}
|
2015-07-21 05:31:27 -07:00
|
|
|
|
2022-10-17 19:02:20 -07:00
|
|
|
void evlist__reset_aggr_stats(struct evlist *evlist)
|
|
|
|
{
|
|
|
|
struct evsel *evsel;
|
|
|
|
|
|
|
|
evlist__for_each_entry(evlist, evsel)
|
|
|
|
evsel__reset_aggr_stats(evsel);
|
|
|
|
}
|
|
|
|
|
2020-11-30 05:31:04 -07:00
|
|
|
void evlist__reset_prev_raw_counts(struct evlist *evlist)
|
perf stat: Reset previous counts on repeat with interval
When using 'perf stat' with repeat and interval option, it shows wrong
values for events.
The wrong values will be shown for the first interval on the second and
subsequent repetitions.
Without the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.000282489 53 faults
2.000282489 513 sched:sched_switch
4.005478208 3,721 faults
4.005478208 2,666 sched:sched_switch
5.025470933 395 faults
5.025470933 1,307 sched:sched_switch
2.009602825 1,84,46,74,40,73,70,95,47,520 faults <------
2.009602825 1,84,46,74,40,73,70,95,49,568 sched:sched_switch <------
4.019612206 4,730 faults
4.019612206 2,746 sched:sched_switch
5.039615484 3,953 faults
5.039615484 1,496 sched:sched_switch
2.000274620 1,84,46,74,40,73,70,95,47,520 faults <------
2.000274620 1,84,46,74,40,73,70,95,47,520 sched:sched_switch <------
4.000480342 4,282 faults
4.000480342 2,303 sched:sched_switch
5.000916811 1,322 faults
5.000916811 1,064 sched:sched_switch
#
prev_raw_counts is allocated when using intervals. This is used when
calculating the difference in the counts of events when using interval.
The current counts are stored in prev_raw_counts to calculate the
differences in the next iteration.
On the first interval of the second and subsequent repetitions,
prev_raw_counts would be the values stored in the last interval of the
previous repetitions, while the current counts will only be for the
first interval of the current repetition.
Hence there is a possibility of events showing up as big number.
Fix this by resetting prev_raw_counts whenever perf stat repeats the
command.
With the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.019349347 2,597 faults
2.019349347 2,753 sched:sched_switch
4.019577372 3,098 faults
4.019577372 2,532 sched:sched_switch
5.019415481 1,879 faults
5.019415481 1,356 sched:sched_switch
2.000178813 8,468 faults
2.000178813 2,254 sched:sched_switch
4.000404621 7,440 faults
4.000404621 1,266 sched:sched_switch
5.040196079 2,458 faults
5.040196079 556 sched:sched_switch
2.000191939 6,870 faults
2.000191939 1,170 sched:sched_switch
4.000414103 541 faults
4.000414103 902 sched:sched_switch
5.000809863 450 faults
5.000809863 364 sched:sched_switch
#
Committer notes:
This was broken since the cset introducing the --interval feature, i.e.
--repeat + --interval wasn't tested at that point, add the Fixes tag so
that automatic scripts can pick this up.
Fixes: 13370a9b5bb8 ("perf stat: Add interval printing")
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: stable@vger.kernel.org # v3.9+
Link: http://lore.kernel.org/lkml/20190904094738.9558-2-srikar@linux.vnet.ibm.com
[ Fixed up conflicts with libperf, i.e. some perf_{evsel,evlist} lost the 'perf' prefix ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-09-04 02:47:37 -07:00
|
|
|
{
|
|
|
|
struct evsel *evsel;
|
|
|
|
|
|
|
|
evlist__for_each_entry(evlist, evsel)
|
2020-05-06 09:38:26 -07:00
|
|
|
evsel__reset_prev_raw_counts(evsel);
|
perf stat: Reset previous counts on repeat with interval
When using 'perf stat' with repeat and interval option, it shows wrong
values for events.
The wrong values will be shown for the first interval on the second and
subsequent repetitions.
Without the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.000282489 53 faults
2.000282489 513 sched:sched_switch
4.005478208 3,721 faults
4.005478208 2,666 sched:sched_switch
5.025470933 395 faults
5.025470933 1,307 sched:sched_switch
2.009602825 1,84,46,74,40,73,70,95,47,520 faults <------
2.009602825 1,84,46,74,40,73,70,95,49,568 sched:sched_switch <------
4.019612206 4,730 faults
4.019612206 2,746 sched:sched_switch
5.039615484 3,953 faults
5.039615484 1,496 sched:sched_switch
2.000274620 1,84,46,74,40,73,70,95,47,520 faults <------
2.000274620 1,84,46,74,40,73,70,95,47,520 sched:sched_switch <------
4.000480342 4,282 faults
4.000480342 2,303 sched:sched_switch
5.000916811 1,322 faults
5.000916811 1,064 sched:sched_switch
#
prev_raw_counts is allocated when using intervals. This is used when
calculating the difference in the counts of events when using interval.
The current counts are stored in prev_raw_counts to calculate the
differences in the next iteration.
On the first interval of the second and subsequent repetitions,
prev_raw_counts would be the values stored in the last interval of the
previous repetitions, while the current counts will only be for the
first interval of the current repetition.
Hence there is a possibility of events showing up as big number.
Fix this by resetting prev_raw_counts whenever perf stat repeats the
command.
With the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.019349347 2,597 faults
2.019349347 2,753 sched:sched_switch
4.019577372 3,098 faults
4.019577372 2,532 sched:sched_switch
5.019415481 1,879 faults
5.019415481 1,356 sched:sched_switch
2.000178813 8,468 faults
2.000178813 2,254 sched:sched_switch
4.000404621 7,440 faults
4.000404621 1,266 sched:sched_switch
5.040196079 2,458 faults
5.040196079 556 sched:sched_switch
2.000191939 6,870 faults
2.000191939 1,170 sched:sched_switch
4.000414103 541 faults
4.000414103 902 sched:sched_switch
5.000809863 450 faults
5.000809863 364 sched:sched_switch
#
Committer notes:
This was broken since the cset introducing the --interval feature, i.e.
--repeat + --interval wasn't tested at that point, add the Fixes tag so
that automatic scripts can pick this up.
Fixes: 13370a9b5bb8 ("perf stat: Add interval printing")
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: stable@vger.kernel.org # v3.9+
Link: http://lore.kernel.org/lkml/20190904094738.9558-2-srikar@linux.vnet.ibm.com
[ Fixed up conflicts with libperf, i.e. some perf_{evsel,evlist} lost the 'perf' prefix ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-09-04 02:47:37 -07:00
|
|
|
}
|
|
|
|
|
2020-11-30 05:08:24 -07:00
|
|
|
static void evsel__copy_prev_raw_counts(struct evsel *evsel)
|
2020-05-19 21:27:35 -07:00
|
|
|
{
|
2022-05-18 20:20:05 -07:00
|
|
|
int idx, nthreads = perf_thread_map__nr(evsel->core.threads);
|
2020-05-19 21:27:35 -07:00
|
|
|
|
|
|
|
for (int thread = 0; thread < nthreads; thread++) {
|
2022-05-18 20:20:05 -07:00
|
|
|
perf_cpu_map__for_each_idx(idx, evsel__cpus(evsel)) {
|
|
|
|
*perf_counts(evsel->counts, idx, thread) =
|
|
|
|
*perf_counts(evsel->prev_raw_counts, idx, thread);
|
2020-05-19 21:27:35 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-11-30 05:31:04 -07:00
|
|
|
void evlist__copy_prev_raw_counts(struct evlist *evlist)
|
2020-05-19 21:27:35 -07:00
|
|
|
{
|
|
|
|
struct evsel *evsel;
|
|
|
|
|
|
|
|
evlist__for_each_entry(evlist, evsel)
|
2020-11-30 05:08:24 -07:00
|
|
|
evsel__copy_prev_raw_counts(evsel);
|
2020-05-19 21:27:35 -07:00
|
|
|
}
|
|
|
|
|
2023-06-16 00:32:11 -07:00
|
|
|
static void evsel__copy_res_stats(struct evsel *evsel)
|
|
|
|
{
|
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For GLOBAL aggregation mode, it updates the counts for each run
|
|
|
|
* in the evsel->stats.res_stats. See perf_stat_process_counter().
|
|
|
|
*/
|
|
|
|
*ps->aggr[0].counts.values = avg_stats(&ps->res_stats);
|
|
|
|
}
|
|
|
|
|
|
|
|
void evlist__copy_res_stats(struct perf_stat_config *config, struct evlist *evlist)
|
|
|
|
{
|
|
|
|
struct evsel *evsel;
|
|
|
|
|
|
|
|
if (config->aggr_mode != AGGR_GLOBAL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
evlist__for_each_entry(evlist, evsel)
|
|
|
|
evsel__copy_res_stats(evsel);
|
|
|
|
}
|
|
|
|
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 07:26:09 -07:00
|
|
|
static size_t pkg_id_hash(long __key, void *ctx __maybe_unused)
|
2015-07-21 05:31:27 -07:00
|
|
|
{
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
uint64_t *key = (uint64_t *) __key;
|
|
|
|
|
|
|
|
return *key & 0xffffffff;
|
|
|
|
}
|
|
|
|
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 07:26:09 -07:00
|
|
|
static bool pkg_id_equal(long __key1, long __key2, void *ctx __maybe_unused)
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
{
|
|
|
|
uint64_t *key1 = (uint64_t *) __key1;
|
|
|
|
uint64_t *key2 = (uint64_t *) __key2;
|
|
|
|
|
|
|
|
return *key1 == *key2;
|
2015-07-21 05:31:27 -07:00
|
|
|
}
|
|
|
|
|
2022-01-04 23:13:44 -07:00
|
|
|
static int check_per_pkg(struct evsel *counter, struct perf_counts_values *vals,
|
|
|
|
int cpu_map_idx, bool *skip)
|
2015-07-21 05:31:27 -07:00
|
|
|
{
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
struct hashmap *mask = counter->per_pkg_mask;
|
2019-07-21 04:24:05 -07:00
|
|
|
struct perf_cpu_map *cpus = evsel__cpus(counter);
|
2022-01-04 23:13:51 -07:00
|
|
|
struct perf_cpu cpu = perf_cpu_map__cpu(cpus, cpu_map_idx);
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
int s, d, ret = 0;
|
|
|
|
uint64_t *key;
|
2015-07-21 05:31:27 -07:00
|
|
|
|
|
|
|
*skip = false;
|
|
|
|
|
|
|
|
if (!counter->per_pkg)
|
|
|
|
return 0;
|
|
|
|
|
2024-02-02 16:40:54 -07:00
|
|
|
if (perf_cpu_map__is_any_cpu_or_is_empty(cpus))
|
2015-07-21 05:31:27 -07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!mask) {
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
mask = hashmap__new(pkg_id_hash, pkg_id_equal, NULL);
|
2022-04-13 02:33:02 -07:00
|
|
|
if (IS_ERR(mask))
|
2015-07-21 05:31:27 -07:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
counter->per_pkg_mask = mask;
|
|
|
|
}
|
|
|
|
|
2015-09-03 06:23:40 -07:00
|
|
|
/*
|
|
|
|
* we do not consider an event that has not run as a good
|
|
|
|
* instance to mark a package as used (skip=1). Otherwise
|
|
|
|
* we may run into a situation where the first CPU in a package
|
|
|
|
* is not running anything, yet the second is, and this function
|
|
|
|
* would mark the package as used after the first CPU and would
|
|
|
|
* not read the values from the second CPU.
|
|
|
|
*/
|
|
|
|
if (!(vals->run && vals->ena))
|
|
|
|
return 0;
|
|
|
|
|
2022-01-04 23:13:19 -07:00
|
|
|
s = cpu__get_socket_id(cpu);
|
2015-07-21 05:31:27 -07:00
|
|
|
if (s < 0)
|
|
|
|
return -1;
|
|
|
|
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
/*
|
|
|
|
* On multi-die system, die_id > 0. On no-die system, die_id = 0.
|
|
|
|
* We use hashmap(socket, die) to check the used socket+die pair.
|
|
|
|
*/
|
2022-01-04 23:13:19 -07:00
|
|
|
d = cpu__get_die_id(cpu);
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
if (d < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
key = malloc(sizeof(*key));
|
|
|
|
if (!key)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
*key = (uint64_t)d << 32 | s;
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 07:26:09 -07:00
|
|
|
if (hashmap__find(mask, key, NULL)) {
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
*skip = true;
|
2022-01-04 23:13:26 -07:00
|
|
|
free(key);
|
|
|
|
} else
|
libbpf: Hashmap interface update to allow both long and void* keys/values
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/af1facf9-7bc8-8a3d-0db4-7b3f333589a2@meta.com/T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221109142611.879983-2-eddyz87@gmail.com
2022-11-09 07:26:09 -07:00
|
|
|
ret = hashmap__add(mask, key, 1);
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
|
|
|
|
return ret;
|
2015-07-21 05:31:27 -07:00
|
|
|
}
|
|
|
|
|
2022-10-17 19:02:17 -07:00
|
|
|
static bool evsel__count_has_error(struct evsel *evsel,
|
|
|
|
struct perf_counts_values *count,
|
|
|
|
struct perf_stat_config *config)
|
|
|
|
{
|
|
|
|
/* the evsel was failed already */
|
|
|
|
if (evsel->err || evsel->counts->scaled == -1)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* this is meaningful for CPU aggregation modes only */
|
|
|
|
if (config->aggr_mode == AGGR_GLOBAL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* it's considered ok when it actually ran */
|
|
|
|
if (count->ena != 0 && count->run != 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-07-21 05:31:27 -07:00
|
|
|
static int
|
2019-07-21 04:23:51 -07:00
|
|
|
process_counter_values(struct perf_stat_config *config, struct evsel *evsel,
|
2022-01-04 23:13:45 -07:00
|
|
|
int cpu_map_idx, int thread,
|
2015-07-21 05:31:27 -07:00
|
|
|
struct perf_counts_values *count)
|
|
|
|
{
|
2022-10-17 19:02:16 -07:00
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
2015-07-21 05:31:27 -07:00
|
|
|
static struct perf_counts_values zero;
|
|
|
|
bool skip = false;
|
|
|
|
|
2022-01-04 23:13:45 -07:00
|
|
|
if (check_per_pkg(evsel, count, cpu_map_idx, &skip)) {
|
2015-07-21 05:31:27 -07:00
|
|
|
pr_err("failed to read per-pkg counter\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (skip)
|
|
|
|
count = &zero;
|
|
|
|
|
2022-10-17 19:02:16 -07:00
|
|
|
if (!evsel->snapshot)
|
|
|
|
evsel__compute_deltas(evsel, cpu_map_idx, thread, count);
|
|
|
|
perf_counts_values__scale(count, config->scale, NULL);
|
|
|
|
|
2022-10-17 19:02:18 -07:00
|
|
|
if (config->aggr_mode == AGGR_THREAD) {
|
|
|
|
struct perf_counts_values *aggr_counts = &ps->aggr[thread].counts;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Skip value 0 when enabling --per-thread globally,
|
|
|
|
* otherwise too many 0 output.
|
|
|
|
*/
|
|
|
|
if (count->val == 0 && config->system_wide)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ps->aggr[thread].nr++;
|
|
|
|
|
|
|
|
aggr_counts->val += count->val;
|
|
|
|
aggr_counts->ena += count->ena;
|
|
|
|
aggr_counts->run += count->run;
|
2022-10-17 19:02:24 -07:00
|
|
|
return 0;
|
2022-10-17 19:02:18 -07:00
|
|
|
}
|
|
|
|
|
2022-10-17 19:02:16 -07:00
|
|
|
if (ps->aggr) {
|
|
|
|
struct perf_cpu cpu = perf_cpu_map__cpu(evsel->core.cpus, cpu_map_idx);
|
|
|
|
struct aggr_cpu_id aggr_id = config->aggr_get_id(config, cpu);
|
|
|
|
struct perf_stat_aggr *ps_aggr;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ps->nr_aggr; i++) {
|
|
|
|
if (!aggr_cpu_id__equal(&aggr_id, &config->aggr_map->map[i]))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
ps_aggr = &ps->aggr[i];
|
|
|
|
ps_aggr->nr++;
|
|
|
|
|
|
|
|
/*
|
2022-10-17 19:02:18 -07:00
|
|
|
* When any result is bad, make them all to give consistent output
|
|
|
|
* in interval mode. But per-task counters can have 0 enabled time
|
|
|
|
* when some tasks are idle.
|
2022-10-17 19:02:16 -07:00
|
|
|
*/
|
2022-10-17 19:02:17 -07:00
|
|
|
if (evsel__count_has_error(evsel, count, config) && !ps_aggr->failed) {
|
2022-10-17 19:02:16 -07:00
|
|
|
ps_aggr->counts.val = 0;
|
|
|
|
ps_aggr->counts.ena = 0;
|
|
|
|
ps_aggr->counts.run = 0;
|
|
|
|
ps_aggr->failed = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ps_aggr->failed) {
|
|
|
|
ps_aggr->counts.val += count->val;
|
|
|
|
ps_aggr->counts.ena += count->ena;
|
|
|
|
ps_aggr->counts.run += count->run;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-21 05:31:27 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int process_counter_maps(struct perf_stat_config *config,
|
2019-07-21 04:23:51 -07:00
|
|
|
struct evsel *counter)
|
2015-07-21 05:31:27 -07:00
|
|
|
{
|
2019-08-22 04:11:41 -07:00
|
|
|
int nthreads = perf_thread_map__nr(counter->core.threads);
|
2020-04-29 11:45:09 -07:00
|
|
|
int ncpus = evsel__nr_cpus(counter);
|
2022-01-04 23:13:45 -07:00
|
|
|
int idx, thread;
|
2015-07-21 05:31:27 -07:00
|
|
|
|
|
|
|
for (thread = 0; thread < nthreads; thread++) {
|
2022-01-04 23:13:45 -07:00
|
|
|
for (idx = 0; idx < ncpus; idx++) {
|
|
|
|
if (process_counter_values(config, counter, idx, thread,
|
|
|
|
perf_counts(counter->counts, idx, thread)))
|
2015-07-21 05:31:27 -07:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int perf_stat_process_counter(struct perf_stat_config *config,
|
2019-07-21 04:23:51 -07:00
|
|
|
struct evsel *counter)
|
2015-07-21 05:31:27 -07:00
|
|
|
{
|
2017-10-26 10:22:34 -07:00
|
|
|
struct perf_stat_evsel *ps = counter->stats;
|
2022-10-17 19:02:27 -07:00
|
|
|
u64 *count;
|
2022-09-30 13:21:04 -07:00
|
|
|
int ret;
|
2015-07-21 05:31:27 -07:00
|
|
|
|
|
|
|
if (counter->per_pkg)
|
perf stat: Fix wrong skipping for per-die aggregation
Uncore becomes die-scope on Xeon Cascade Lake-AP and perf has supported
--per-die aggregation yet.
One issue is found in check_per_pkg() for uncore events running on AP
system. On cascade Lake-AP, we have:
S0-D0
S0-D1
S1-D0
S1-D1
But in check_per_pkg(), S0-D1 and S1-D1 are skipped because the mask
bits for S0 and S1 have been set for S0-D0 and S1-D0. It doesn't check
die_id. So the counting for S0-D1 and S1-D1 are set to zero. That's not
correct.
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001460963 S0-D0 1 1317376 Bytes llc_misses.mem_read
1.001460963 S0-D1 1 998016 Bytes llc_misses.mem_read
1.001460963 S1-D0 1 970496 Bytes llc_misses.mem_read
1.001460963 S1-D1 1 1291264 Bytes llc_misses.mem_read
2.003488021 S0-D0 1 1082048 Bytes llc_misses.mem_read
2.003488021 S0-D1 1 1919040 Bytes llc_misses.mem_read
2.003488021 S1-D0 1 890752 Bytes llc_misses.mem_read
2.003488021 S1-D1 1 2380800 Bytes llc_misses.mem_read
3.005613270 S0-D0 1 1126080 Bytes llc_misses.mem_read
3.005613270 S0-D1 1 2898176 Bytes llc_misses.mem_read
3.005613270 S1-D0 1 870912 Bytes llc_misses.mem_read
3.005613270 S1-D1 1 3388608 Bytes llc_misses.mem_read
4.007627598 S0-D0 1 1124608 Bytes llc_misses.mem_read
4.007627598 S0-D1 1 3884416 Bytes llc_misses.mem_read
4.007627598 S1-D0 1 921088 Bytes llc_misses.mem_read
4.007627598 S1-D1 1 4451840 Bytes llc_misses.mem_read
5.001479927 S0-D0 1 963328 Bytes llc_misses.mem_read
5.001479927 S0-D1 1 4831936 Bytes llc_misses.mem_read
5.001479927 S1-D0 1 895104 Bytes llc_misses.mem_read
5.001479927 S1-D1 1 5496640 Bytes llc_misses.mem_read
From above output, we can see S0-D1 and S1-D1 don't report the interval
values, they are continued to grow. That's because check_per_pkg()
wrongly decides to use zero counts for S0-D1 and S1-D1.
So in check_per_pkg(), we should use hashmap(socket,die) to decide if
the cpu counts needs to skip. Only considering socket is not enough.
Now with this patch,
root@lkp-csl-2ap4 ~# ./perf stat -a -I 1000 -e llc_misses.mem_read --per-die -- sleep 5
1.001586691 S0-D0 1 1229440 Bytes llc_misses.mem_read
1.001586691 S0-D1 1 976832 Bytes llc_misses.mem_read
1.001586691 S1-D0 1 938304 Bytes llc_misses.mem_read
1.001586691 S1-D1 1 1227328 Bytes llc_misses.mem_read
2.003776312 S0-D0 1 1586752 Bytes llc_misses.mem_read
2.003776312 S0-D1 1 875392 Bytes llc_misses.mem_read
2.003776312 S1-D0 1 855616 Bytes llc_misses.mem_read
2.003776312 S1-D1 1 949376 Bytes llc_misses.mem_read
3.006512788 S0-D0 1 1338880 Bytes llc_misses.mem_read
3.006512788 S0-D1 1 920064 Bytes llc_misses.mem_read
3.006512788 S1-D0 1 877184 Bytes llc_misses.mem_read
3.006512788 S1-D1 1 1020736 Bytes llc_misses.mem_read
4.008895291 S0-D0 1 926592 Bytes llc_misses.mem_read
4.008895291 S0-D1 1 906368 Bytes llc_misses.mem_read
4.008895291 S1-D0 1 892224 Bytes llc_misses.mem_read
4.008895291 S1-D1 1 987712 Bytes llc_misses.mem_read
5.001590993 S0-D0 1 962624 Bytes llc_misses.mem_read
5.001590993 S0-D1 1 912512 Bytes llc_misses.mem_read
5.001590993 S1-D0 1 891200 Bytes llc_misses.mem_read
5.001590993 S1-D1 1 978432 Bytes llc_misses.mem_read
On no-die system, die_id is 0, actually it's hashmap(socket,0), original behavior
is not changed.
Reported-by: Ying Huang <ying.huang@intel.com>
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Huang <ying.huang@intel.com>
Link: http://lore.kernel.org/lkml/20210128013417.25597-1-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2021-01-27 18:34:17 -07:00
|
|
|
evsel__zero_per_pkg(counter);
|
2015-07-21 05:31:27 -07:00
|
|
|
|
|
|
|
ret = process_counter_maps(config, counter);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
if (config->aggr_mode != AGGR_GLOBAL)
|
|
|
|
return 0;
|
|
|
|
|
2022-10-17 19:02:27 -07:00
|
|
|
/*
|
|
|
|
* GLOBAL aggregation mode only has a single aggr counts,
|
|
|
|
* so we can use ps->aggr[0] as the actual output.
|
|
|
|
*/
|
|
|
|
count = ps->aggr[0].counts.values;
|
2022-09-30 13:21:04 -07:00
|
|
|
update_stats(&ps->res_stats, *count);
|
2015-07-21 05:31:27 -07:00
|
|
|
|
2017-02-17 01:17:38 -07:00
|
|
|
if (verbose > 0) {
|
2015-07-21 05:31:27 -07:00
|
|
|
fprintf(config->output, "%s: %" PRIu64 " %" PRIu64 " %" PRIu64 "\n",
|
2020-04-29 12:07:09 -07:00
|
|
|
evsel__name(counter), count[0], count[1], count[2]);
|
2015-07-21 05:31:27 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2015-10-25 07:51:32 -07:00
|
|
|
|
2022-10-17 19:02:22 -07:00
|
|
|
static int evsel__merge_aggr_counters(struct evsel *evsel, struct evsel *alias)
|
|
|
|
{
|
|
|
|
struct perf_stat_evsel *ps_a = evsel->stats;
|
|
|
|
struct perf_stat_evsel *ps_b = alias->stats;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (ps_a->aggr == NULL && ps_b->aggr == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (ps_a->nr_aggr != ps_b->nr_aggr) {
|
|
|
|
pr_err("Unmatched aggregation mode between aliases\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ps_a->nr_aggr; i++) {
|
|
|
|
struct perf_counts_values *aggr_counts_a = &ps_a->aggr[i].counts;
|
|
|
|
struct perf_counts_values *aggr_counts_b = &ps_b->aggr[i].counts;
|
|
|
|
|
|
|
|
/* NB: don't increase aggr.nr for aliases */
|
|
|
|
|
|
|
|
aggr_counts_a->val += aggr_counts_b->val;
|
|
|
|
aggr_counts_a->ena += aggr_counts_b->ena;
|
|
|
|
aggr_counts_a->run += aggr_counts_b->run;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* events should have the same name, scale, unit, cgroup but on different PMUs */
|
|
|
|
static bool evsel__is_alias(struct evsel *evsel_a, struct evsel *evsel_b)
|
|
|
|
{
|
|
|
|
if (strcmp(evsel__name(evsel_a), evsel__name(evsel_b)))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (evsel_a->scale != evsel_b->scale)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (evsel_a->cgrp != evsel_b->cgrp)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (strcmp(evsel_a->unit, evsel_b->unit))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (evsel__is_clock(evsel_a) != evsel__is_clock(evsel_b))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return !!strcmp(evsel_a->pmu_name, evsel_b->pmu_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void evsel__merge_aliases(struct evsel *evsel)
|
|
|
|
{
|
|
|
|
struct evlist *evlist = evsel->evlist;
|
|
|
|
struct evsel *alias;
|
|
|
|
|
|
|
|
alias = list_prepare_entry(evsel, &(evlist->core.entries), core.node);
|
|
|
|
list_for_each_entry_continue(alias, &evlist->core.entries, core.node) {
|
|
|
|
/* Merge the same events on different PMUs. */
|
|
|
|
if (evsel__is_alias(evsel, alias)) {
|
|
|
|
evsel__merge_aggr_counters(evsel, alias);
|
|
|
|
alias->merged_stat = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-11-14 14:07:14 -07:00
|
|
|
static bool evsel__should_merge_hybrid(const struct evsel *evsel,
|
|
|
|
const struct perf_stat_config *config)
|
2022-10-17 19:02:22 -07:00
|
|
|
{
|
2022-11-14 14:07:14 -07:00
|
|
|
return config->hybrid_merge && evsel__is_hybrid(evsel);
|
2022-10-17 19:02:22 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void evsel__merge_stats(struct evsel *evsel, struct perf_stat_config *config)
|
|
|
|
{
|
|
|
|
/* this evsel is already merged */
|
|
|
|
if (evsel->merged_stat)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (evsel->auto_merge_stats || evsel__should_merge_hybrid(evsel, config))
|
|
|
|
evsel__merge_aliases(evsel);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* merge the same uncore and hybrid events if requested */
|
|
|
|
void perf_stat_merge_counters(struct perf_stat_config *config, struct evlist *evlist)
|
|
|
|
{
|
|
|
|
struct evsel *evsel;
|
|
|
|
|
perf stat: Combine the -A/--no-aggr and --no-merge options
The -A or --no-aggr option disables aggregation of core events:
$ perf stat -A -e cycles,data_total -a true
Performance counter stats for 'system wide':
CPU0 1,287,665 cycles
CPU1 1,831,681 cycles
CPU2 27,345,998 cycles
CPU3 1,964,799 cycles
CPU4 236,174 cycles
CPU5 3,302,825 cycles
CPU6 9,201,446 cycles
CPU7 1,403,043 cycles
CPU0 110.90 MiB data_total
0.008961761 seconds time elapsed
The --no-merge option disables the aggregation of uncore events:
$ perf stat --no-merge -e cycles,data_total -a true
Performance counter stats for 'system wide':
38,482,778 cycles
15.04 MiB data_total [uncore_imc_free_running_1]
15.00 MiB data_total [uncore_imc_free_running_0]
0.005915155 seconds time elapsed
Having two options confuses users who generally don't appreciate the
difference in PMUs. Keep all the options but make it so they all
disable aggregation both of core and uncore events:
$ perf stat -A -e cycles,data_total -a true
Performance counter stats for 'system wide':
CPU0 85,878 cycles
CPU1 88,179 cycles
CPU2 60,872 cycles
CPU3 3,265,567 cycles
CPU4 82,357 cycles
CPU5 83,383 cycles
CPU6 84,156 cycles
CPU7 220,803 cycles
CPU0 2.38 MiB data_total [uncore_imc_free_running_0]
CPU0 2.38 MiB data_total [uncore_imc_free_running_1]
0.001397205 seconds time elapsed
Update the relevant 'perf stat' man page information.
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kaige Ye <ye@kaige.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20231214060256.2094017-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2023-12-13 23:02:56 -07:00
|
|
|
if (config->aggr_mode == AGGR_NONE)
|
2022-10-17 19:02:22 -07:00
|
|
|
return;
|
|
|
|
|
|
|
|
evlist__for_each_entry(evlist, evsel)
|
|
|
|
evsel__merge_stats(evsel, config);
|
|
|
|
}
|
|
|
|
|
2022-10-17 19:02:23 -07:00
|
|
|
static void evsel__update_percore_stats(struct evsel *evsel, struct aggr_cpu_id *core_id)
|
|
|
|
{
|
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
|
|
|
struct perf_counts_values counts = { 0, };
|
|
|
|
struct aggr_cpu_id id;
|
|
|
|
struct perf_cpu cpu;
|
|
|
|
int idx;
|
|
|
|
|
|
|
|
/* collect per-core counts */
|
|
|
|
perf_cpu_map__for_each_cpu(cpu, idx, evsel->core.cpus) {
|
|
|
|
struct perf_stat_aggr *aggr = &ps->aggr[idx];
|
|
|
|
|
|
|
|
id = aggr_cpu_id__core(cpu, NULL);
|
|
|
|
if (!aggr_cpu_id__equal(core_id, &id))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
counts.val += aggr->counts.val;
|
|
|
|
counts.ena += aggr->counts.ena;
|
|
|
|
counts.run += aggr->counts.run;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* update aggregated per-core counts for each CPU */
|
|
|
|
perf_cpu_map__for_each_cpu(cpu, idx, evsel->core.cpus) {
|
|
|
|
struct perf_stat_aggr *aggr = &ps->aggr[idx];
|
|
|
|
|
|
|
|
id = aggr_cpu_id__core(cpu, NULL);
|
|
|
|
if (!aggr_cpu_id__equal(core_id, &id))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
aggr->counts.val = counts.val;
|
|
|
|
aggr->counts.ena = counts.ena;
|
|
|
|
aggr->counts.run = counts.run;
|
|
|
|
|
|
|
|
aggr->used = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we have an aggr_map for cpu, but want to aggregate the counters per-core */
|
|
|
|
static void evsel__process_percore(struct evsel *evsel)
|
|
|
|
{
|
|
|
|
struct perf_stat_evsel *ps = evsel->stats;
|
|
|
|
struct aggr_cpu_id core_id;
|
|
|
|
struct perf_cpu cpu;
|
|
|
|
int idx;
|
|
|
|
|
|
|
|
if (!evsel->percore)
|
|
|
|
return;
|
|
|
|
|
|
|
|
perf_cpu_map__for_each_cpu(cpu, idx, evsel->core.cpus) {
|
|
|
|
struct perf_stat_aggr *aggr = &ps->aggr[idx];
|
|
|
|
|
|
|
|
if (aggr->used)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
core_id = aggr_cpu_id__core(cpu, NULL);
|
|
|
|
evsel__update_percore_stats(evsel, &core_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* process cpu stats on per-core events */
|
|
|
|
void perf_stat_process_percore(struct perf_stat_config *config, struct evlist *evlist)
|
|
|
|
{
|
|
|
|
struct evsel *evsel;
|
|
|
|
|
|
|
|
if (config->aggr_mode != AGGR_NONE)
|
|
|
|
return;
|
|
|
|
|
|
|
|
evlist__for_each_entry(evlist, evsel)
|
|
|
|
evsel__process_percore(evsel);
|
|
|
|
}
|
|
|
|
|
2018-09-13 05:54:03 -07:00
|
|
|
int perf_event__process_stat_event(struct perf_session *session,
|
|
|
|
union perf_event *event)
|
2015-10-25 07:51:32 -07:00
|
|
|
{
|
2022-05-18 20:20:01 -07:00
|
|
|
struct perf_counts_values count, *ptr;
|
2019-08-28 06:57:16 -07:00
|
|
|
struct perf_record_stat *st = &event->stat;
|
2019-07-21 04:23:51 -07:00
|
|
|
struct evsel *counter;
|
2022-05-18 20:20:01 -07:00
|
|
|
int cpu_map_idx;
|
2015-10-25 07:51:32 -07:00
|
|
|
|
|
|
|
count.val = st->val;
|
|
|
|
count.ena = st->ena;
|
|
|
|
count.run = st->run;
|
|
|
|
|
2020-11-30 10:17:57 -07:00
|
|
|
counter = evlist__id2evsel(session->evlist, st->id);
|
2015-10-25 07:51:32 -07:00
|
|
|
if (!counter) {
|
|
|
|
pr_err("Failed to resolve counter for stat event.\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2022-05-18 20:20:01 -07:00
|
|
|
cpu_map_idx = perf_cpu_map__idx(evsel__cpus(counter), (struct perf_cpu){.cpu = st->cpu});
|
|
|
|
if (cpu_map_idx == -1) {
|
|
|
|
pr_err("Invalid CPU %d for event %s.\n", st->cpu, evsel__name(counter));
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
ptr = perf_counts(counter->counts, cpu_map_idx, st->thread);
|
|
|
|
if (ptr == NULL) {
|
|
|
|
pr_err("Failed to find perf count for CPU %d thread %d on event %s.\n",
|
|
|
|
st->cpu, st->thread, evsel__name(counter));
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
*ptr = count;
|
2015-10-25 07:51:32 -07:00
|
|
|
counter->supported = true;
|
|
|
|
return 0;
|
|
|
|
}
|
2015-10-25 07:51:35 -07:00
|
|
|
|
|
|
|
size_t perf_event__fprintf_stat(union perf_event *event, FILE *fp)
|
|
|
|
{
|
2019-08-28 06:57:16 -07:00
|
|
|
struct perf_record_stat *st = (struct perf_record_stat *)event;
|
2015-10-25 07:51:35 -07:00
|
|
|
size_t ret;
|
|
|
|
|
2019-08-28 06:57:10 -07:00
|
|
|
ret = fprintf(fp, "\n... id %" PRI_lu64 ", cpu %d, thread %d\n",
|
2015-10-25 07:51:35 -07:00
|
|
|
st->id, st->cpu, st->thread);
|
2019-08-28 06:57:10 -07:00
|
|
|
ret += fprintf(fp, "... value %" PRI_lu64 ", enabled %" PRI_lu64 ", running %" PRI_lu64 "\n",
|
2015-10-25 07:51:35 -07:00
|
|
|
st->val, st->ena, st->run);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t perf_event__fprintf_stat_round(union perf_event *event, FILE *fp)
|
|
|
|
{
|
2019-08-28 06:57:16 -07:00
|
|
|
struct perf_record_stat_round *rd = (struct perf_record_stat_round *)event;
|
2015-10-25 07:51:35 -07:00
|
|
|
size_t ret;
|
|
|
|
|
2019-08-28 06:57:11 -07:00
|
|
|
ret = fprintf(fp, "\n... time %" PRI_lu64 ", type %s\n", rd->time,
|
2015-10-25 07:51:35 -07:00
|
|
|
rd->type == PERF_STAT_ROUND_TYPE__FINAL ? "FINAL" : "INTERVAL");
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t perf_event__fprintf_stat_config(union perf_event *event, FILE *fp)
|
|
|
|
{
|
2023-07-24 13:12:44 -07:00
|
|
|
struct perf_stat_config sc = {};
|
2015-10-25 07:51:35 -07:00
|
|
|
size_t ret;
|
|
|
|
|
|
|
|
perf_event__read_stat_config(&sc, &event->stat_config);
|
|
|
|
|
|
|
|
ret = fprintf(fp, "\n");
|
|
|
|
ret += fprintf(fp, "... aggr_mode %d\n", sc.aggr_mode);
|
|
|
|
ret += fprintf(fp, "... scale %d\n", sc.scale);
|
|
|
|
ret += fprintf(fp, "... interval %u\n", sc.interval);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2018-08-29 23:32:17 -07:00
|
|
|
|
2019-07-21 04:23:51 -07:00
|
|
|
int create_perf_stat_counter(struct evsel *evsel,
|
2018-08-29 23:32:17 -07:00
|
|
|
struct perf_stat_config *config,
|
2019-11-20 17:15:19 -07:00
|
|
|
struct target *target,
|
2022-01-04 23:13:42 -07:00
|
|
|
int cpu_map_idx)
|
2018-08-29 23:32:17 -07:00
|
|
|
{
|
2019-07-21 04:24:29 -07:00
|
|
|
struct perf_event_attr *attr = &evsel->core.attr;
|
2021-07-06 08:17:00 -07:00
|
|
|
struct evsel *leader = evsel__leader(evsel);
|
2018-08-29 23:32:17 -07:00
|
|
|
|
2019-03-14 15:50:01 -07:00
|
|
|
attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED |
|
|
|
|
PERF_FORMAT_TOTAL_TIME_RUNNING;
|
2018-08-29 23:32:17 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The event is part of non trivial group, let's enable
|
|
|
|
* the group read (for leader) and ID retrieval for all
|
|
|
|
* members.
|
|
|
|
*/
|
2019-07-21 04:24:46 -07:00
|
|
|
if (leader->core.nr_members > 1)
|
2018-08-29 23:32:17 -07:00
|
|
|
attr->read_format |= PERF_FORMAT_ID|PERF_FORMAT_GROUP;
|
|
|
|
|
perf stat: Enable counting events for BPF programs
Introduce 'perf stat -b' option, which counts events for BPF programs, like:
[root@localhost ~]# ~/perf stat -e ref-cycles,cycles -b 254 -I 1000
1.487903822 115,200 ref-cycles
1.487903822 86,012 cycles
2.489147029 80,560 ref-cycles
2.489147029 73,784 cycles
3.490341825 60,720 ref-cycles
3.490341825 37,797 cycles
4.491540887 37,120 ref-cycles
4.491540887 31,963 cycles
The example above counts 'cycles' and 'ref-cycles' of BPF program of id
254. This is similar to bpftool-prog-profile command, but more
flexible.
'perf stat -b' creates per-cpu perf_event and loads fentry/fexit BPF
programs (monitor-progs) to the target BPF program (target-prog). The
monitor-progs read perf_event before and after the target-prog, and
aggregate the difference in a BPF map. Then the user space reads data
from these maps.
A new 'struct bpf_counter' is introduced to provide a common interface
that uses BPF programs/maps to count perf events.
Committer notes:
Removed all but bpf_counter.h includes from evsel.h, not needed at all.
Also BPF map lookups for PERCPU_ARRAYs need to have as its value receive
buffer passed to the kernel libbpf_num_possible_cpus() entries, not
evsel__nr_cpus(evsel), as the former uses
/sys/devices/system/cpu/possible while the later uses
/sys/devices/system/cpu/online, which may be less than the 'possible'
number making the bpf map lookup overwrite memory and cause hard to
debug memory corruption.
We need to continue using evsel__nr_cpus(evsel) when accessing the
perf_counts array tho, not to overwrite another are of memory :-)
Signed-off-by: Song Liu <songliubraving@fb.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: https://lore.kernel.org/lkml/20210120163031.GU12699@kernel.org/
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel-team@fb.com
Link: http://lore.kernel.org/lkml/20201229214214.3413833-4-songliubraving@fb.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-12-29 14:42:14 -07:00
|
|
|
attr->inherit = !config->no_inherit && list_empty(&evsel->bpf_counter_list);
|
2018-08-29 23:32:17 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Some events get initialized with sample_(period/type) set,
|
|
|
|
* like tracepoints. Clear it up for counting.
|
|
|
|
*/
|
|
|
|
attr->sample_period = 0;
|
|
|
|
|
|
|
|
if (config->identifier)
|
|
|
|
attr->sample_type = PERF_SAMPLE_IDENTIFIER;
|
|
|
|
|
2019-10-10 22:05:45 -07:00
|
|
|
if (config->all_user) {
|
|
|
|
attr->exclude_kernel = 1;
|
|
|
|
attr->exclude_user = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (config->all_kernel) {
|
|
|
|
attr->exclude_kernel = 0;
|
|
|
|
attr->exclude_user = 1;
|
|
|
|
}
|
|
|
|
|
2018-08-29 23:32:17 -07:00
|
|
|
/*
|
|
|
|
* Disabling all counters initially, they will be enabled
|
|
|
|
* either manually by us or by kernel via enable_on_exec
|
|
|
|
* set later.
|
|
|
|
*/
|
2020-04-30 06:51:16 -07:00
|
|
|
if (evsel__is_group_leader(evsel)) {
|
2018-08-29 23:32:17 -07:00
|
|
|
attr->disabled = 1;
|
|
|
|
|
2023-03-01 20:11:44 -07:00
|
|
|
if (target__enable_on_exec(target))
|
2018-08-29 23:32:17 -07:00
|
|
|
attr->enable_on_exec = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (target__has_cpu(target) && !target__has_per_thread(target))
|
2022-01-04 23:13:42 -07:00
|
|
|
return evsel__open_per_cpu(evsel, evsel__cpus(evsel), cpu_map_idx);
|
2018-08-29 23:32:17 -07:00
|
|
|
|
2020-04-29 12:21:03 -07:00
|
|
|
return evsel__open_per_thread(evsel, evsel->core.threads);
|
2018-08-29 23:32:17 -07:00
|
|
|
}
|