From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH 2/5 v2] tracing: Replace the per_cpu() with this_cpu() in trace_stack.c
Date: Fri, 7 Apr 2017 07:36:19 -0700 [thread overview]
Message-ID: <20170407143619.GR1600@linux.vnet.ibm.com> (raw)
In-Reply-To: <20170407140308.502725512@goodmis.org>
On Fri, Apr 07, 2017 at 10:01:08AM -0400, Steven Rostedt wrote:
> From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
>
> The updates to the trace_active per cpu variable can be updated with the
> this_cpu_*() functions as it only gets updated on the CPU that the variable
> is on.
>
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
> kernel/trace/trace_stack.c | 23 +++++++----------------
> 1 file changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
> index 5fb1f2c87e6b..05ad2b86461e 100644
> --- a/kernel/trace/trace_stack.c
> +++ b/kernel/trace/trace_stack.c
> @@ -207,13 +207,12 @@ stack_trace_call(unsigned long ip, unsigned long parent_ip,
> struct ftrace_ops *op, struct pt_regs *pt_regs)
> {
> unsigned long stack;
> - int cpu;
>
> preempt_disable_notrace();
>
> - cpu = raw_smp_processor_id();
> /* no atomic needed, we only modify this variable by this cpu */
> - if (per_cpu(trace_active, cpu)++ != 0)
> + this_cpu_inc(trace_active);
For whatever it is worth...
I was about to complain that this_cpu_inc() only disables preemption,
not interrupts, but then I realized that any correct interrupt handler
would have to restore the per-CPU variable to its original value.
Presumably you have to sum up all the per-CPU trace_active counts,
given that there is no guarantee that a process-level dec will happen
on the same CPU that did the inc.
Thanx, Paul
> + if (this_cpu_read(trace_active) != 1)
> goto out;
>
> ip += MCOUNT_INSN_SIZE;
> @@ -221,7 +220,7 @@ stack_trace_call(unsigned long ip, unsigned long parent_ip,
> check_stack(ip, &stack);
>
> out:
> - per_cpu(trace_active, cpu)--;
> + this_cpu_dec(trace_active);
> /* prevent recursion in schedule */
> preempt_enable_notrace();
> }
> @@ -253,7 +252,6 @@ stack_max_size_write(struct file *filp, const char __user *ubuf,
> long *ptr = filp->private_data;
> unsigned long val, flags;
> int ret;
> - int cpu;
>
> ret = kstrtoul_from_user(ubuf, count, 10, &val);
> if (ret)
> @@ -266,14 +264,13 @@ stack_max_size_write(struct file *filp, const char __user *ubuf,
> * we will cause circular lock, so we also need to increase
> * the percpu trace_active here.
> */
> - cpu = smp_processor_id();
> - per_cpu(trace_active, cpu)++;
> + this_cpu_inc(trace_active);
>
> arch_spin_lock(&stack_trace_max_lock);
> *ptr = val;
> arch_spin_unlock(&stack_trace_max_lock);
>
> - per_cpu(trace_active, cpu)--;
> + this_cpu_dec(trace_active);
> local_irq_restore(flags);
>
> return count;
> @@ -307,12 +304,9 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
>
> static void *t_start(struct seq_file *m, loff_t *pos)
> {
> - int cpu;
> -
> local_irq_disable();
>
> - cpu = smp_processor_id();
> - per_cpu(trace_active, cpu)++;
> + this_cpu_inc(trace_active);
>
> arch_spin_lock(&stack_trace_max_lock);
>
> @@ -324,12 +318,9 @@ static void *t_start(struct seq_file *m, loff_t *pos)
>
> static void t_stop(struct seq_file *m, void *p)
> {
> - int cpu;
> -
> arch_spin_unlock(&stack_trace_max_lock);
>
> - cpu = smp_processor_id();
> - per_cpu(trace_active, cpu)--;
> + this_cpu_dec(trace_active);
>
> local_irq_enable();
> }
> --
> 2.10.2
>
>
next prev parent reply other threads:[~2017-04-07 14:36 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 14:01 [PATCH 0/5 v2] tracing: Add usecase of synchronize_rcu_tasks() and stack_tracer_disable() Steven Rostedt
2017-04-07 14:01 ` [PATCH 1/5 v2] ftrace: Add use of synchronize_rcu_tasks() with dynamic trampolines Steven Rostedt
2017-04-07 14:01 ` [PATCH 2/5 v2] tracing: Replace the per_cpu() with this_cpu() in trace_stack.c Steven Rostedt
2017-04-07 14:36 ` Paul E. McKenney [this message]
2017-04-07 14:48 ` Steven Rostedt
2017-04-07 15:08 ` Paul E. McKenney
2017-04-07 14:01 ` [PATCH 3/5 v2] tracing: Add stack_tracer_disable/enable() functions Steven Rostedt
2017-04-07 14:22 ` Steven Rostedt
2017-04-07 14:25 ` [PATCH 3/5 v2.1] " Steven Rostedt
2017-04-07 14:01 ` [PATCH 4/5 v2] tracing: Rename trace_active to disable_stack_tracer and inline its modification Steven Rostedt
2017-04-07 14:01 ` [PATCH 5/5 v2] rcu: Fix dyntick-idle tracing Steven Rostedt
2017-04-07 14:40 ` Paul E. McKenney
2017-04-07 14:53 ` Steven Rostedt
2017-04-07 15:09 ` Paul E. McKenney
2017-04-07 15:29 ` Steven Rostedt
2017-04-07 14:43 ` [PATCH 0/5 v2] tracing: Add usecase of synchronize_rcu_tasks() and stack_tracer_disable() Paul E. McKenney
2017-04-07 14:58 ` Steven Rostedt
2017-04-07 15:11 ` Paul E. McKenney
2017-04-07 15:28 ` Steven Rostedt
2017-04-07 16:35 ` [PATCH 6/5]rcu/tracing: Add rcu_disabled to denote when rcu_irq_enter() will not work Steven Rostedt
2017-04-07 16:42 ` Paul E. McKenney
2017-04-07 16:44 ` Steven Rostedt
2017-04-07 16:53 ` Paul E. McKenney
2017-04-07 17:03 ` [PATCH 6/5 v2] rcu/tracing: " Steven Rostedt
2017-04-07 17:15 ` Paul E. McKenney
2017-04-07 17:06 ` [PATCH 7/5] tracing: Make sure rcu_irq_enter() can work for trace_*_rcuidle() trace events Steven Rostedt
2017-04-07 17:15 ` Paul E. McKenney
2017-04-07 17:19 ` Mathieu Desnoyers
2017-04-07 17:26 ` Steven Rostedt
2017-04-07 17:32 ` Steven Rostedt
2017-04-07 17:49 ` Mathieu Desnoyers
2017-04-07 17:55 ` Steven Rostedt
2017-04-07 18:10 ` [PATCH 7/5 v3] " Steven Rostedt
2017-04-07 18:17 ` Mathieu Desnoyers
2017-04-07 19:41 ` [PATCH 7/5 v4] " Steven Rostedt
2017-04-07 19:43 ` Steven Rostedt
2017-04-10 17:11 ` Mathieu Desnoyers
2017-04-07 17:28 ` [PATCH 7/5] " Steven Rostedt
2017-04-07 17:48 ` [PATCH 7/5 v2] " Steven Rostedt
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=20170407143619.GR1600@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).