From: "Yan, Zheng" <zheng.z.yan@intel.com>
To: linux-kernel@vger.kernel.org
Cc: a.p.zijlstra@chello.nl, eranian@google.com, andi@firstfloor.org,
"Yan, Zheng" <zheng.z.yan@intel.com>
Subject: [PATCH 06/15] perf, core: PMU specific data for perf task context
Date: Wed, 11 Dec 2013 15:10:51 +0800 [thread overview]
Message-ID: <1386745860-21143-7-git-send-email-zheng.z.yan@intel.com> (raw)
In-Reply-To: <1386745860-21143-1-git-send-email-zheng.z.yan@intel.com>
From: "Yan, Zheng" <zheng.z.yan@intel.com>
allow allocating PMU specific data for perf task context
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---
include/linux/perf_event.h | 5 +++++
kernel/events/core.c | 19 ++++++++++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 96cb88b..147f9d3 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -252,6 +252,10 @@ struct pmu {
*/
void (*sched_task) (struct perf_event_context *ctx,
bool sched_in);
+ /*
+ * PMU specific data size
+ */
+ size_t task_ctx_size;
};
/**
@@ -496,6 +500,7 @@ struct perf_event_context {
int pin_count;
int nr_cgroups; /* cgroup evts */
int nr_branch_stack; /* branch_stack evt */
+ void *task_ctx_data; /* pmu specific data */
struct rcu_head rcu_head;
};
diff --git a/kernel/events/core.c b/kernel/events/core.c
index c281265..6499dae 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -882,6 +882,15 @@ static void get_ctx(struct perf_event_context *ctx)
WARN_ON(!atomic_inc_not_zero(&ctx->refcount));
}
+static void free_ctx(struct rcu_head *head)
+{
+ struct perf_event_context *ctx;
+
+ ctx = container_of(head, struct perf_event_context, rcu_head);
+ kfree(ctx->task_ctx_data);
+ kfree(ctx);
+}
+
static void put_ctx(struct perf_event_context *ctx)
{
if (atomic_dec_and_test(&ctx->refcount)) {
@@ -889,7 +898,7 @@ static void put_ctx(struct perf_event_context *ctx)
put_ctx(ctx->parent_ctx);
if (ctx->task)
put_task_struct(ctx->task);
- kfree_rcu(ctx, rcu_head);
+ call_rcu(&ctx->rcu_head, free_ctx);
}
}
@@ -3025,6 +3034,14 @@ alloc_perf_context(struct pmu *pmu, struct task_struct *task)
if (!ctx)
return NULL;
+ if (task && pmu->task_ctx_size > 0) {
+ ctx->task_ctx_data = kzalloc(pmu->task_ctx_size, GFP_KERNEL);
+ if (!ctx->task_ctx_data) {
+ kfree(ctx);
+ return NULL;
+ }
+ }
+
__perf_event_init_context(ctx);
if (task) {
ctx->task = task;
--
1.8.1.4
next prev parent reply other threads:[~2013-12-11 7:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-11 7:10 [PATCH 00/15] perf, x86: Haswell LBR call stack support Yan, Zheng
2013-12-11 7:10 ` [PATCH 01/15] perf, x86: Reduce lbr_sel_map size Yan, Zheng
2013-12-11 7:10 ` [PATCH 02/15] perf, x86: Basic Haswell LBR call stack support Yan, Zheng
2013-12-11 7:10 ` [PATCH 03/15] perf, core: Introduce pmu context switch callback Yan, Zheng
2013-12-11 7:10 ` [PATCH 04/15] perf, x86: Use context switch callback to flush LBR stack Yan, Zheng
2013-12-17 16:10 ` Ingo Molnar
2013-12-11 7:10 ` [PATCH 05/15] perf, core: Optimize context switch callback invoking Yan, Zheng
2013-12-11 7:10 ` Yan, Zheng [this message]
2013-12-11 7:10 ` [PATCH 07/15] perf, core: Always swtich pmu specific data during context switch Yan, Zheng
2013-12-11 7:10 ` [PATCH 08/15] perf, x86: Allocate memory for saving LBR stack Yan, Zheng
2013-12-11 7:10 ` [PATCH 09/15] perf: Track system-wide LBR users and LBR callstack users Yan, Zheng
2013-12-11 7:10 ` [PATCH 10/15] perf, x86: Save/resotre LBR stack during context switch Yan, Zheng
2013-12-11 7:10 ` [PATCH 11/15] perf, core: Simplify need branch stack check Yan, Zheng
2013-12-11 7:10 ` [PATCH 12/15] perf, core: Pass perf_sample_data to perf_callchain() Yan, Zheng
2013-12-11 7:10 ` [PATCH 13/15] perf, x86: Use LBR call stack to get user callchain Yan, Zheng
2013-12-11 7:10 ` [PATCH 14/15] perf, x86: Enable LBR callstack when recording callchain Yan, Zheng
2013-12-11 7:11 ` [PATCH 15/15] perf, x86: Discard zero length call entries in LBR call stack Yan, Zheng
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=1386745860-21143-7-git-send-email-zheng.z.yan@intel.com \
--to=zheng.z.yan@intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=andi@firstfloor.org \
--cc=eranian@google.com \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®