From: Lin Ming <ming.m.lin@intel.com>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@elte.hu>, Andi Kleen <andi@firstfloor.org>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 1/6] perf: Add interface to add general events to sysfs
Date: Fri, 15 Jul 2011 14:34:58 +0000 [thread overview]
Message-ID: <1310740503-15608-2-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1310740503-15608-1-git-send-email-ming.m.lin@intel.com>
PMU can implement ::add_events() to add its general events to sysfs.
For example,
/sys/bus/event_source/devices/uncore/events
└── cycle
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
include/linux/perf_event.h | 9 +++++++
kernel/events/core.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3f2711c..14337a3 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -676,6 +676,14 @@ struct pmu {
* for each successful ->add() during the transaction.
*/
void (*cancel_txn) (struct pmu *pmu); /* optional */
+
+ void (*add_events) (void);
+};
+
+struct pmu_event {
+ char name[64];
+ u64 config;
+ struct kobj_attribute attr;
};
/**
@@ -941,6 +949,7 @@ struct perf_output_handle {
extern int perf_pmu_register(struct pmu *pmu, char *name, int type);
extern void perf_pmu_unregister(struct pmu *pmu);
+extern void perf_pmu_add_events(struct pmu *pmu, struct pmu_event events[], int count);
extern int perf_num_counters(void);
extern const char *perf_pmu_name(void);
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 0567e32..9f4f463 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5571,6 +5571,8 @@ static int pmu_dev_alloc(struct pmu *pmu)
if (ret)
goto free_dev;
+ if (pmu->add_events)
+ pmu->add_events();
out:
return ret;
@@ -7035,4 +7037,54 @@ struct cgroup_subsys perf_subsys = {
.exit = perf_cgroup_exit,
.attach_task = perf_cgroup_attach_task,
};
+
+static ssize_t pmu_event_show(struct kobject *kobj,
+ struct kobj_attribute *attr, char *buf)
+{
+ struct pmu_event *event = container_of(attr, struct pmu_event, attr);
+ int size;
+
+ size = sprintf(buf, "%lld\n", event->config);
+
+ return size;
+}
+
+void perf_pmu_add_events(struct pmu *pmu, struct pmu_event events[], int count)
+{
+ struct attribute_group *attr_group = NULL;
+ struct attribute **all_attrs = NULL;
+ struct kobj_attribute *event_attr;
+ struct pmu_event *event;
+ int i;
+
+ attr_group = kzalloc(sizeof(*attr_group), GFP_KERNEL);
+ if (!attr_group)
+ return;
+ attr_group->name = "events";
+
+ all_attrs = kzalloc(sizeof(*all_attrs) * (count + 1), GFP_KERNEL);
+ if (!all_attrs)
+ goto fail;
+
+ for (i = 0; i < count; i++) {
+ event = &events[i];
+ event_attr = &event->attr;
+
+ sysfs_attr_init(&event_attr->attr);
+ event_attr->attr.name = event->name;
+ event_attr->attr.mode = 0444;
+ event_attr->show = pmu_event_show;
+
+ all_attrs[i] = &event_attr->attr;
+ }
+
+ attr_group->attrs = all_attrs;
+ if (!sysfs_create_group(&pmu->dev->kobj, attr_group))
+ return;
+
+fail:
+ kfree(attr_group);
+ kfree(all_attrs);
+}
+
#endif /* CONFIG_CGROUP_PERF */
--
1.7.5.1
next prev parent reply other threads:[~2011-07-15 14:29 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-15 14:34 [PATCH v2 0/6] perf: Intel uncore pmu counting support Lin Ming
2011-07-15 14:34 ` Lin Ming [this message]
2011-07-18 13:34 ` [PATCH v2 1/6] perf: Add interface to add general events to sysfs Peter Zijlstra
2011-07-18 14:00 ` Lin Ming
2011-07-19 7:52 ` Lin Ming
2011-07-25 7:08 ` Lin Ming
2011-07-25 7:57 ` Peter Zijlstra
2011-07-25 8:32 ` Lin Ming
2011-07-25 8:11 ` Lin Ming
2011-07-25 8:32 ` Peter Zijlstra
2011-07-25 15:20 ` Greg KH
2011-07-26 1:06 ` Lin Ming
2011-07-26 4:42 ` Greg KH
2011-07-26 5:50 ` Lin Ming
2011-07-15 14:34 ` [PATCH v2 2/6] perf, x86: Add Intel Nehalem/Westmere uncore pmu Lin Ming
2011-07-15 14:48 ` Lin Ming
2011-07-18 14:20 ` Peter Zijlstra
2011-07-18 14:54 ` Lin Ming
2011-07-18 16:11 ` Peter Zijlstra
2011-07-15 14:35 ` [PATCH v2 3/6] perf, x86: Add Intel SandyBridge " Lin Ming
2011-07-15 14:35 ` [PATCH v2 4/6] perf: Remove perf_event_attr::type check Lin Ming
2011-07-15 14:35 ` [PATCH v2 5/6] perf tool: Allow system-wide 'perf stat' without 'command' Lin Ming
2011-07-15 14:35 ` [PATCH v2 6/6] perf tool: Parse general/raw events from sysfs Lin Ming
2011-08-06 20:10 ` Stephane Eranian
2011-08-06 23:38 ` Lin Ming
2011-08-07 23:47 ` Stephane Eranian
2011-08-08 1:08 ` Lin Ming
2011-08-08 5:54 ` Stephane Eranian
2011-08-08 8:48 ` Peter Zijlstra
2011-08-08 8:57 ` Lin Ming
2011-08-08 9:03 ` Peter Zijlstra
2011-08-11 22:38 ` Stephane Eranian
2011-08-15 19:18 ` Corey Ashford
2011-08-31 12:21 ` [PATCH v2 0/6] perf: Intel uncore pmu counting support Stephane Eranian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310740503-15608-2-git-send-email-ming.m.lin@intel.com \
--to=ming.m.lin@intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=andi@firstfloor.org \
--cc=eranian@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox