Commit 96b4833b authored by Kevin Hao's avatar Kevin Hao Committed by Steven Rostedt (VMware)

tracing/hwlat: Honor the tracing_cpumask

In calculation of the cpu mask for the hwlat kernel thread, the wrong
cpu mask is used instead of the tracing_cpumask, this causes the
tracing/tracing_cpumask useless for hwlat tracer. Fixes it.

Link: https://lkml.kernel.org/r/20200730082318.42584-2-haokexin@gmail.com

Cc: Ingo Molnar <mingo@redhat.com>
Cc: stable@vger.kernel.org
Fixes: 0330f7aa ("tracing: Have hwlat trace migrate across tracing_cpumask CPUs")
Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent a9d0ba67
...@@ -283,6 +283,7 @@ static bool disable_migrate; ...@@ -283,6 +283,7 @@ static bool disable_migrate;
static void move_to_next_cpu(void) static void move_to_next_cpu(void)
{ {
struct cpumask *current_mask = &save_cpumask; struct cpumask *current_mask = &save_cpumask;
struct trace_array *tr = hwlat_trace;
int next_cpu; int next_cpu;
if (disable_migrate) if (disable_migrate)
...@@ -296,7 +297,7 @@ static void move_to_next_cpu(void) ...@@ -296,7 +297,7 @@ static void move_to_next_cpu(void)
goto disable; goto disable;
get_online_cpus(); get_online_cpus();
cpumask_and(current_mask, cpu_online_mask, tracing_buffer_mask); cpumask_and(current_mask, cpu_online_mask, tr->tracing_cpumask);
next_cpu = cpumask_next(smp_processor_id(), current_mask); next_cpu = cpumask_next(smp_processor_id(), current_mask);
put_online_cpus(); put_online_cpus();
...@@ -372,7 +373,7 @@ static int start_kthread(struct trace_array *tr) ...@@ -372,7 +373,7 @@ static int start_kthread(struct trace_array *tr)
/* Just pick the first CPU on first iteration */ /* Just pick the first CPU on first iteration */
get_online_cpus(); get_online_cpus();
cpumask_and(current_mask, cpu_online_mask, tracing_buffer_mask); cpumask_and(current_mask, cpu_online_mask, tr->tracing_cpumask);
put_online_cpus(); put_online_cpus();
next_cpu = cpumask_first(current_mask); next_cpu = cpumask_first(current_mask);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment