perf_event: cleanup for __perf_event_init_context()
PATCH 1/3 perf_event: cleanup for __perf_event_init_context()
This is a cleanup patch and does:
- define 'perf_cpu_context' variable with 'static'
- using kzalloc() instead of kmalloc() and memset()
--- kernel/perf_event.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
kernel/perf_event.c +3 -4
@@ -36,7 +36,7 @@/* * Each CPU has a list of per CPU events: */ -DEFINE_PER_CPU(struct perf_cpu_context, perf_cpu_context); +static DEFINE_PER_CPU(struct perf_cpu_context, perf_cpu_context);int perf_max_events__read_mostly =1 ;static int perf_reserved_percpu__read_mostly ;
@@ -1579,7 +1579,6 @@ static void __perf_event_init_context(struct perf_event_context *ctx, struct task_struct *task) { - memset(ctx, 0, sizeof(*ctx)); raw_spin_lock_init(&ctx->lock);mutex_init (&ctx->mutex);INIT_LIST_HEAD (&ctx->group_list);
@@ -1654,7 +1653,7 @@ static struct perf_event_context *find_get_context(pid_t pid, int cpu) }if (!ctx) { - ctx =kmalloc (sizeof (struct perf_event_context ),GFP_KERNEL ); + ctx =kzalloc (sizeof (struct perf_event_context ),GFP_KERNEL ); err = -ENOMEM ;if (!ctx) goto errout;
@@ -5105,7 +5104,7 @@ int perf_event_init_task(struct task_struct *child)* First allocate and initialize a context for the child. */ - child_ctx =kmalloc (sizeof (struct perf_event_context ),GFP_KERNEL ); + child_ctx =kzalloc (sizeof (struct perf_event_context ),GFP_KERNEL );if (!child_ctx)return -ENOMEM ;
Signature · 1 line
1.6.1.2
PATCH 2/3 perf_event: allocate children's perf_event_ctxp at the right time
In current code, children task will allocate memory for 'child->perf_event_ctxp' if the parent is counted, we can do it only if the parent allowed children inherit it.
It can save memory and reduce overhead
--- kernel/perf_event.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-)
kernel/perf_event.c +22 -15
@@ -5083,7 +5083,7 @@ again:*/ int perf_event_init_task (struct task_struct *child) { -struct perf_event_context *child_ctx, *parent_ctx; +struct perf_event_context *child_ctx =NULL , *parent_ctx;struct perf_event_context *cloned_ctx;struct perf_event *event;struct task_struct *parent = current;
@@ -5099,20 +5099,6 @@ int perf_event_init_task(struct task_struct *child)return 0 ;/* -* This is executed from the parent task context, so inherit -* events that have been marked for cloning. -* First allocate and initialize a context for the child. -*/ - - child_ctx =kzalloc (sizeof (struct perf_event_context ),GFP_KERNEL ); -if (!child_ctx) -return -ENOMEM ; - -__perf_event_init_context (child_ctx, child); - child->perf_event_ctxp = child_ctx; -get_task_struct (child); - -/* * If the parent's context is a clone, pin it so it won't get * swapped under us. */
@@ -5142,6 +5128,26 @@ int perf_event_init_task(struct task_struct *child)continue ; } +if (!child->perf_event_ctxp) { +/* +* This is executed from the parent task context, so +* inherit events that have been marked for cloning. +* First allocate and initialize a context for the +* child. +*/ + + child_ctx =kzalloc (sizeof (struct perf_event_context ), +GFP_KERNEL ); +if (!child_ctx) { + ret = -ENOMEM ; + goto exit; + } + +__perf_event_init_context (child_ctx, child); + child->perf_event_ctxp = child_ctx; +get_task_struct (child); + } + ret =inherit_group (event, parent, parent_ctx, child, child_ctx);if (ret) {
@@ -5170,6 +5176,7 @@ int perf_event_init_task(struct task_struct *child)get_ctx (child_ctx->parent_ctx); } +exit:mutex_unlock (&parent_ctx->mutex);perf_unpin_context (parent_ctx);
Signature · 1 line
1.6.1.2
PATCH 3/3 perf_event: cleanup for cpu_clock_perf_event_update()
Using atomic64_xchg() instead of atomic64_read() and atomic64_set().
--- kernel/perf_event.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
kernel/perf_event.c +1 -2
@@ -4079,8 +4079,7 @@ static void cpu_clock_perf_event_update(struct perf_event *event)u64 now; now =cpu_clock (cpu); - prev =atomic64_read (&event->hw.prev_count); -atomic64_set (&event->hw.prev_count, now); + prev =atomic64_xchg (&event->hw.prev_count, now);atomic64_add (now - prev, &event->count); }
Signature · 1 line
1.6.1.2
Quoted 6 lines · Xiao Guangrong
This is a cleanup patch and does:
- define 'perf_cpu_context' variable with 'static'
- usingkzalloc()instead ofkmalloc()andmemset()Signed-off-by Xiao Guangrong <[email protected]>---
And perf_event_init_cpu() doesn't need it as it's supposed to be statically zeroed already.
Looks good to me.
Re: [PATCH 2/3] perf_event: allocate children's perf_event_ctxp at the right time
In reply to Xiao GuangrongQuoted 7 lines · Xiao Guangrong
In current code, children task will allocate memory for '
child->perf_event_ctxp' if the parent is counted, we can do it only if the parent allowed children inherit it.It can save memory and reduce overhead
Signed-off-by Xiao Guangrong <[email protected]>
Re: [PATCH 3/3] perf_event: cleanup for cpu_clock_perf_event_update()
In reply to Xiao GuangrongQuoted 12 lines · Xiao Guangrong
Using
atomic64_xchg()instead ofatomic64_read()andatomic64_set().Signed-off-by Xiao Guangrong <[email protected]>--- kernel/perf_event.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)kernel/perf_event.c +0
-0
kernel/perf_event.c static void cpu_clock_perf_event_update(struct perf_event *event) · line 4084
Quoted 8 lines
kernel/perf_event.c +1
-2@@ -4079,8 +4079,7 @@ static void cpu_clock_perf_event_update(struct perf_event *event)u64 now; now =cpu_clock (cpu); - prev =atomic64_read (&event->hw.prev_count); -atomic64_set (&event->hw.prev_count, now); + prev =atomic64_xchg (&event->hw.prev_count, now);atomic64_add (now - prev, &event->count); }
[tip:perf/urgent] perf_event: Clean up __perf_event_init_context()
In reply to Xiao GuangrongCommit-ID: aa5452d70c0d559310598b243b8b1033c10056e7 Gitweb: http://git.kernel.org/tip/aa5452d70c0d559310598b243b8b1033c10056e7 Author: Xiao Guangrong <[email protected]> AuthorDate: Wed, 9 Dec 2009 11:28:13 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 9 Dec 2009 09:56:27 +0100
perf_event: Clean up __perf_event_init_context()
Clean up the code a bit:
- define 'perf_cpu_context' variable with 'static'
- use kzalloc() instead of kmalloc() and memset()
LKML-Reference: <[email protected]>
--- kernel/perf_event.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
kernel/perf_event.c +3 -4
@@ -36,7 +36,7 @@/* * Each CPU has a list of per CPU events: */ -DEFINE_PER_CPU(struct perf_cpu_context, perf_cpu_context); +static DEFINE_PER_CPU(struct perf_cpu_context, perf_cpu_context);int perf_max_events__read_mostly =1 ;static int perf_reserved_percpu__read_mostly ;
@@ -1579,7 +1579,6 @@ static void __perf_event_init_context(struct perf_event_context *ctx, struct task_struct *task) { - memset(ctx, 0, sizeof(*ctx)); spin_lock_init(&ctx->lock);mutex_init (&ctx->mutex);INIT_LIST_HEAD (&ctx->group_list);
@@ -1654,7 +1653,7 @@ static struct perf_event_context *find_get_context(pid_t pid, int cpu) }if (!ctx) { - ctx =kmalloc (sizeof (struct perf_event_context ),GFP_KERNEL ); + ctx =kzalloc (sizeof (struct perf_event_context ),GFP_KERNEL ); err = -ENOMEM ;if (!ctx) goto errout;
@@ -5105,7 +5104,7 @@ int perf_event_init_task(struct task_struct *child)* First allocate and initialize a context for the child. */ - child_ctx =kmalloc (sizeof (struct perf_event_context ),GFP_KERNEL ); + child_ctx =kzalloc (sizeof (struct perf_event_context ),GFP_KERNEL );if (!child_ctx)return -ENOMEM ;
[tip:perf/urgent] perf_event: Allocate children's perf_event_ctxp at the right time
In reply to Xiao GuangrongCommit-ID: b93f7978ad6b46133e9453b90ccc057dc2429e75 Gitweb: http://git.kernel.org/tip/b93f7978ad6b46133e9453b90ccc057dc2429e75 Author: Xiao Guangrong <[email protected]> AuthorDate: Wed, 9 Dec 2009 11:29:44 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 9 Dec 2009 09:56:27 +0100
perf_event: Allocate children's perf_event_ctxp at the right time
In current code, children task will allocate memory for 'child->perf_event_ctxp' if the parent is counted, we can do it only if the parent allowed children inherit it.
It can save memory and reduce overhead.
LKML-Reference: <[email protected]>
--- kernel/perf_event.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-)
kernel/perf_event.c +22 -15
@@ -5083,7 +5083,7 @@ again:*/ int perf_event_init_task (struct task_struct *child) { -struct perf_event_context *child_ctx, *parent_ctx; +struct perf_event_context *child_ctx =NULL , *parent_ctx;struct perf_event_context *cloned_ctx;struct perf_event *event;struct task_struct *parent = current;
@@ -5099,20 +5099,6 @@ int perf_event_init_task(struct task_struct *child)return 0 ;/* -* This is executed from the parent task context, so inherit -* events that have been marked for cloning. -* First allocate and initialize a context for the child. -*/ - - child_ctx =kzalloc (sizeof (struct perf_event_context ),GFP_KERNEL ); -if (!child_ctx) -return -ENOMEM ; - -__perf_event_init_context (child_ctx, child); - child->perf_event_ctxp = child_ctx; -get_task_struct (child); - -/* * If the parent's context is a clone, pin it so it won't get * swapped under us. */
@@ -5142,6 +5128,26 @@ int perf_event_init_task(struct task_struct *child)continue ; } +if (!child->perf_event_ctxp) { +/* +* This is executed from the parent task context, so +* inherit events that have been marked for cloning. +* First allocate and initialize a context for the +* child. +*/ + + child_ctx =kzalloc (sizeof (struct perf_event_context ), +GFP_KERNEL ); +if (!child_ctx) { + ret = -ENOMEM ; + goto exit; + } + +__perf_event_init_context (child_ctx, child); + child->perf_event_ctxp = child_ctx; +get_task_struct (child); + } + ret =inherit_group (event, parent, parent_ctx, child, child_ctx);if (ret) {
@@ -5170,6 +5176,7 @@ int perf_event_init_task(struct task_struct *child)get_ctx (child_ctx->parent_ctx); } +exit:mutex_unlock (&parent_ctx->mutex);perf_unpin_context (parent_ctx);
[tip:perf/urgent] perf_event: Cleanup for cpu_clock_perf_event_update()
In reply to Xiao GuangrongCommit-ID: ec89a06fd4e12301f11ab039ee07d2353a18addc Gitweb: http://git.kernel.org/tip/ec89a06fd4e12301f11ab039ee07d2353a18addc Author: Xiao Guangrong <[email protected]> AuthorDate: Wed, 9 Dec 2009 11:30:36 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 9 Dec 2009 09:56:27 +0100
perf_event: Cleanup for cpu_clock_perf_event_update()
Using atomic64_xchg() instead of atomic64_read() and atomic64_set().
LKML-Reference: <[email protected]>
--- kernel/perf_event.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
kernel/perf_event.c +1 -2
@@ -4079,8 +4079,7 @@ static void cpu_clock_perf_event_update(struct perf_event *event)u64 now; now =cpu_clock (cpu); - prev =atomic64_read (&event->hw.prev_count); -atomic64_set (&event->hw.prev_count, now); + prev =atomic64_xchg (&event->hw.prev_count, now);atomic64_add (now - prev, &event->count); }