leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpumask: convert kernel trace functions further

Browse Source 
Impact: Reduce future memory usage, use new cpumask API.

Since the last patch was created and acked, more old cpumask users
slipped into kernel/trace.

Mostly trivial conversions, except struct trace_iterator's "started"
member becomes a cpumask_var_t.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2009-01-01 10:12:23 +10:30
parent 9e01c1b74c
commit 4462344ee9
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/trace/trace.c
View File

@ -1811,10 +1811,10 @@ static void test_cpu_buff_start(struct trace_iterator *iter)
if (!(iter->iter_flags & TRACE_FILE_ANNOTATE)) if (!(iter->iter_flags & TRACE_FILE_ANNOTATE))
return; return;
if (cpu_isset(iter->cpu, iter->started)) if (cpumask_test_cpu(iter->cpu, iter->started))
return; return;
cpu_set(iter->cpu, iter->started); cpumask_set_cpu(iter->cpu, iter->started);
trace_seq_printf(s, "##### CPU %u buffer started ####\n", iter->cpu); trace_seq_printf(s, "##### CPU %u buffer started ####\n", iter->cpu);
} }
@ -3114,10 +3114,15 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)
if (!iter) if (!iter)
return -ENOMEM; return -ENOMEM;
if (!alloc_cpumask_var(&iter->started, GFP_KERNEL)) {
kfree(iter);
return -ENOMEM;
}
mutex_lock(&trace_types_lock); mutex_lock(&trace_types_lock);
/* trace pipe does not show start of buffer */ /* trace pipe does not show start of buffer */
cpus_setall(iter->started); cpumask_setall(iter->started);
iter->tr = &global_trace; iter->tr = &global_trace;
iter->trace = current_trace; iter->trace = current_trace;
@ -3134,6 +3139,7 @@ static int tracing_release_pipe(struct inode *inode, struct file *file)
{ {
struct trace_iterator *iter = file->private_data; struct trace_iterator *iter = file->private_data;
free_cpumask_var(iter->started);
kfree(iter); kfree(iter);
atomic_dec(&tracing_reader); atomic_dec(&tracing_reader);

2
kernel/trace/trace.h
View File

@ -368,7 +368,7 @@ struct trace_iterator {
loff_t pos; loff_t pos;
long idx; long idx;
cpumask_t started; cpumask_var_t started;
}; };
int tracing_is_enabled(void); int tracing_is_enabled(void);

2
kernel/trace/trace_boot.c
View File

@ -42,7 +42,7 @@ static int boot_trace_init(struct trace_array *tr)
int cpu; int cpu;
boot_trace = tr; boot_trace = tr;
for_each_cpu_mask(cpu, cpu_possible_map) for_each_cpu(cpu, cpu_possible_mask)
tracing_reset(tr, cpu); tracing_reset(tr, cpu);
tracing_sched_switch_assign_trace(tr); tracing_sched_switch_assign_trace(tr);

2
kernel/trace/trace_functions_graph.c
View File

@ -79,7 +79,7 @@ print_graph_cpu(struct trace_seq *s, int cpu)
int i; int i;
int ret; int ret;
int log10_this = log10_cpu(cpu); int log10_this = log10_cpu(cpu);
int log10_all = log10_cpu(cpus_weight_nr(cpu_online_map)); int log10_all = log10_cpu(cpumask_weight(cpu_online_mask));
/* /*

6
kernel/trace/trace_hw_branches.c
View File

@ -46,7 +46,7 @@ static void bts_trace_start(struct trace_array *tr)
tracing_reset_online_cpus(tr); tracing_reset_online_cpus(tr);
for_each_cpu_mask(cpu, cpu_possible_map) for_each_cpu(cpu, cpu_possible_mask)
smp_call_function_single(cpu, bts_trace_start_cpu, NULL, 1); smp_call_function_single(cpu, bts_trace_start_cpu, NULL, 1);
} }
@ -62,7 +62,7 @@ static void bts_trace_stop(struct trace_array *tr)
{ {
int cpu; int cpu;
for_each_cpu_mask(cpu, cpu_possible_map) for_each_cpu(cpu, cpu_possible_mask)
smp_call_function_single(cpu, bts_trace_stop_cpu, NULL, 1); smp_call_function_single(cpu, bts_trace_stop_cpu, NULL, 1);
} }
@ -172,7 +172,7 @@ static void trace_bts_prepare(struct trace_iterator *iter)
{ {
int cpu; int cpu;
for_each_cpu_mask(cpu, cpu_possible_map) for_each_cpu(cpu, cpu_possible_mask)
smp_call_function_single(cpu, trace_bts_cpu, iter->tr, 1); smp_call_function_single(cpu, trace_bts_cpu, iter->tr, 1);
} }

2
kernel/trace/trace_power.c
View File

@ -39,7 +39,7 @@ static int power_trace_init(struct trace_array *tr)
trace_power_enabled = 1; trace_power_enabled = 1;
for_each_cpu_mask(cpu, cpu_possible_map) for_each_cpu(cpu, cpu_possible_mask)
tracing_reset(tr, cpu); tracing_reset(tr, cpu);
return 0; return 0;
} }