From: "tip-bot for Yan, Zheng" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
torvalds@linux-foundation.org, peterz@infradead.org,
acme@kernel.org, zheng.z.yan@intel.com, tglx@linutronix.de
Subject: [tip:perf/core] perf: Allow building PMU drivers as modules
Date: Fri, 18 Apr 2014 06:08:19 -0700 [thread overview]
Message-ID: <tip-c464c76eec4be587604ca082e8cded7e6b89f3bf@git.kernel.org> (raw)
In-Reply-To: <1395133004-23205-1-git-send-email-zheng.z.yan@intel.com>
Commit-ID: c464c76eec4be587604ca082e8cded7e6b89f3bf
Gitweb: http://git.kernel.org/tip/c464c76eec4be587604ca082e8cded7e6b89f3bf
Author: Yan, Zheng <zheng.z.yan@intel.com>
AuthorDate: Tue, 18 Mar 2014 16:56:41 +0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 18 Apr 2014 12:54:45 +0200
perf: Allow building PMU drivers as modules
This patch adds support for building PMU driver as module. It exports
the functions perf_pmu_{register,unregister}() and adds reference tracking
for the PMU driver module.
When the PMU driver is built as a module, each active event of the PMU
holds a reference to the driver module.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1395133004-23205-1-git-send-email-zheng.z.yan@intel.com
Cc: eranian@google.com
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/linux/perf_event.h | 1 +
kernel/events/core.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3356abc..af6dcf1 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -172,6 +172,7 @@ struct perf_event;
struct pmu {
struct list_head entry;
+ struct module *module;
struct device *dev;
const struct attribute_group **attr_groups;
const char *name;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index f83a71a..5129b12 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -39,6 +39,7 @@
#include <linux/hw_breakpoint.h>
#include <linux/mm_types.h>
#include <linux/cgroup.h>
+#include <linux/module.h>
#include "internal.h"
@@ -3229,6 +3230,9 @@ static void __free_event(struct perf_event *event)
if (event->ctx)
put_ctx(event->ctx);
+ if (event->pmu)
+ module_put(event->pmu->module);
+
call_rcu(&event->rcu_head, free_event_rcu);
}
static void free_event(struct perf_event *event)
@@ -6551,6 +6555,7 @@ free_pdc:
free_percpu(pmu->pmu_disable_count);
goto unlock;
}
+EXPORT_SYMBOL_GPL(perf_pmu_register);
void perf_pmu_unregister(struct pmu *pmu)
{
@@ -6572,6 +6577,7 @@ void perf_pmu_unregister(struct pmu *pmu)
put_device(pmu->dev);
free_pmu_context(pmu);
}
+EXPORT_SYMBOL_GPL(perf_pmu_unregister);
struct pmu *perf_init_event(struct perf_event *event)
{
@@ -6585,6 +6591,10 @@ struct pmu *perf_init_event(struct perf_event *event)
pmu = idr_find(&pmu_idr, event->attr.type);
rcu_read_unlock();
if (pmu) {
+ if (!try_module_get(pmu->module)) {
+ pmu = ERR_PTR(-ENODEV);
+ goto unlock;
+ }
event->pmu = pmu;
ret = pmu->event_init(event);
if (ret)
@@ -6593,6 +6603,10 @@ struct pmu *perf_init_event(struct perf_event *event)
}
list_for_each_entry_rcu(pmu, &pmus, entry) {
+ if (!try_module_get(pmu->module)) {
+ pmu = ERR_PTR(-ENODEV);
+ goto unlock;
+ }
event->pmu = pmu;
ret = pmu->event_init(event);
if (!ret)
@@ -6771,6 +6785,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
err_pmu:
if (event->destroy)
event->destroy(event);
+ module_put(pmu->module);
err_ns:
if (event->ns)
put_pid_ns(event->ns);
prev parent reply other threads:[~2014-04-18 13:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 8:56 [PATCH 1/4] perf: allow building PMU driver as module Yan, Zheng
2014-03-18 8:56 ` [PATCH 2/4] hrtimer: export __hrtimer_start_range_ns Yan, Zheng
2014-03-19 8:47 ` Peter Zijlstra
2014-03-19 9:53 ` Thomas Gleixner
2014-03-19 9:58 ` Peter Zijlstra
2014-04-18 13:08 ` [tip:perf/core] hrtimer: Export __hrtimer_start_range_ns() tip-bot for Yan, Zheng
2014-03-18 8:56 ` [PATCH 3/4] perf/x86: export perf_assign_events Yan, Zheng
2014-04-18 13:08 ` [tip:perf/core] perf/x86: Export perf_assign_events() tip-bot for Yan, Zheng
2014-03-18 8:56 ` [PATCH 4/4] perf/x86/uncore: modularize Intel uncore driver Yan, Zheng
2014-03-19 8:49 ` Peter Zijlstra
2014-03-19 11:32 ` Ingo Molnar
2014-03-19 11:42 ` Peter Zijlstra
2014-03-19 11:53 ` Ingo Molnar
2014-03-19 12:44 ` Peter Zijlstra
2014-03-19 12:55 ` Ingo Molnar
2014-03-20 15:01 ` Vince Weaver
2014-03-20 15:50 ` Andi Kleen
2014-04-18 13:08 ` tip-bot for Yan, Zheng [this message]
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=tip-c464c76eec4be587604ca082e8cded7e6b89f3bf@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=zheng.z.yan@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.