powerpc/perf: Add support for caps under sysfs in powerpc
PATCH v2 1/2 powerpc/perf: Add support for caps under sysfs in powerpc
Add caps support under "/sys/bus/event_source/devices/<pmu>/" for powerpc. This directory can be used to expose some of the specific features that powerpc PMU supports to the user.
Example: pmu_name. The name of PMU registered will depend on platform, say power9 or power10 or it could be Generic Compat PMU.
Currently the only way to know which is the registered PMU is from the dmesg logs. But clearing the dmesg will make it difficult to know exact PMU backend used. And even extracting from dmesg will be complicated, as we need to parse the dmesg logs and add filters for pmu name. Whereas by exposing it via caps will make it easy as we just need to directly read it from the sysfs.
Add a caps directory to /sys/bus/event_source/devices/cpu/ for power8, power9, power10 and generic compat PMU in respective PMU driver code. Update the pmu_name file under caps folder in core-book3s using "attr_update".
The information exposed currently:
- pmu_name : Underlying PMU name from the driver
Example result with power9 pmu:
# ls /sys/bus/event_source/devices/cpu/caps pmu_name
# cat /sys/bus/event_source/devices/cpu/caps/pmu_name POWER9
---
Changelog:
v1 -> v2:
Move the show function as generic in core-book3s
and update show function using sysfs_emit and ppmu->name
Added Documention for this ABI in patch 2.
Notes: The caps directory is implemented in PMU for other architectures already. Reference commit for x86:
commit b00233b53065 ("perf/x86: Export some PMU attributes in caps/ directory")
arch/powerpc/perf/core-book3s.c | 31 ++++++++++++++++++++++++++ arch/powerpc/perf/generic-compat-pmu.c | 10 +++++++++ arch/powerpc/perf/power10-pmu.c | 10 +++++++++ arch/powerpc/perf/power8-pmu.c | 10 +++++++++ arch/powerpc/perf/power9-pmu.c | 10 +++++++++ 5 files changed, 71 insertions(+)
arch/powerpc/perf/core-book3s.c +31 -0
@@ -2488,6 +2488,33 @@ static int power_pmu_prepare_cpu(unsigned int cpu)return 0 ; } +static ssize_t pmu_name_show (struct device *cdev, +struct device_attribute *attr, +char *buf) +{ +if (ppmu) +return sysfs_emit (buf,"%s\n" , ppmu->name); + +return 0 ; +} + +static DEVICE_ATTR_RO (pmu_name); + +static struct attribute *pmu_caps_attrs[] = { + &dev_attr_pmu_name.attr, +NULL +}; + +static const struct attribute_group pmu_caps_group = { + .name ="caps" , + .attrs = pmu_caps_attrs, +}; + +static const struct attribute_group *pmu_caps_groups[] = { + &pmu_caps_group, +NULL , +}; +int __init register_power_pmu (struct power_pmu *pmu) {if (ppmu)
@@ -2498,6 +2525,10 @@ int __init register_power_pmu(struct power_pmu *pmu) pmu->name); power_pmu.attr_groups = ppmu->attr_groups; + +if (ppmu->flags &PPMU_ARCH_207S ) + power_pmu.attr_update = pmu_caps_groups; + power_pmu.capabilities |= (ppmu->capabilities &PERF_PMU_CAP_EXTENDED_REGS );#ifdef MSR_HV
arch/powerpc/perf/generic-compat-pmu.c +10 -0
@@ -151,9 +151,19 @@ static const struct attribute_group generic_compat_pmu_format_group = { .attrs = generic_compat_pmu_format_attr, }; +static struct attribute *generic_compat_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group generic_compat_pmu_caps_group = { + .name ="caps" , + .attrs = generic_compat_pmu_caps_attrs, +}; +static const struct attribute_group *generic_compat_pmu_attr_groups[] = { &generic_compat_pmu_format_group, &generic_compat_pmu_events_group, + &generic_compat_pmu_caps_group,NULL , };
arch/powerpc/perf/power10-pmu.c +10 -0
@@ -258,6 +258,15 @@ static const struct attribute_group power10_pmu_format_group = { .attrs = power10_pmu_format_attr, }; +static struct attribute *power10_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power10_pmu_caps_group = { + .name ="caps" , + .attrs = power10_pmu_caps_attrs, +}; +static const struct attribute_group *power10_pmu_attr_groups_dd1[] = { &power10_pmu_format_group, &power10_pmu_events_group_dd1,
@@ -267,6 +276,7 @@ static const struct attribute_group *power10_pmu_attr_groups_dd1[] = {static const struct attribute_group *power10_pmu_attr_groups[] = { &power10_pmu_format_group, &power10_pmu_events_group, + &power10_pmu_caps_group,NULL , };
arch/powerpc/perf/power8-pmu.c +10 -0
@@ -187,9 +187,19 @@ static const struct attribute_group power8_pmu_events_group = { .attrs = power8_events_attr, }; +static struct attribute *power8_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power8_pmu_caps_group = { + .name ="caps" , + .attrs = power8_pmu_caps_attrs, +}; +static const struct attribute_group *power8_pmu_attr_groups[] = { &isa207_pmu_format_group, &power8_pmu_events_group, + &power8_pmu_caps_group,NULL , };
arch/powerpc/perf/power9-pmu.c +10 -0
@@ -258,9 +258,19 @@ static const struct attribute_group power9_pmu_format_group = { .attrs = power9_pmu_format_attr, }; +static struct attribute *power9_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power9_pmu_caps_group = { + .name ="caps" , + .attrs = power9_pmu_caps_attrs, +}; +static const struct attribute_group *power9_pmu_attr_groups[] = { &power9_pmu_format_group, &power9_pmu_events_group, + &power9_pmu_caps_group,NULL , };
Signature · 1 line
2.31.1
PATCH v2 2/2 docs: ABI: sysfs-bus-event_source-devices: Document sysfs caps entry for PMU
Add ABI documentation for "caps" attribute group. Some of the platform specific PMU features can be exposed in "caps" attribute group/directory:
/sys/bus/event_source/devices/<dev>/
--- .../sysfs-bus-event_source-devices-caps | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-caps
Documentation/ABI/testing/sysfs-bus-event_source-devices-caps new file +18 -0
@@ -0,0 +1,18 @@ +What: /sys/bus/event_source/devices/<dev>/caps +Date: May 2022 +KernelVersion: 5.19 +Contact: Linux kernel mailing list <[email protected]> +Description: + Attribute group to describe the capabilities exposed + for a particular pmu. Each attribute of this group can + expose information specific to a PMU, say pmu_name, so that + userspace can understand some of the feature which the + platform specific PMU supports. + + One of the example available capability in supported platform + like Intel is pmu_name, which exposes underlying CPU name known + to the PMU driver. + + Example output in powerpc: + grep -H . /sys/bus/event_source/devices/cpu/caps/* + /sys/bus/event_source/devices/cpu/caps/pmu_name:POWER9
Signature · 1 line
2.31.1
Quoted 8 lines · Athira Rajeev
Add caps support under "/sys/bus/event_source/devices/<pmu>/" for powerpc. This directory can be used to expose some of the specific features that powerpc PMU supports to the user.
Example:pmu_name. The name of PMU registered will depend on platform, say power9 or power10 or it could be Generic Compat PMU.
Quoted 7 lines
Currently the only way to know which is the registered PMU is from the dmesg logs. But clearing the dmesg will make it difficult to know exact PMU backend used. And even extracting from dmesg will be complicated, as we need to parse the dmesg logs and add filters for pmu name. Whereas by exposing it via caps will make it easy as we just need to directly read it from the sysfs.
For ARM and x86 in the perf tool this is normally done through a cpuid like function, is there a reason to differ on Power?
Thanks,
Ian
Quoted 186 lines
Add a caps directory to
/sys/bus/event_source/devices/cpu/for power8, power9, power10 and generic compat PMU in respective PMU driver code. Update thepmu_namefile under caps folder in core-book3s using "attr_update".The information exposed currently:
-pmu_name: Underlying PMU name from the driverExample result with power9 pmu:
# ls /sys/bus/event_source/devices/cpu/caps pmu_name# cat /sys/bus/event_source/devices/cpu/caps/pmu_name POWER9Signed-off-by Athira Rajeev <[email protected]>---
Changelog:
v1 -> v2:
Move the show function as generic in core-book3s
and update show function usingsysfs_emitandppmu->name
Added Documention for this ABI in patch 2.
Notes: The caps directory is implemented in PMU for other architectures already. Reference commit for x86:
commitb00233b53065("perf/x86: Export some PMU attributes in caps/ directory")arch/powerpc/perf/core-book3s.c | 31 ++++++++++++++++++++++++++ arch/powerpc/perf/generic-compat-pmu.c | 10 +++++++++ arch/powerpc/perf/power10-pmu.c | 10 +++++++++ arch/powerpc/perf/power8-pmu.c | 10 +++++++++ arch/powerpc/perf/power9-pmu.c | 10 +++++++++ 5 files changed, 71 insertions(+)arch/powerpc/perf/core-book3s.c +31
-0@@ -2488,6 +2488,33 @@ static int power_pmu_prepare_cpu(unsigned int cpu)return 0 ; } +static ssize_t pmu_name_show (struct device *cdev, +struct device_attribute *attr, +char *buf) +{ +if (ppmu) +return sysfs_emit (buf,"%s\n" , ppmu->name); + +return 0 ; +} + +static DEVICE_ATTR_RO (pmu_name); + +static struct attribute *pmu_caps_attrs[] = { + &dev_attr_pmu_name.attr, +NULL +}; + +static const struct attribute_group pmu_caps_group = { + .name ="caps" , + .attrs = pmu_caps_attrs, +}; + +static const struct attribute_group *pmu_caps_groups[] = { + &pmu_caps_group, +NULL , +}; +int __init register_power_pmu (struct power_pmu *pmu) {if (ppmu)@@ -2498,6 +2525,10 @@ int __init register_power_pmu(struct power_pmu *pmu) pmu->name); power_pmu.attr_groups = ppmu->attr_groups; + +if (ppmu->flags &PPMU_ARCH_207S ) + power_pmu.attr_update = pmu_caps_groups; + power_pmu.capabilities |= (ppmu->capabilities &PERF_PMU_CAP_EXTENDED_REGS );#ifdef MSR_HV arch/powerpc/perf/generic-compat-pmu.c +10
-0@@ -151,9 +151,19 @@ static const struct attribute_group generic_compat_pmu_format_group = { .attrs = generic_compat_pmu_format_attr, }; +static struct attribute *generic_compat_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group generic_compat_pmu_caps_group = { + .name ="caps" , + .attrs = generic_compat_pmu_caps_attrs, +}; +static const struct attribute_group *generic_compat_pmu_attr_groups[] = { &generic_compat_pmu_format_group, &generic_compat_pmu_events_group, + &generic_compat_pmu_caps_group,NULL , };arch/powerpc/perf/power10-pmu.c +10
-0@@ -258,6 +258,15 @@ static const struct attribute_group power10_pmu_format_group = { .attrs = power10_pmu_format_attr, }; +static struct attribute *power10_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power10_pmu_caps_group = { + .name ="caps" , + .attrs = power10_pmu_caps_attrs, +}; +static const struct attribute_group *power10_pmu_attr_groups_dd1[] = { &power10_pmu_format_group, &power10_pmu_events_group_dd1,@@ -267,6 +276,7 @@ static const struct attribute_group *power10_pmu_attr_groups_dd1[] = {static const struct attribute_group *power10_pmu_attr_groups[] = { &power10_pmu_format_group, &power10_pmu_events_group, + &power10_pmu_caps_group,NULL , };arch/powerpc/perf/power8-pmu.c +10
-0@@ -187,9 +187,19 @@ static const struct attribute_group power8_pmu_events_group = { .attrs = power8_events_attr, }; +static struct attribute *power8_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power8_pmu_caps_group = { + .name ="caps" , + .attrs = power8_pmu_caps_attrs, +}; +static const struct attribute_group *power8_pmu_attr_groups[] = { &isa207_pmu_format_group, &power8_pmu_events_group, + &power8_pmu_caps_group,NULL , };arch/powerpc/perf/power9-pmu.c +10
-1@@ -258,9 +258,19 @@ static const struct attribute_group power9_pmu_format_group = { .attrs = power9_pmu_format_attr, }; +static struct attribute *power9_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power9_pmu_caps_group = { + .name ="caps" , + .attrs = power9_pmu_caps_attrs, +}; +static const struct attribute_group *power9_pmu_attr_groups[] = { &power9_pmu_format_group, &power9_pmu_events_group, + &power9_pmu_caps_group,NULL , }; --2.31.1
Quoted 22 lines · Ian Rogers
Quoted 8 lines · Athira Rajeev
Add caps support under "/sys/bus/event_source/devices/<pmu>/" for powerpc. This directory can be used to expose some of the specific features that powerpc PMU supports to the user.
Example:pmu_name. The name of PMU registered will depend on platform, say power9 or power10 or it could be Generic Compat PMU.Quoted 7 lines
Currently the only way to know which is the registered PMU is from the dmesg logs. But clearing the dmesg will make it difficult to know exact PMU backend used. And even extracting from dmesg will be complicated, as we need to parse the dmesg logs and add filters for pmu name. Whereas by exposing it via caps will make it easy as we just need to directly read it from the sysfs.
Quoted 5 lines
For ARM and x86 in the perf tool this is normally done through a cpuid like function, is there a reason to differ on Power?
Thanks,
Ian
Hi Ian,
Thanks for review. The information from cpuid or cpuinfo will provide us the information of the platform/model/machine etc. In case of powerpc, we have one case where, though platform points to specific generation of the processor, say power9 or power10, the registered PMU could point to different one. To be specific, this is named as Generic Compat PMU which is a fallback PMU. This gets registered when the distro doesn't have support for platform specific PMU. In that case distro will have a Generic Compat PMU registered which supports basic features for performance monitoring. This information can't be fetched from the cpuid data since that will point to current platform.
So the pmu_name exposed via "caps" will be useful to detect the PMU registered and also we target to use this information in some of our selftests.
Thanks
Athira
Quoted 186 lines
Quoted 186 lines
Add a caps directory to
/sys/bus/event_source/devices/cpu/for power8, power9, power10 and generic compat PMU in respective PMU driver code. Update thepmu_namefile under caps folder in core-book3s using "attr_update".The information exposed currently:
-pmu_name: Underlying PMU name from the driverExample result with power9 pmu:
# ls /sys/bus/event_source/devices/cpu/caps pmu_name# cat /sys/bus/event_source/devices/cpu/caps/pmu_name POWER9Signed-off-by Athira Rajeev <[email protected]>---
Changelog:
v1 -> v2:
Move the show function as generic in core-book3s
and update show function usingsysfs_emitandppmu->name
Added Documention for this ABI in patch 2.
Notes: The caps directory is implemented in PMU for other architectures already. Reference commit for x86:
commitb00233b53065("perf/x86: Export some PMU attributes in caps/ directory")arch/powerpc/perf/core-book3s.c | 31 ++++++++++++++++++++++++++ arch/powerpc/perf/generic-compat-pmu.c | 10 +++++++++ arch/powerpc/perf/power10-pmu.c | 10 +++++++++ arch/powerpc/perf/power8-pmu.c | 10 +++++++++ arch/powerpc/perf/power9-pmu.c | 10 +++++++++ 5 files changed, 71 insertions(+)arch/powerpc/perf/core-book3s.c +31
-0@@ -2488,6 +2488,33 @@ static int power_pmu_prepare_cpu(unsigned int cpu)return 0 ; } +static ssize_t pmu_name_show (struct device *cdev, +struct device_attribute *attr, +char *buf) +{ +if (ppmu) +return sysfs_emit (buf,"%s\n" , ppmu->name); + +return 0 ; +} + +static DEVICE_ATTR_RO (pmu_name); + +static struct attribute *pmu_caps_attrs[] = { + &dev_attr_pmu_name.attr, +NULL +}; + +static const struct attribute_group pmu_caps_group = { + .name ="caps" , + .attrs = pmu_caps_attrs, +}; + +static const struct attribute_group *pmu_caps_groups[] = { + &pmu_caps_group, +NULL , +}; +int __init register_power_pmu (struct power_pmu *pmu) {if (ppmu)@@ -2498,6 +2525,10 @@ int __init register_power_pmu(struct power_pmu *pmu) pmu->name); power_pmu.attr_groups = ppmu->attr_groups; + +if (ppmu->flags &PPMU_ARCH_207S ) + power_pmu.attr_update = pmu_caps_groups; + power_pmu.capabilities |= (ppmu->capabilities &PERF_PMU_CAP_EXTENDED_REGS );#ifdef MSR_HV arch/powerpc/perf/generic-compat-pmu.c +10
-0@@ -151,9 +151,19 @@ static const struct attribute_group generic_compat_pmu_format_group = { .attrs = generic_compat_pmu_format_attr, }; +static struct attribute *generic_compat_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group generic_compat_pmu_caps_group = { + .name ="caps" , + .attrs = generic_compat_pmu_caps_attrs, +}; +static const struct attribute_group *generic_compat_pmu_attr_groups[] = { &generic_compat_pmu_format_group, &generic_compat_pmu_events_group, + &generic_compat_pmu_caps_group,NULL , };arch/powerpc/perf/power10-pmu.c +10
-0@@ -258,6 +258,15 @@ static const struct attribute_group power10_pmu_format_group = { .attrs = power10_pmu_format_attr, }; +static struct attribute *power10_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power10_pmu_caps_group = { + .name ="caps" , + .attrs = power10_pmu_caps_attrs, +}; +static const struct attribute_group *power10_pmu_attr_groups_dd1[] = { &power10_pmu_format_group, &power10_pmu_events_group_dd1,@@ -267,6 +276,7 @@ static const struct attribute_group *power10_pmu_attr_groups_dd1[] = {static const struct attribute_group *power10_pmu_attr_groups[] = { &power10_pmu_format_group, &power10_pmu_events_group, + &power10_pmu_caps_group,NULL , };arch/powerpc/perf/power8-pmu.c +10
-0@@ -187,9 +187,19 @@ static const struct attribute_group power8_pmu_events_group = { .attrs = power8_events_attr, }; +static struct attribute *power8_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power8_pmu_caps_group = { + .name ="caps" , + .attrs = power8_pmu_caps_attrs, +}; +static const struct attribute_group *power8_pmu_attr_groups[] = { &isa207_pmu_format_group, &power8_pmu_events_group, + &power8_pmu_caps_group,NULL , };arch/powerpc/perf/power9-pmu.c +10
-1@@ -258,9 +258,19 @@ static const struct attribute_group power9_pmu_format_group = { .attrs = power9_pmu_format_attr, }; +static struct attribute *power9_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power9_pmu_caps_group = { + .name ="caps" , + .attrs = power9_pmu_caps_attrs, +}; +static const struct attribute_group *power9_pmu_attr_groups[] = { &power9_pmu_format_group, &power9_pmu_events_group, + &power9_pmu_caps_group,NULL , }; --2.31.1
Quoted 40 lines · Athira Rajeev
Quoted 21 lines · Ian Rogers
Quoted 8 lines · Athira Rajeev
Add caps support under "/sys/bus/event_source/devices/<pmu>/" for powerpc. This directory can be used to expose some of the specific features that powerpc PMU supports to the user.
Example:pmu_name. The name of PMU registered will depend on platform, say power9 or power10 or it could be Generic Compat PMU.Quoted 7 lines
Currently the only way to know which is the registered PMU is from the dmesg logs. But clearing the dmesg will make it difficult to know exact PMU backend used. And even extracting from dmesg will be complicated, as we need to parse the dmesg logs and add filters for pmu name. Whereas by exposing it via caps will make it easy as we just need to directly read it from the sysfs.
Quoted 5 lines
For ARM and x86 in the perf tool this is normally done through a cpuid like function, is there a reason to differ on Power?
Thanks,
IanHi Ian,
Thanks for review. The information from cpuid or cpuinfo will provide us the information of the platform/model/machine etc. In case of powerpc, we have one case where, though platform points to specific generation of the processor, say power9 or power10, the registered PMU could point to different one. To be specific, this is named as Generic Compat PMU which is a fallback PMU. This gets registered when the distro doesn't have support for platform specific PMU. In that case distro will have a Generic Compat PMU registered which supports basic features for performance monitoring. This information can't be fetched from the cpuid data since that will point to current platform.
Quoted 3 lines
So the
pmu_nameexposed via "caps" will be useful to detect the PMU registered and also we target to use this information in some of our selftests.
Thanks, I've no problem with the change. Do we need to do a similar discovery in the perf tool on old kernels? Perhaps then this information could be exposed in the perf list command for self tests.
Thanks,
Ian
Quoted 189 lines
Thanks
AthiraQuoted 186 lines
Quoted 186 lines
Add a caps directory to
/sys/bus/event_source/devices/cpu/for power8, power9, power10 and generic compat PMU in respective PMU driver code. Update thepmu_namefile under caps folder in core-book3s using "attr_update".The information exposed currently:
-pmu_name: Underlying PMU name from the driverExample result with power9 pmu:
# ls /sys/bus/event_source/devices/cpu/caps pmu_name# cat /sys/bus/event_source/devices/cpu/caps/pmu_name POWER9Signed-off-by Athira Rajeev <[email protected]>---
Changelog:
v1 -> v2:
Move the show function as generic in core-book3s
and update show function usingsysfs_emitandppmu->name
Added Documention for this ABI in patch 2.
Notes: The caps directory is implemented in PMU for other architectures already. Reference commit for x86:
commitb00233b53065("perf/x86: Export some PMU attributes in caps/ directory")arch/powerpc/perf/core-book3s.c | 31 ++++++++++++++++++++++++++ arch/powerpc/perf/generic-compat-pmu.c | 10 +++++++++ arch/powerpc/perf/power10-pmu.c | 10 +++++++++ arch/powerpc/perf/power8-pmu.c | 10 +++++++++ arch/powerpc/perf/power9-pmu.c | 10 +++++++++ 5 files changed, 71 insertions(+)arch/powerpc/perf/core-book3s.c +31
-0@@ -2488,6 +2488,33 @@ static int power_pmu_prepare_cpu(unsigned int cpu)return 0 ; } +static ssize_t pmu_name_show (struct device *cdev, +struct device_attribute *attr, +char *buf) +{ +if (ppmu) +return sysfs_emit (buf,"%s\n" , ppmu->name); + +return 0 ; +} + +static DEVICE_ATTR_RO (pmu_name); + +static struct attribute *pmu_caps_attrs[] = { + &dev_attr_pmu_name.attr, +NULL +}; + +static const struct attribute_group pmu_caps_group = { + .name ="caps" , + .attrs = pmu_caps_attrs, +}; + +static const struct attribute_group *pmu_caps_groups[] = { + &pmu_caps_group, +NULL , +}; +int __init register_power_pmu (struct power_pmu *pmu) {if (ppmu)@@ -2498,6 +2525,10 @@ int __init register_power_pmu(struct power_pmu *pmu) pmu->name); power_pmu.attr_groups = ppmu->attr_groups; + +if (ppmu->flags &PPMU_ARCH_207S ) + power_pmu.attr_update = pmu_caps_groups; + power_pmu.capabilities |= (ppmu->capabilities &PERF_PMU_CAP_EXTENDED_REGS );#ifdef MSR_HV arch/powerpc/perf/generic-compat-pmu.c +10
-0@@ -151,9 +151,19 @@ static const struct attribute_group generic_compat_pmu_format_group = { .attrs = generic_compat_pmu_format_attr, }; +static struct attribute *generic_compat_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group generic_compat_pmu_caps_group = { + .name ="caps" , + .attrs = generic_compat_pmu_caps_attrs, +}; +static const struct attribute_group *generic_compat_pmu_attr_groups[] = { &generic_compat_pmu_format_group, &generic_compat_pmu_events_group, + &generic_compat_pmu_caps_group,NULL , };arch/powerpc/perf/power10-pmu.c +10
-0@@ -258,6 +258,15 @@ static const struct attribute_group power10_pmu_format_group = { .attrs = power10_pmu_format_attr, }; +static struct attribute *power10_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power10_pmu_caps_group = { + .name ="caps" , + .attrs = power10_pmu_caps_attrs, +}; +static const struct attribute_group *power10_pmu_attr_groups_dd1[] = { &power10_pmu_format_group, &power10_pmu_events_group_dd1,@@ -267,6 +276,7 @@ static const struct attribute_group *power10_pmu_attr_groups_dd1[] = {static const struct attribute_group *power10_pmu_attr_groups[] = { &power10_pmu_format_group, &power10_pmu_events_group, + &power10_pmu_caps_group,NULL , };arch/powerpc/perf/power8-pmu.c +10
-0@@ -187,9 +187,19 @@ static const struct attribute_group power8_pmu_events_group = { .attrs = power8_events_attr, }; +static struct attribute *power8_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power8_pmu_caps_group = { + .name ="caps" , + .attrs = power8_pmu_caps_attrs, +}; +static const struct attribute_group *power8_pmu_attr_groups[] = { &isa207_pmu_format_group, &power8_pmu_events_group, + &power8_pmu_caps_group,NULL , };arch/powerpc/perf/power9-pmu.c +10
-1@@ -258,9 +258,19 @@ static const struct attribute_group power9_pmu_format_group = { .attrs = power9_pmu_format_attr, }; +static struct attribute *power9_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power9_pmu_caps_group = { + .name ="caps" , + .attrs = power9_pmu_caps_attrs, +}; +static const struct attribute_group *power9_pmu_attr_groups[] = { &power9_pmu_format_group, &power9_pmu_events_group, + &power9_pmu_caps_group,NULL , }; --2.31.1
Quoted 46 lines · Ian Rogers
Quoted 40 lines · Athira Rajeev
Quoted 21 lines · Ian Rogers
Quoted 8 lines · Athira Rajeev
Add caps support under "/sys/bus/event_source/devices/<pmu>/" for powerpc. This directory can be used to expose some of the specific features that powerpc PMU supports to the user.
Example:pmu_name. The name of PMU registered will depend on platform, say power9 or power10 or it could be Generic Compat PMU.Quoted 7 lines
Currently the only way to know which is the registered PMU is from the dmesg logs. But clearing the dmesg will make it difficult to know exact PMU backend used. And even extracting from dmesg will be complicated, as we need to parse the dmesg logs and add filters for pmu name. Whereas by exposing it via caps will make it easy as we just need to directly read it from the sysfs.
Quoted 5 lines
For ARM and x86 in the perf tool this is normally done through a cpuid like function, is there a reason to differ on Power?
Thanks,
IanHi Ian,
Thanks for review. The information from cpuid or cpuinfo will provide us the information of the platform/model/machine etc. In case of powerpc, we have one case where, though platform points to specific generation of the processor, say power9 or power10, the registered PMU could point to different one. To be specific, this is named as Generic Compat PMU which is a fallback PMU. This gets registered when the distro doesn't have support for platform specific PMU. In that case distro will have a Generic Compat PMU registered which supports basic features for performance monitoring. This information can't be fetched from the cpuid data since that will point to current platform.
Quoted 7 lines
Quoted 3 lines
So the
pmu_nameexposed via "caps" will be useful to detect the PMU registered and also we target to use this information in some of our selftests.Thanks, I've no problem with the change. Do we need to do a similar discovery in the perf tool on old kernels? Perhaps then this information could be exposed in the perf list command for self tests.
Hi Ian,
Thanks for review. Thats good one to have. I see in perf tools, we are parsing caps data : "env->cpu_pmu_caps" already. I will check on how this is used and option of having in perf list.
After checking, I will send a follow up patch for the same.
Thanks
Athira
Quoted 192 lines
Thanks,
IanQuoted 188 lines
Thanks
AthiraQuoted 186 lines
Quoted 186 lines
Add a caps directory to
/sys/bus/event_source/devices/cpu/for power8, power9, power10 and generic compat PMU in respective PMU driver code. Update thepmu_namefile under caps folder in core-book3s using "attr_update".The information exposed currently:
-pmu_name: Underlying PMU name from the driverExample result with power9 pmu:
# ls /sys/bus/event_source/devices/cpu/caps pmu_name# cat /sys/bus/event_source/devices/cpu/caps/pmu_name POWER9Signed-off-by Athira Rajeev <[email protected]>---
Changelog:
v1 -> v2:
Move the show function as generic in core-book3s
and update show function usingsysfs_emitandppmu->name
Added Documention for this ABI in patch 2.
Notes: The caps directory is implemented in PMU for other architectures already. Reference commit for x86:
commitb00233b53065("perf/x86: Export some PMU attributes in caps/ directory")arch/powerpc/perf/core-book3s.c | 31 ++++++++++++++++++++++++++ arch/powerpc/perf/generic-compat-pmu.c | 10 +++++++++ arch/powerpc/perf/power10-pmu.c | 10 +++++++++ arch/powerpc/perf/power8-pmu.c | 10 +++++++++ arch/powerpc/perf/power9-pmu.c | 10 +++++++++ 5 files changed, 71 insertions(+)arch/powerpc/perf/core-book3s.c +31
-0@@ -2488,6 +2488,33 @@ static int power_pmu_prepare_cpu(unsigned int cpu)return 0 ; } +static ssize_t pmu_name_show (struct device *cdev, +struct device_attribute *attr, +char *buf) +{ +if (ppmu) +return sysfs_emit (buf,"%s\n" , ppmu->name); + +return 0 ; +} + +static DEVICE_ATTR_RO (pmu_name); + +static struct attribute *pmu_caps_attrs[] = { + &dev_attr_pmu_name.attr, +NULL +}; + +static const struct attribute_group pmu_caps_group = { + .name ="caps" , + .attrs = pmu_caps_attrs, +}; + +static const struct attribute_group *pmu_caps_groups[] = { + &pmu_caps_group, +NULL , +}; +int __init register_power_pmu (struct power_pmu *pmu) {if (ppmu)@@ -2498,6 +2525,10 @@ int __init register_power_pmu(struct power_pmu *pmu) pmu->name); power_pmu.attr_groups = ppmu->attr_groups; + +if (ppmu->flags &PPMU_ARCH_207S ) + power_pmu.attr_update = pmu_caps_groups; + power_pmu.capabilities |= (ppmu->capabilities &PERF_PMU_CAP_EXTENDED_REGS );#ifdef MSR_HV arch/powerpc/perf/generic-compat-pmu.c +10
-0@@ -151,9 +151,19 @@ static const struct attribute_group generic_compat_pmu_format_group = { .attrs = generic_compat_pmu_format_attr, }; +static struct attribute *generic_compat_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group generic_compat_pmu_caps_group = { + .name ="caps" , + .attrs = generic_compat_pmu_caps_attrs, +}; +static const struct attribute_group *generic_compat_pmu_attr_groups[] = { &generic_compat_pmu_format_group, &generic_compat_pmu_events_group, + &generic_compat_pmu_caps_group,NULL , };arch/powerpc/perf/power10-pmu.c +10
-0@@ -258,6 +258,15 @@ static const struct attribute_group power10_pmu_format_group = { .attrs = power10_pmu_format_attr, }; +static struct attribute *power10_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power10_pmu_caps_group = { + .name ="caps" , + .attrs = power10_pmu_caps_attrs, +}; +static const struct attribute_group *power10_pmu_attr_groups_dd1[] = { &power10_pmu_format_group, &power10_pmu_events_group_dd1,@@ -267,6 +276,7 @@ static const struct attribute_group *power10_pmu_attr_groups_dd1[] = {static const struct attribute_group *power10_pmu_attr_groups[] = { &power10_pmu_format_group, &power10_pmu_events_group, + &power10_pmu_caps_group,NULL , };arch/powerpc/perf/power8-pmu.c +10
-0@@ -187,9 +187,19 @@ static const struct attribute_group power8_pmu_events_group = { .attrs = power8_events_attr, }; +static struct attribute *power8_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power8_pmu_caps_group = { + .name ="caps" , + .attrs = power8_pmu_caps_attrs, +}; +static const struct attribute_group *power8_pmu_attr_groups[] = { &isa207_pmu_format_group, &power8_pmu_events_group, + &power8_pmu_caps_group,NULL , };arch/powerpc/perf/power9-pmu.c +10
-1@@ -258,9 +258,19 @@ static const struct attribute_group power9_pmu_format_group = { .attrs = power9_pmu_format_attr, }; +static struct attribute *power9_pmu_caps_attrs[] = { +NULL +}; + +static struct attribute_group power9_pmu_caps_group = { + .name ="caps" , + .attrs = power9_pmu_caps_attrs, +}; +static const struct attribute_group *power9_pmu_attr_groups[] = { &power9_pmu_format_group, &power9_pmu_events_group, + &power9_pmu_caps_group,NULL , }; --2.31.1