hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw_breakpoint: Simplify *register_wide_hw_breakpoint() 

1. register_wide_hw_breakpoint() can use unregister_ if failure,
   no need to duplicate the code.

2. "struct perf_event **pevent" adds the unnecesary lever of
   indirection and complication, use per_cpu(*cpu_events, cpu).

Reported-by: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20130620155018.GA6347@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Oleg Nesterov 2013-06-20 17:50:18 +02:00 committed by Ingo Molnar
parent 1c10adbb92
commit e12cbc10cb
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kernel/events/hw_breakpoint.c
View File

@ -497,8 +497,8 @@ register_wide_hw_breakpoint(struct perf_event_attr *attr,
perf_overflow_handler_t triggered, perf_overflow_handler_t triggered,
void *context) void *context)
{ {
struct perf_event * __percpu *cpu_events, **pevent, *bp; struct perf_event * __percpu *cpu_events, *bp;
long err; long err = 0;
int cpu; int cpu;
cpu_events = alloc_percpu(typeof(*cpu_events)); cpu_events = alloc_percpu(typeof(*cpu_events));
@ -507,31 +507,21 @@ register_wide_hw_breakpoint(struct perf_event_attr *attr,
get_online_cpus(); get_online_cpus();
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
pevent = per_cpu_ptr(cpu_events, cpu);
bp = perf_event_create_kernel_counter(attr, cpu, NULL, bp = perf_event_create_kernel_counter(attr, cpu, NULL,
triggered, context); triggered, context);
*pevent = bp;
if (IS_ERR(bp)) { if (IS_ERR(bp)) {
err = PTR_ERR(bp); err = PTR_ERR(bp);
goto fail;
}
}
put_online_cpus();
return cpu_events;
fail:
for_each_online_cpu(cpu) {
pevent = per_cpu_ptr(cpu_events, cpu);
if (IS_ERR(*pevent))
break; break;
unregister_hw_breakpoint(*pevent); }
per_cpu(*cpu_events, cpu) = bp;
} }
put_online_cpus(); put_online_cpus();
free_percpu(cpu_events); if (likely(!err))
return cpu_events;
unregister_wide_hw_breakpoint(cpu_events);
return (void __percpu __force *)ERR_PTR(err); return (void __percpu __force *)ERR_PTR(err);
} }
EXPORT_SYMBOL_GPL(register_wide_hw_breakpoint); EXPORT_SYMBOL_GPL(register_wide_hw_breakpoint);
@ -543,12 +533,10 @@ EXPORT_SYMBOL_GPL(register_wide_hw_breakpoint);
void unregister_wide_hw_breakpoint(struct perf_event * __percpu *cpu_events) void unregister_wide_hw_breakpoint(struct perf_event * __percpu *cpu_events)
{ {
int cpu; int cpu;
struct perf_event **pevent;
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu)
pevent = per_cpu_ptr(cpu_events, cpu); unregister_hw_breakpoint(per_cpu(*cpu_events, cpu));
unregister_hw_breakpoint(*pevent);
}
free_percpu(cpu_events); free_percpu(cpu_events);
} }
EXPORT_SYMBOL_GPL(unregister_wide_hw_breakpoint); EXPORT_SYMBOL_GPL(unregister_wide_hw_breakpoint);