perf regs x86: Fix arch__intr_reg_mask() for the hybrid platform
PATCH 1/1 perf regs x86: Fix arch__intr_reg_mask() for the hybrid platform
From: Kan Liang <[email protected]>
The X86 specific arch__intr_reg_mask() is to check whether the kernel and hardware can collect XMM registers. But it doesn't work on some hybrid platform.
Without the patch on ADL-N,
$perf record -I?
available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15
The config of the test event doesn't contain the PMU information. The kernel may fail to initialize it on the correct hybrid PMU and return the wrong non-supported information.
Add the PMU information into the config for the hybrid platform. The same register set is supported among different hybrid PMUs. Checking the first available one is good enough.
With the patch on ADL-N,
$perf record -I?
available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 XMM9 XMM10 XMM11 XMM12 XMM13 XMM14 XMM15
--- tools/perf/arch/x86/util/perf_regs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
tools/perf/arch/x86/util/perf_regs.c +12 -0
@@ -9,6 +9,8 @@#include "../../../util/perf_regs.h" #include "../../../util/debug.h" #include "../../../util/event.h" +#include "../../../util/pmu.h" +#include "../../../util/pmu-hybrid.h" const struct sample_reg sample_reg_masks[] = {SMPL_REG (AX ,PERF_REG_X86_AX ),
@@ -284,12 +286,22 @@ uint64_t arch__intr_reg_mask(void) .disabled = 1, .exclude_kernel = 1, }; +struct perf_pmu *pmu;int fd;/* * In an unnamed union, init it here to build on older gcc versions */ attr.sample_period =1 ; +if (perf_pmu__has_hybrid ()) { +/* +* The same register set is supported among different hybrid PMUs. +* Only check the first available one. +*/ + pmu =list_first_entry (&perf_pmu__hybrid_pmus,typeof (*pmu), hybrid_list); + attr.config |= (__u64 )pmu->type <<PERF_PMU_TYPE_SHIFT ; + } +event_attr_init (&attr); fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 );
Signature · 1 line
2.35.1
Quoted 23 lines · On Wed, May 18, 2022 at 7:52 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
The X86 specific
arch__intr_reg_mask()is to check whether the kernel and hardware can collect XMM registers. But it doesn't work on some hybrid platform.Without the patch on ADL-N,
$perf record -I?
available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15The config of the test event doesn't contain the PMU information. The kernel may fail to initialize it on the correct hybrid PMU and return the wrong non-supported information.
Add the PMU information into the config for the hybrid platform. The same register set is supported among different hybrid PMUs. Checking the first available one is good enough.
With the patch on ADL-N,
Quoted 8 lines
$perf record -I?
available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 XMM9 XMM10 XMM11 XMM12 XMM13 XMM14 XMM15Fixes 6466ec14aaf4 ("perf regs x86: Add X86 specific arch__intr_reg_mask()")Reported-by Ammy Yi <[email protected]>Signed-off-by Kan Liang <[email protected]>
Quoted 18 lines
--- tools/perf/arch/x86/util/perf_regs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)tools/perf/arch/x86/util/perf_regs.c +2
-0@@ -9,6 +9,8 @@#include "../../../util/perf_regs.h" #include "../../../util/debug.h" #include "../../../util/event.h" +#include "../../../util/pmu.h" +#include "../../../util/pmu-hybrid.h" const struct sample_reg sample_reg_masks[] = {SMPL_REG (AX ,PERF_REG_X86_AX ),
tools/perf/arch/x86/util/perf_regs.c uint64_t arch__intr_reg_mask(void) · line 289
Quoted 4 lines
tools/perf/arch/x86/util/perf_regs.c +1
-0@@ -284,12 +286,22 @@ uint64_t arch__intr_reg_mask(void) .disabled = 1, .exclude_kernel = 1, }; +struct perf_pmu *pmu;
nit: this could have smaller scope if just be declared in the if-block.
Thanks,
Ian
Quoted 21 lines
tools/perf/arch/x86/util/perf_regs.c +9
-1int fd;/* * In an unnamed union, init it here to build on older gcc versions */ attr.sample_period =1 ; +if (perf_pmu__has_hybrid ()) { +/* +* The same register set is supported among different hybrid PMUs. +* Only check the first available one. +*/ + pmu =list_first_entry (&perf_pmu__hybrid_pmus,typeof (*pmu), hybrid_list); + attr.config |= (__u64 )pmu->type <<PERF_PMU_TYPE_SHIFT ; + } +event_attr_init (&attr); fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 ); --2.35.1
Em Wed, May 18, 2022 at 09:38:20PM -0700, Ian Rogers escreveu:
Quoted 29 lines · On Wed, May 18, 2022 at 7:52 AM <[email protected]> wrote:
Quoted 28 lines
From: Kan Liang <[email protected]>
The X86 specific
arch__intr_reg_mask()is to check whether the kernel and hardware can collect XMM registers. But it doesn't work on some hybrid platform.Without the patch on ADL-N,
$perf record -I?
available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15The config of the test event doesn't contain the PMU information. The kernel may fail to initialize it on the correct hybrid PMU and return the wrong non-supported information.
Add the PMU information into the config for the hybrid platform. The same register set is supported among different hybrid PMUs. Checking the first available one is good enough.
With the patch on ADL-N,
$perf record -I?
available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 XMM9 XMM10 XMM11 XMM12 XMM13 XMM14 XMM15
Quoted 5 lines
Quoted 3 lines
Fixes 6466ec14aaf4 ("perf regs x86: Add X86 specific arch__intr_reg_mask()")Reported-by Ammy Yi <[email protected]>Signed-off-by Kan Liang <[email protected]>Acked-by Ian Rogers <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 49 lines
Quoted 18 lines
--- tools/perf/arch/x86/util/perf_regs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)tools/perf/arch/x86/util/perf_regs.c +2
-0@@ -9,6 +9,8 @@#include "../../../util/perf_regs.h" #include "../../../util/debug.h" #include "../../../util/event.h" +#include "../../../util/pmu.h" +#include "../../../util/pmu-hybrid.h" const struct sample_reg sample_reg_masks[] = {SMPL_REG (AX ,PERF_REG_X86_AX ),tools/perf/arch/x86/util/perf_regs.c uint64_t arch__intr_reg_mask(void) · line 289
Quoted 4 lines
tools/perf/arch/x86/util/perf_regs.c +1
-0@@ -284,12 +286,22 @@ uint64_t arch__intr_reg_mask(void) .disabled = 1, .exclude_kernel = 1, }; +struct perf_pmu *pmu;nit: this could have smaller scope if just be declared in the if-block.
Thanks,
IanQuoted 21 lines
tools/perf/arch/x86/util/perf_regs.c +9
-1int fd;/* * In an unnamed union, init it here to build on older gcc versions */ attr.sample_period =1 ; +if (perf_pmu__has_hybrid ()) { +/* +* The same register set is supported among different hybrid PMUs. +* Only check the first available one. +*/ + pmu =list_first_entry (&perf_pmu__hybrid_pmus,typeof (*pmu), hybrid_list); + attr.config |= (__u64 )pmu->type <<PERF_PMU_TYPE_SHIFT ; + } +event_attr_init (&attr); fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 ); --2.35.1
Signature · 1 line
- Arnaldo