Skip to contentSkip to conversation

Add cpu hotplug support for powerpc/perf/hv-24x7

PATCH Applied Kajol Jain 3 participants 5 messages Jul 9, 2020 – Jul 16, 2020

Subsystems (2)
lore
Share & tools
lore

Kajol Jain

author
#0 lore raw

v5 cover Add cpu hotplug support for powerpc/perf/hv-24x7

This patchset add cpu hotplug support for hv_24x7 driver by adding online/offline cpu hotplug function. It also add sysfs file "cpumask" to expose current online cpu that can be used for hv_24x7 event count.

Changelog:
v4 -> v5
- Since we are making PMU fail incase hotplug init failed, hence directly adding cpumask attr inside if_attrs rather then creating new attribute_group as suggested by Madhavan Srinivasan.

v3 -> v4
- Make PMU initialization fail incase hotplug init failed. Rather then just printing error msg.
- Did some nits changes like removing extra comment and initialising target value part as suggested by Michael Ellerman
- Retained Reviewd-by tag because the changes were fixes to some nits.

- Incase we sequentially offline multiple cpus, taking cpumask_first() may add some latency in that scenario.

So, I was trying to test benchmark in power9 lpar with 16 cpu, by off-lining cpu 0-14

With cpumask_last: This is what I got.

real 0m2.812s
user 0m0.002s
sys 0m0.003s

With cpulast_any:
real 0m3.690s
user 0m0.002s
sys 0m0.062s

That's why I just went with cpumask_last thing.

v2 -> v3
- Corrected some of the typo mistakes and update commit message as suggested by Gautham R Shenoy.
- Added Reviewed-by tag for the first patch in the patchset.

v1 -> v2
- Changed function to pick active cpu incase of offline from "cpumask_any_but" to "cpumask_last", as cpumask_any_but function pick very next online cpu and incase where we are sequentially off-lining multiple cpus, "pmu_migrate_context" can add extra latency.
- Suggested by: Gautham R Shenoy.

- Change documentation for cpumask and rather then hardcode the initialization for cpumask_attr_group, add loop to get very first NULL as suggested by Gautham R Shenoy.

Kajol Jain (2):
powerpc/perf/hv-24x7: Add cpu hotplug support powerpc/hv-24x7: Add sysfs files inside hv-24x7 device to show cpumask

 .../sysfs-bus-event_source-devices-hv_24x7    |  7 +++
 arch/powerpc/perf/hv-24x7.c                   | 54 +++++++++++++++++++
 include/linux/cpuhotplug.h                    |  1 +
 3 files changed, 62 insertions(+)
Signature · 1 line
2.26.2
author
#1 lore raw

PATCH v5 1/2 powerpc/perf/hv-24x7: Add cpu hotplug support

Patch here adds cpu hotplug functions to hv_24x7 pmu. A new cpuhp_state "CPUHP_AP_PERF_POWERPC_HV_24x7_ONLINE" enum is added.

The online callback function updates the cpumask only if its empty. As the primary intention of adding hotplug support is to designate a CPU to make HCALL to collect the counter data.

The offline function test and clear corresponding cpu in a cpumask and update cpumask to any other active cpu.

---
 arch/powerpc/perf/hv-24x7.c | 46 +++++++++++++++++++++++++++++++++++++
 include/linux/cpuhotplug.h  |  1 +
 2 files changed, 47 insertions(+)
arch/powerpc/perf/hv-24x7.c +46 -0
index db213eb7cb02..93b4700dcf8c 100644
@@ -31,6 +31,8 @@ static int interface_version;
 /* Whether we have to aggregate result data for some domains. */
 static bool aggregate_result_elements;
 
+static cpumask_t hv_24x7_cpumask;
+
 static bool domain_is_valid(unsigned domain)
 {
 	switch (domain) {
@@ -1641,6 +1643,45 @@ static struct pmu h_24x7_pmu = {
 	.capabilities = PERF_PMU_CAP_NO_EXCLUDE,
 };
 
+static int ppc_hv_24x7_cpu_online(unsigned int cpu)
+{
+	if (cpumask_empty(&hv_24x7_cpumask))
+		cpumask_set_cpu(cpu, &hv_24x7_cpumask);
+
+	return 0;
+}
+
+static int ppc_hv_24x7_cpu_offline(unsigned int cpu)
+{
+	int target;
+
+	/* Check if exiting cpu is used for collecting 24x7 events */
+	if (!cpumask_test_and_clear_cpu(cpu, &hv_24x7_cpumask))
+		return 0;
+
+	/* Find a new cpu to collect 24x7 events */
+	target = cpumask_last(cpu_active_mask);
+
+	if (target < 0 || target >= nr_cpu_ids) {
+		pr_err("hv_24x7: CPU hotplug init failed\n");
+		return -1;
+	}
+
+	/* Migrate 24x7 events to the new target */
+	cpumask_set_cpu(target, &hv_24x7_cpumask);
+	perf_pmu_migrate_context(&h_24x7_pmu, cpu, target);
+
+	return 0;
+}
+
+static int hv_24x7_cpu_hotplug_init(void)
+{
+	return cpuhp_setup_state(CPUHP_AP_PERF_POWERPC_HV_24x7_ONLINE,
+			  "perf/powerpc/hv_24x7:online",
+			  ppc_hv_24x7_cpu_online,
+			  ppc_hv_24x7_cpu_offline);
+}
+
 static int hv_24x7_init(void)
 {
 	int r;
@@ -1685,6 +1726,11 @@ static int hv_24x7_init(void)
 	if (r)
 		return r;
 
+	/* init cpuhotplug */
+	r = hv_24x7_cpu_hotplug_init();
+	if (r)
+		return r;
+
 	r = perf_pmu_register(&h_24x7_pmu, h_24x7_pmu.name, -1);
 	if (r)
 		return r;
include/linux/cpuhotplug.h +1 -0
index 191772d4a4d7..a2710e654b64 100644
@@ -181,6 +181,7 @@ enum cpuhp_state {
 	CPUHP_AP_PERF_POWERPC_CORE_IMC_ONLINE,
 	CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE,
 	CPUHP_AP_PERF_POWERPC_TRACE_IMC_ONLINE,
+	CPUHP_AP_PERF_POWERPC_HV_24x7_ONLINE,
 	CPUHP_AP_WATCHDOG_ONLINE,
 	CPUHP_AP_WORKQUEUE_ONLINE,
 	CPUHP_AP_RCUTREE_ONLINE,
Signature · 1 line
2.26.2
author
#2 lore raw

PATCH v5 2/2 powerpc/hv-24x7: Add sysfs files inside hv-24x7 device to show cpumask

In reply to Kajol Jain

Patch here adds a cpumask attr to hv_24x7 pmu along with ABI documentation.

Primary use to expose the cpumask is for the perf tool which has the capability to parse the driver sysfs folder and understand the cpumask file. Having cpumask file will reduce the number of perf command line parameters (will avoid "-C" option in the perf tool command line). It can also notify the user which is
the current cpu used to retrieve the counter data.

command:# cat /sys/devices/hv_24x7/interface/cpumask 0

---
 .../ABI/testing/sysfs-bus-event_source-devices-hv_24x7    | 7 +++++++
 arch/powerpc/perf/hv-24x7.c                               | 8 ++++++++
 2 files changed, 15 insertions(+)
Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7 +7 -0
index e8698afcd952..f7e32f218f73 100644
@@ -43,6 +43,13 @@ Description:	read only
 		This sysfs interface exposes the number of cores per chip
 		present in the system.
 
+What:		/sys/devices/hv_24x7/interface/cpumask
+Date:		July 2020
+Contact:	Linux on PowerPC Developer List <[email protected]>
+Description:	read only
+		This sysfs file exposes the cpumask which is designated to make
+		HCALLs to retrieve hv-24x7 pmu event counter data.
+
 What:		/sys/bus/event_source/devices/hv_24x7/event_descs/<event-name>
 Date:		February 2014
 Contact:	Linux on PowerPC Developer List <[email protected]>
arch/powerpc/perf/hv-24x7.c +8 -0
index 93b4700dcf8c..acc34148ad09 100644
@@ -448,6 +448,12 @@ static ssize_t device_show_string(struct device *dev,
 	return sprintf(buf, "%s\n", (char *)d->var);
 }
 
+static ssize_t cpumask_show(struct device *dev,
+			    struct device_attribute *attr, char *buf)
+{
+	return cpumap_print_to_pagebuf(true, buf, &hv_24x7_cpumask);
+}
+
 static ssize_t sockets_show(struct device *dev,
 			    struct device_attribute *attr, char *buf)
 {
@@ -1115,6 +1121,7 @@ static DEVICE_ATTR_RO(domains);
 static DEVICE_ATTR_RO(sockets);
 static DEVICE_ATTR_RO(chipspersocket);
 static DEVICE_ATTR_RO(coresperchip);
+static DEVICE_ATTR_RO(cpumask);
 
 static struct bin_attribute *if_bin_attrs[] = {
 	&bin_attr_catalog,
@@ -1128,6 +1135,7 @@ static struct attribute *if_attrs[] = {
 	&dev_attr_sockets.attr,
 	&dev_attr_chipspersocket.attr,
 	&dev_attr_coresperchip.attr,
+	&dev_attr_cpumask.attr,
 	NULL,
 };
 
Signature · 1 line
2.26.2
maintainer Reviewed-by on v5 2/2
#3 lore raw

Re: [PATCH v5 2/2] powerpc/hv-24x7: Add sysfs files inside hv-24x7 device to show cpumask

Quoted 11 lines · Kajol Jain

Patch here adds a cpumask attr to hv_24x7 pmu along with ABI documentation.

Primary use to expose the cpumask is for the perf tool which has the capability to parse the driver sysfs folder and understand the cpumask file. Having cpumask file will reduce the number of perf command line parameters (will avoid "-C" option in the perf tool command line). It can also notify the user which is
the current cpu used to retrieve the counter data.

command:# cat /sys/devices/hv_24x7/interface/cpumask 0

Quoted 57 lines
---
  .../ABI/testing/sysfs-bus-event_source-devices-hv_24x7    | 7 +++++++
  arch/powerpc/perf/hv-24x7.c                               | 8 ++++++++
  2 files changed, 15 insertions(+)
Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7 +7 -0
index e8698afcd952..f7e32f218f73 100644
@@ -43,6 +43,13 @@ Description:	read only
  		This sysfs interface exposes the number of cores per chip
  		present in the system.
 
+What:		/sys/devices/hv_24x7/interface/cpumask
+Date:		July 2020
+Contact:	Linux on PowerPC Developer List <[email protected]>
+Description:	read only
+		This sysfs file exposes the cpumask which is designated to make
+		HCALLs to retrieve hv-24x7 pmu event counter data.
+
  What:		/sys/bus/event_source/devices/hv_24x7/event_descs/<event-name>
  Date:		February 2014
  Contact:	Linux on PowerPC Developer List <[email protected]>
arch/powerpc/perf/hv-24x7.c +8 -0
index 93b4700dcf8c..acc34148ad09 100644
@@ -448,6 +448,12 @@ static ssize_t device_show_string(struct device *dev,
  	return sprintf(buf, "%s\n", (char *)d->var);
  }
 
+static ssize_t cpumask_show(struct device *dev,
+			    struct device_attribute *attr, char *buf)
+{
+	return cpumap_print_to_pagebuf(true, buf, &hv_24x7_cpumask);
+}
+
  static ssize_t sockets_show(struct device *dev,
  			    struct device_attribute *attr, char *buf)
  {
@@ -1115,6 +1121,7 @@ static DEVICE_ATTR_RO(domains);
  static DEVICE_ATTR_RO(sockets);
  static DEVICE_ATTR_RO(chipspersocket);
  static DEVICE_ATTR_RO(coresperchip);
+static DEVICE_ATTR_RO(cpumask);
 
  static struct bin_attribute *if_bin_attrs[] = {
  	&bin_attr_catalog,
@@ -1128,6 +1135,7 @@ static struct attribute *if_attrs[] = {
  	&dev_attr_sockets.attr,
  	&dev_attr_chipspersocket.attr,
  	&dev_attr_coresperchip.attr,
+	&dev_attr_cpumask.attr,
  	NULL,
  };
 
#4 lore raw
In reply to Kajol Jain
Quoted 5 lines · Kajol Jain

This patchset add cpu hotplug support for hv_24x7 driver by adding online/offline cpu hotplug function. It also add sysfs file "cpumask" to expose current online cpu that can be used for hv_24x7 event count.

Quoted 7 lines

Changelog:
v4 -> v5
- Since we are making PMU fail incase hotplug init failed, hence directly adding cpumask attr inside if_attrs rather then creating new attribute_group as suggested by Madhavan Srinivasan.

[...]

Applied to powerpc/next.

[1/2] powerpc/perf/hv-24x7: Add cpu hotplug support

      https://git.kernel.org/powerpc/c/1a8f0886a6008c98a926bdeca49f2ef33015a491
[2/2] powerpc/hv-24x7: Add sysfs files inside hv-24x7 device to show cpumask
      https://git.kernel.org/powerpc/c/792f73f747b82f6cb191a323e1f5755d33149b50

cheers