Skip to content

Commit a9fe537

Browse files
committed
perf x86/topdown: Correct leader selection with sample_read enabled
JIRA: https://issues.redhat.com/browse/RHEL-77935 upstream ======== commit 1e53e9d Author: Dapeng Mi <dapeng1.mi@linux.intel.com> Date: Fri Sep 13 08:47:08 2024 +0000 description =========== Addresses an issue where, in the absence of a topdown metrics event within a sampling group, the slots event was incorrectly bypassed as the sampling leader when sample_read was enabled. perf record -e '{slots,branches}:S' -c 10000 -vv sleep 1 In this case, the slots event should be sampled as leader but the branches event is sampled in fact like the verbose output shows. perf_event_attr: type 4 (cpu) size 168 config 0x400 (slots) sample_type IP|TID|TIME|READ|CPU|IDENTIFIER read_format ID|GROUP|LOST disabled 1 sample_id_all 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 5 ------------------------------------------------------------ perf_event_attr: type 0 (PERF_TYPE_HARDWARE) size 168 config 0x4 (PERF_COUNT_HW_BRANCH_INSTRUCTIONS) { sample_period, sample_freq } 10000 sample_type IP|TID|TIME|READ|CPU|IDENTIFIER read_format ID|GROUP|LOST sample_id_all 1 exclude_guest 1 The sample period of slots event instead of branches event is reset to 0. This fix ensures the slots event remains the leader under these conditions. Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com> Cc: Yongwei Ma <yongwei.ma@intel.com> Link: https://lore.kernel.org/r/20240913084712.13861-3-dapeng1.mi@linux.intel.com Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Michael Petlan <mpetlan@redhat.com>
1 parent d76784e commit a9fe537

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

tools/perf/arch/x86/util/topdown.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include "api/fs/fs.h"
33
#include "util/evsel.h"
4+
#include "util/evlist.h"
45
#include "util/pmu.h"
56
#include "util/pmus.h"
67
#include "util/topdown.h"
@@ -87,11 +88,24 @@ bool arch_is_topdown_metrics(const struct evsel *evsel)
8788
*/
8889
bool arch_topdown_sample_read(struct evsel *leader)
8990
{
91+
struct evsel *evsel;
92+
9093
if (!evsel__sys_has_perf_metrics(leader))
9194
return false;
9295

93-
if (arch_is_topdown_slots(leader))
94-
return true;
96+
if (!arch_is_topdown_slots(leader))
97+
return false;
98+
99+
/*
100+
* If slots event as leader event but no topdown metric events
101+
* in group, slots event should still sample as leader.
102+
*/
103+
evlist__for_each_entry(leader->evlist, evsel) {
104+
if (evsel->core.leader != leader->core.leader)
105+
return false;
106+
if (evsel != leader && arch_is_topdown_metrics(evsel))
107+
return true;
108+
}
95109

96110
return false;
97111
}

0 commit comments

Comments
 (0)