|
@@ -128,7 +128,7 @@ enum event_type_t {
|
|
|
* perf_sched_events : >0 events exist
|
|
|
* perf_cgroup_events: >0 per-cpu cgroup events exist on this cpu
|
|
|
*/
|
|
|
-struct jump_label_key perf_sched_events __read_mostly;
|
|
|
+struct jump_label_key_deferred perf_sched_events __read_mostly;
|
|
|
static DEFINE_PER_CPU(atomic_t, perf_cgroup_events);
|
|
|
|
|
|
static atomic_t nr_mmap_events __read_mostly;
|
|
@@ -2748,7 +2748,7 @@ static void free_event(struct perf_event *event)
|
|
|
|
|
|
if (!event->parent) {
|
|
|
if (event->attach_state & PERF_ATTACH_TASK)
|
|
|
- jump_label_dec(&perf_sched_events);
|
|
|
+ jump_label_dec_deferred(&perf_sched_events);
|
|
|
if (event->attr.mmap || event->attr.mmap_data)
|
|
|
atomic_dec(&nr_mmap_events);
|
|
|
if (event->attr.comm)
|
|
@@ -2759,7 +2759,7 @@ static void free_event(struct perf_event *event)
|
|
|
put_callchain_buffers();
|
|
|
if (is_cgroup_event(event)) {
|
|
|
atomic_dec(&per_cpu(perf_cgroup_events, event->cpu));
|
|
|
- jump_label_dec(&perf_sched_events);
|
|
|
+ jump_label_dec_deferred(&perf_sched_events);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -5784,7 +5784,7 @@ done:
|
|
|
|
|
|
if (!event->parent) {
|
|
|
if (event->attach_state & PERF_ATTACH_TASK)
|
|
|
- jump_label_inc(&perf_sched_events);
|
|
|
+ jump_label_inc(&perf_sched_events.key);
|
|
|
if (event->attr.mmap || event->attr.mmap_data)
|
|
|
atomic_inc(&nr_mmap_events);
|
|
|
if (event->attr.comm)
|
|
@@ -6022,7 +6022,7 @@ SYSCALL_DEFINE5(perf_event_open,
|
|
|
* - that may need work on context switch
|
|
|
*/
|
|
|
atomic_inc(&per_cpu(perf_cgroup_events, event->cpu));
|
|
|
- jump_label_inc(&perf_sched_events);
|
|
|
+ jump_label_inc(&perf_sched_events.key);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -6868,6 +6868,9 @@ void __init perf_event_init(void)
|
|
|
|
|
|
ret = init_hw_breakpoint();
|
|
|
WARN(ret, "hw_breakpoint initialization failed with: %d", ret);
|
|
|
+
|
|
|
+ /* do not patch jump label more than once per second */
|
|
|
+ jump_label_rate_limit(&perf_sched_events, HZ);
|
|
|
}
|
|
|
|
|
|
static int __init perf_event_sysfs_init(void)
|