perf/x86: Introduce is_x86_pmu() helper
Subsystems (2)
PATCH v2 1/2 perf/x86: Introduce is_x86_pmu() helper
From: Ian Rogers <[email protected]>
To facilitate the detection of x86 PMU structures in upcoming patches, the is_x86_pmu() helper is introduced. Additionally, the is_x86_event() helper has been refactored to utilize is_x86_pmu().
No function changes intended.
---
v2: new patch.
arch/x86/events/core.c | 16 ---------------- arch/x86/events/perf_event.h | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 17 deletions(-)
arch/x86/events/core.c +0 -16
@@ -774,22 +774,6 @@ void x86_pmu_enable_all(int added) } } -int is_x86_event (struct perf_event *event) -{ -/* -* For a non-hybrid platforms, the type of X86 pmu is -* always PERF_TYPE_RAW. -* For a hybrid platform, the PERF_PMU_CAP_EXTENDED_HW_TYPE -* is a unique capability for the X86 PMU. -* Use them to detect a X86 event. -*/ -if (event->pmu->type ==PERF_TYPE_RAW || - event->pmu->capabilities &PERF_PMU_CAP_EXTENDED_HW_TYPE ) -return true; - -return false; -} -struct pmu *x86_get_pmu (unsigned int cpu) {struct cpu_hw_events *cpuc = &per_cpu (cpu_hw_events, cpu);
arch/x86/events/perf_event.h +17 -1
@@ -115,7 +115,23 @@ static inline bool is_topdown_event(struct perf_event *event)return is_metric_event (event) ||is_slots_event (event); } -int is_x86_event (struct perf_event *event); +static inline bool is_x86_pmu (struct pmu *pmu) +{ +/* +* For a non-hybrid platforms, the type of X86 pmu is +* always PERF_TYPE_RAW. +* For a hybrid platform, the PERF_PMU_CAP_EXTENDED_HW_TYPE +* is a unique capability for the X86 PMU. +* Use them to detect a X86 event. +*/ +return pmu->type ==PERF_TYPE_RAW || + pmu->capabilities &PERF_PMU_CAP_EXTENDED_HW_TYPE ; +} + +static inline bool is_x86_event (struct perf_event *event) +{ +return is_x86_pmu (event->pmu); +}static inline bool check_leader_group (struct perf_event *leader,int flags) {
base-commit: becb26c89be3a6448dcd92522894427544d5b091
Signature · 1 line
2.34.1
PATCH v2 2/2 perf/x86: Update cap_user_rdpmc base on rdpmc user disable state
After introducing the RDPMC user disable feature, user-space RDPMC may return 0 instead of the actual event count. This creates an inconsistency with cap_user_rdpmc, where cap_user_rdpmc is set, but user-space RDPMC only returns 0.
To accurately represent the user-space RDPMC capability, update cap_user_rdpmc based on the RDPMC user disable state. If RDPMC user disable is enabled, cap_user_rdpmc is set to false, allowing user-space programs to fall back to the read() syscall to obtain the real event count.
Since arch_perf_update_userpage() could be called for software events, enhance x86_pmu_has_rdpmc_user_disable() to only check the x86 PMUs.
---
v2: Add is_x86_pmu() check before checking if rdpmc user disable feature is supported.
v1: https://lore.kernel.org/all/[email protected]/
arch/x86/events/core.c | 3 +++ arch/x86/events/perf_event.h | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)
arch/x86/events/core.c +3 -0
@@ -2794,6 +2794,9 @@ void arch_perf_update_userpage(struct perf_event *event, userpg->cap_user_time_zero =0 ; userpg->cap_user_rdpmc = !!(event->hw.flags &PERF_EVENT_FLAG_USER_READ_CNT ); +if (x86_pmu_has_rdpmc_user_disable (event->pmu) && + event->hw.config &ARCH_PERFMON_EVENTSEL_RDPMC_USER_DISABLE ) + userpg->cap_user_rdpmc =0 ; userpg->pmc_width = x86_pmu.cntval_bits;if (!using_native_sched_clock () || !sched_clock_stable ())
arch/x86/events/perf_event.h +3 -2
@@ -1351,8 +1351,9 @@ static inline u64 x86_pmu_get_event_config(struct perf_event *event)static inline bool x86_pmu_has_rdpmc_user_disable (struct pmu *pmu) { -return !!(hybrid (pmu, config_mask) & -ARCH_PERFMON_EVENTSEL_RDPMC_USER_DISABLE ); +return is_x86_pmu (pmu) && + (hybrid (pmu, config_mask) & +ARCH_PERFMON_EVENTSEL_RDPMC_USER_DISABLE ); }extern struct event_constraint emptyconstraint;
Signature · 1 line
2.34.1
Re: [Patch v2 2/2] perf/x86: Update cap_user_rdpmc base on rdpmc user disable state
Quoted 11 lines · Dapeng Mi
After introducing the RDPMC user disable feature, user-space RDPMC may return 0 instead of the actual event count. This creates an inconsistency with
cap_user_rdpmc, wherecap_user_rdpmcis set, but user-space RDPMC only returns 0.To accurately represent the user-space RDPMC capability, update
cap_user_rdpmcbased on the RDPMC user disable state. If RDPMC user disable is enabled,cap_user_rdpmcis set to false, allowing user-space programs to fall back to theread()syscall to obtain the real event count.
Quoted 6 lines
Since
arch_perf_update_userpage()could be called for software events, enhancex86_pmu_has_rdpmc_user_disable()to only check the x86 PMUs.Fixes 59af95e028d4 ("perf/x86/intel: Add support for rdpmc user disable feature")Signed-off-by Dapeng Mi <[email protected]>---
Quoted 40 lines
v2: Add
is_x86_pmu()check before checking if rdpmc user disable feature is supported.v1: https://lore.kernel.org/all/[email protected]/
arch/x86/events/core.c | 3 +++ arch/x86/events/perf_event.h | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)arch/x86/events/core.c +3
-0@@ -2794,6 +2794,9 @@ void arch_perf_update_userpage(struct perf_event *event, userpg->cap_user_time_zero =0 ; userpg->cap_user_rdpmc = !!(event->hw.flags &PERF_EVENT_FLAG_USER_READ_CNT ); +if (x86_pmu_has_rdpmc_user_disable (event->pmu) && + event->hw.config &ARCH_PERFMON_EVENTSEL_RDPMC_USER_DISABLE ) + userpg->cap_user_rdpmc =0 ; userpg->pmc_width = x86_pmu.cntval_bits;if (!using_native_sched_clock () || !sched_clock_stable ())arch/x86/events/perf_event.h +3
-2@@ -1351,8 +1351,9 @@ static inline u64 x86_pmu_get_event_config(struct perf_event *event)static inline bool x86_pmu_has_rdpmc_user_disable (struct pmu *pmu) { -return !!(hybrid (pmu, config_mask) & -ARCH_PERFMON_EVENTSEL_RDPMC_USER_DISABLE ); +return is_x86_pmu (pmu) && + (hybrid (pmu, config_mask) & +ARCH_PERFMON_EVENTSEL_RDPMC_USER_DISABLE ); }extern struct event_constraint emptyconstraint;
Quoted 11 lines · Dapeng Mi
From: Ian Rogers <[email protected]>
To facilitate the detection of x86 PMU structures in upcoming patches, the
is_x86_pmu()helper is introduced. Additionally, theis_x86_event()helper has been refactored to utilizeis_x86_pmu().No function changes intended.
Signed-off-by Ian Rogers <[email protected]>Signed-off-by Dapeng Mi <[email protected]>---
Quoted 64 lines
v2: new patch.
arch/x86/events/core.c | 16 ---------------- arch/x86/events/perf_event.h | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 17 deletions(-)arch/x86/events/core.c +0
-16@@ -774,22 +774,6 @@ void x86_pmu_enable_all(int added) } } -int is_x86_event (struct perf_event *event) -{ -/* -* For a non-hybrid platforms, the type of X86 pmu is -* always PERF_TYPE_RAW. -* For a hybrid platform, the PERF_PMU_CAP_EXTENDED_HW_TYPE -* is a unique capability for the X86 PMU. -* Use them to detect a X86 event. -*/ -if (event->pmu->type ==PERF_TYPE_RAW || - event->pmu->capabilities &PERF_PMU_CAP_EXTENDED_HW_TYPE ) -return true; - -return false; -} -struct pmu *x86_get_pmu (unsigned int cpu) {struct cpu_hw_events *cpuc = &per_cpu (cpu_hw_events, cpu);arch/x86/events/perf_event.h +17
-1@@ -115,7 +115,23 @@ static inline bool is_topdown_event(struct perf_event *event)return is_metric_event (event) ||is_slots_event (event); } -int is_x86_event (struct perf_event *event); +static inline bool is_x86_pmu (struct pmu *pmu) +{ +/* +* For a non-hybrid platforms, the type of X86 pmu is +* always PERF_TYPE_RAW. +* For a hybrid platform, the PERF_PMU_CAP_EXTENDED_HW_TYPE +* is a unique capability for the X86 PMU. +* Use them to detect a X86 event. +*/ +return pmu->type ==PERF_TYPE_RAW || + pmu->capabilities &PERF_PMU_CAP_EXTENDED_HW_TYPE ; +} + +static inline bool is_x86_event (struct perf_event *event) +{ +return is_x86_pmu (event->pmu); +}static inline bool check_leader_group (struct perf_event *leader,int flags) {base-commit:
becb26c89be3a6448dcd92522894427544d5b091
Kindly ping. :)
Thanks.
Quoted 76 lines · Dapeng Mi
From: Ian Rogers <[email protected]>
To facilitate the detection of x86 PMU structures in upcoming patches, the
is_x86_pmu()helper is introduced. Additionally, theis_x86_event()helper has been refactored to utilizeis_x86_pmu().No function changes intended.
Signed-off-by Ian Rogers <[email protected]>Signed-off-by Dapeng Mi <[email protected]>---
v2: new patch.
arch/x86/events/core.c | 16 ---------------- arch/x86/events/perf_event.h | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 17 deletions(-)arch/x86/events/core.c +0
-16@@ -774,22 +774,6 @@ void x86_pmu_enable_all(int added) } } -int is_x86_event (struct perf_event *event) -{ -/* -* For a non-hybrid platforms, the type of X86 pmu is -* always PERF_TYPE_RAW. -* For a hybrid platform, the PERF_PMU_CAP_EXTENDED_HW_TYPE -* is a unique capability for the X86 PMU. -* Use them to detect a X86 event. -*/ -if (event->pmu->type ==PERF_TYPE_RAW || - event->pmu->capabilities &PERF_PMU_CAP_EXTENDED_HW_TYPE ) -return true; - -return false; -} -struct pmu *x86_get_pmu (unsigned int cpu) {struct cpu_hw_events *cpuc = &per_cpu (cpu_hw_events, cpu);arch/x86/events/perf_event.h +17
-1@@ -115,7 +115,23 @@ static inline bool is_topdown_event(struct perf_event *event)return is_metric_event (event) ||is_slots_event (event); } -int is_x86_event (struct perf_event *event); +static inline bool is_x86_pmu (struct pmu *pmu) +{ +/* +* For a non-hybrid platforms, the type of X86 pmu is +* always PERF_TYPE_RAW. +* For a hybrid platform, the PERF_PMU_CAP_EXTENDED_HW_TYPE +* is a unique capability for the X86 PMU. +* Use them to detect a X86 event. +*/ +return pmu->type ==PERF_TYPE_RAW || + pmu->capabilities &PERF_PMU_CAP_EXTENDED_HW_TYPE ; +} + +static inline bool is_x86_event (struct perf_event *event) +{ +return is_x86_pmu (event->pmu); +}static inline bool check_leader_group (struct perf_event *leader,int flags) {base-commit:
becb26c89be3a6448dcd92522894427544d5b091