Skip to contentSkip to conversation

perf: arm, convert to new API pmu->init_event

RFC PATCH Superseded Lin Ming 3 participants 4 messages May 10, 2010

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Lin Ming

author
#0 lore raw

RFC PATCH 5/9 perf: arm, convert to new API pmu->init_event

perf: arm, convert to new API pmu->init_event

---
 arch/arm/kernel/perf_event.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)
arch/arm/kernel/perf_event.c +15 -13
index 8400ddf..565f13a 100644
@@ -270,13 +270,6 @@ out:
 	return err;
 }
 
-static struct pmu pmu = {
-	.enable	    = armpmu_enable,
-	.disable    = armpmu_disable,
-	.unthrottle = armpmu_unthrottle,
-	.read	    = armpmu_read,
-};
-
 static int
 validate_event(struct cpu_hw_events *cpuc,
 	       struct perf_event *event)
@@ -446,20 +439,19 @@ __hw_perf_event_init(struct perf_event *event)
 	return err;
 }
 
-struct pmu *
-hw_perf_event_init(struct perf_event *event)
+static int armpmu_init_event(struct perf_event *event)
 {
 	int err = 0;
 
 	if (!armpmu)
-		return ERR_PTR(-ENODEV);
+		return -ENODEV;
 
 	event->destroy = hw_perf_event_destroy;
 
 	if (!atomic_inc_not_zero(&active_events)) {
 		if (atomic_read(&active_events) > perf_max_events) {
 			atomic_dec(&active_events);
-			return ERR_PTR(-ENOSPC);
+			return -ENOSPC;
 		}
 
 		mutex_lock(&pmu_reserve_mutex);
@@ -473,15 +465,23 @@ hw_perf_event_init(struct perf_event *event)
 	}
 
 	if (err)
-		return ERR_PTR(err);
+		return err;
 
 	err = __hw_perf_event_init(event);
 	if (err)
 		hw_perf_event_destroy(event);
 
-	return err ? ERR_PTR(err) : &pmu;
+	return err;
 }
 
+static struct pmu pmu = {
+	.enable	    = armpmu_enable,
+	.disable    = armpmu_disable,
+	.unthrottle = armpmu_unthrottle,
+	.read	    = armpmu_read,
+	.init_event  = armpmu_init_event,
+};
+
 void
 hw_perf_enable(void)
 {
@@ -2138,6 +2138,8 @@ init_hw_perf_events(void)
 		pr_info("enabled with %s PMU driver, %d counters available\n",
 			armpmu->name, armpmu->num_events);
 
+	perf_event_register_pmu(&pmu);
+
 	return 0;
 }
 arch_initcall(init_hw_perf_events);
#1 lore raw
Quoted 1 line · Lin Ming

perf: arm, convert to new API pmu->init_event

Unfortunately, this seems to clash with a rework of the ARM PMU/oprofile code. You also really need to copy the guys doing this work, eg the authors of arch/arm/kernel/perf_event.c - Will Deacon.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
author
#2 lore raw
In reply to Lin Ming
Quoted 3 lines · Russell King

Unfortunately, this seems to clash with a rework of the ARM PMU/oprofile code. You also really need to copy the guys doing this work, eg the authors of arch/arm/kernel/perf_event.c - Will Deacon.

(Add Will Deacon)

I'll check the rework of the ARM PMU/oprofile code.

Thanks.

Quoted 85 lines · Lin Ming

perf: arm, convert to new API pmu->init_event

---
 arch/arm/kernel/perf_event.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)
arch/arm/kernel/perf_event.c +15 -13
index 8400ddf..565f13a 100644
@@ -270,13 +270,6 @@ out:
 	return err;
 }
 
-static struct pmu pmu = {
-	.enable	    = armpmu_enable,
-	.disable    = armpmu_disable,
-	.unthrottle = armpmu_unthrottle,
-	.read	    = armpmu_read,
-};
-
 static int
 validate_event(struct cpu_hw_events *cpuc,
 	       struct perf_event *event)
@@ -446,20 +439,19 @@ __hw_perf_event_init(struct perf_event *event)
 	return err;
 }
 
-struct pmu *
-hw_perf_event_init(struct perf_event *event)
+static int armpmu_init_event(struct perf_event *event)
 {
 	int err = 0;
 
 	if (!armpmu)
-		return ERR_PTR(-ENODEV);
+		return -ENODEV;
 
 	event->destroy = hw_perf_event_destroy;
 
 	if (!atomic_inc_not_zero(&active_events)) {
 		if (atomic_read(&active_events) > perf_max_events) {
 			atomic_dec(&active_events);
-			return ERR_PTR(-ENOSPC);
+			return -ENOSPC;
 		}
 
 		mutex_lock(&pmu_reserve_mutex);
@@ -473,15 +465,23 @@ hw_perf_event_init(struct perf_event *event)
 	}
 
 	if (err)
-		return ERR_PTR(err);
+		return err;
 
 	err = __hw_perf_event_init(event);
 	if (err)
 		hw_perf_event_destroy(event);
 
-	return err ? ERR_PTR(err) : &pmu;
+	return err;
 }
 
+static struct pmu pmu = {
+	.enable	    = armpmu_enable,
+	.disable    = armpmu_disable,
+	.unthrottle = armpmu_unthrottle,
+	.read	    = armpmu_read,
+	.init_event  = armpmu_init_event,
+};
+
 void
 hw_perf_enable(void)
 {
@@ -2138,6 +2138,8 @@ init_hw_perf_events(void)
 		pr_info("enabled with %s PMU driver, %d counters available\n",
 			armpmu->name, armpmu->num_events);
 
+	perf_event_register_pmu(&pmu);
+
 	return 0;
 }
 arch_initcall(init_hw_perf_events);
#3 lore raw

Hi Lin [thanks to Russell for the CC],

Quoted 8 lines · Lin Ming
Quoted 7 lines · Lin Ming

perf: arm, convert to new API pmu->init_event

---
 arch/arm/kernel/perf_event.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

--------8<--------

The changes I've made to perf_event.c that result in conflicts with this patch shouldn't cause you any trouble. If you rebase the patch then everything should work as expected. Please CC me when you submit the next iteration.

Cheers,

Will