Skip to contentSkip to conversation

perf: core, add pmu register and lookup functions

RFC PATCH In review Lin Ming 2 participants 3 messages May 18, 2010 – May 19, 2010 perf events

lore
Share & tools
lore

Lin Ming

author
#0 lore raw

RFC PATCH v2 2/11 perf: core, add pmu register and lookup functions

And add new api pmu::init_event

Changes log
v2: Use RCU for synchronization (Peter Zijlstra)
v1: add pmu register and lookup functions

---
 include/linux/perf_event.h |   11 ++++++
 kernel/perf_event.c        |   73 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 0 deletions(-)
include/linux/perf_event.h +11 -0
index 6c01c5f..40809f5 100644
@@ -549,10 +549,16 @@ struct perf_event;
 
 #define PERF_EVENT_TXN_STARTED 1
 
+#define PMU_TYPE_CPU 0
+#define PMU_TYPE_NODE 1
+
 /**
  * struct pmu - generic performance monitoring unit
  */
 struct pmu {
+	int				id;
+	struct list_head		entry;
+
 	int (*enable)			(struct perf_event *event);
 	void (*disable)			(struct perf_event *event);
 	int (*start)			(struct perf_event *event);
@@ -569,6 +575,8 @@ struct pmu {
 	void (*start_txn)	(struct pmu *pmu);
 	void (*cancel_txn)	(struct pmu *pmu);
 	int  (*commit_txn)	(struct pmu *pmu);
+
+	int  (*init_event)	(struct perf_event *event);
 };
 
 /**
@@ -1013,6 +1021,9 @@ extern int perf_swevent_get_recursion_context(void);
 extern void perf_swevent_put_recursion_context(int rctx);
 extern void perf_event_enable(struct perf_event *event);
 extern void perf_event_disable(struct perf_event *event);
+
+extern int perf_event_register_pmu(struct pmu *pmu);
+extern void perf_event_unregister_pmu(int id);
 #else
 static inline void
 perf_event_task_sched_in(struct task_struct *task)			{ }
kernel/perf_event.c +73 -0

94 lines not on this page · raw message

#1 lore raw

On Wed, May 19, 2010 at 01:45:02AM +0000, Lin Ming wrote:
...

kernel/perf_event.c static int __init perf_event_sysfs_init(void) · line 5783

Quoted 10 lines
kernel/perf_event.c +10 -0
+int perf_event_register_pmu(struct pmu *pmu)
+{
+	struct pmu *tmp;
+	int ret = 1;
+
+	rcu_read_lock();
+	list_for_each_entry_rcu(tmp, &pmus, entry) {
+		if (tmp->id == pmu->id) {
+			ret = 0;
+			goto err;

Hi Ming, is it supposed to get out in locked state? I mean imbalanced rcu_read_lock somehow suspicicous ;)

kernel/perf_event.c static int __init perf_event_sysfs_init(void) · line 5795

Quoted 12 lines
kernel/perf_event.c +12 -0
+		}
+	}
+	rcu_read_unlock();
+
+	spin_lock(&pmus_lock);
+	list_add_tail_rcu(&pmu->entry, &pmus);
+	spin_unlock(&pmus_lock);
+
+err:
+	return ret;
+}
+

...

-- Cyrill

author
#2 lore raw
Quoted 15 lines · Cyrill Gorcunov

On Wed, May 19, 2010 at 01:45:02AM +0000, Lin Ming wrote:
...

kernel/perf_event.c static int __init perf_event_sysfs_init(void) · line 5783

Quoted 10 lines
kernel/perf_event.c +10 -0
+int perf_event_register_pmu(struct pmu *pmu)
+{
+	struct pmu *tmp;
+	int ret = 1;
+
+	rcu_read_lock();
+	list_for_each_entry_rcu(tmp, &pmus, entry) {
+		if (tmp->id == pmu->id) {
+			ret = 0;
+			goto err;

Hi Ming, is it supposed to get out in locked state? I mean imbalanced rcu_read_lock somehow suspicicous ;)

Ah, yes, that's real bug.
I'll fix it.

Thanks for review.

Quoted 16 lines

kernel/perf_event.c static int __init perf_event_sysfs_init(void) · line 5795

Quoted 13 lines
kernel/perf_event.c +12 -0
+		}
+	}
+	rcu_read_unlock();
+
+	spin_lock(&pmus_lock);
+	list_add_tail_rcu(&pmu->entry, &pmus);
+	spin_unlock(&pmus_lock);
+
+err:
+	return ret;
+}
+

...

-- Cyrill