Commit ca2db6cf authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Ingo Molnar

tracepoints: use rcu sched

Make tracepoints use rcu sched. (cleanup)
Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d74185ed
...@@ -80,10 +80,7 @@ static void tracepoint_entry_free_old(struct tracepoint_entry *entry, void *old) ...@@ -80,10 +80,7 @@ static void tracepoint_entry_free_old(struct tracepoint_entry *entry, void *old)
entry->rcu_pending = 1; entry->rcu_pending = 1;
/* write rcu_pending before calling the RCU callback */ /* write rcu_pending before calling the RCU callback */
smp_wmb(); smp_wmb();
#ifdef CONFIG_PREEMPT_RCU call_rcu_sched(&entry->rcu, free_old_closure);
synchronize_sched(); /* Until we have the call_rcu_sched() */
#endif
call_rcu(&entry->rcu, free_old_closure);
} }
static void debug_print_probes(struct tracepoint_entry *entry) static void debug_print_probes(struct tracepoint_entry *entry)
...@@ -245,9 +242,9 @@ static int remove_tracepoint(const char *name) ...@@ -245,9 +242,9 @@ static int remove_tracepoint(const char *name)
if (e->refcount) if (e->refcount)
return -EBUSY; return -EBUSY;
hlist_del(&e->hlist); hlist_del(&e->hlist);
/* Make sure the call_rcu has been executed */ /* Make sure the call_rcu_sched has been executed */
if (e->rcu_pending) if (e->rcu_pending)
rcu_barrier(); rcu_barrier_sched();
kfree(e); kfree(e);
return 0; return 0;
} }
...@@ -344,11 +341,11 @@ int tracepoint_probe_register(const char *name, void *probe) ...@@ -344,11 +341,11 @@ int tracepoint_probe_register(const char *name, void *probe)
} }
} }
/* /*
* If we detect that a call_rcu is pending for this tracepoint, * If we detect that a call_rcu_sched is pending for this tracepoint,
* make sure it's executed now. * make sure it's executed now.
*/ */
if (entry->rcu_pending) if (entry->rcu_pending)
rcu_barrier(); rcu_barrier_sched();
old = tracepoint_entry_add_probe(entry, probe); old = tracepoint_entry_add_probe(entry, probe);
if (IS_ERR(old)) { if (IS_ERR(old)) {
ret = PTR_ERR(old); ret = PTR_ERR(old);
...@@ -387,7 +384,7 @@ int tracepoint_probe_unregister(const char *name, void *probe) ...@@ -387,7 +384,7 @@ int tracepoint_probe_unregister(const char *name, void *probe)
if (!entry) if (!entry)
goto end; goto end;
if (entry->rcu_pending) if (entry->rcu_pending)
rcu_barrier(); rcu_barrier_sched();
old = tracepoint_entry_remove_probe(entry, probe); old = tracepoint_entry_remove_probe(entry, probe);
mutex_unlock(&tracepoints_mutex); mutex_unlock(&tracepoints_mutex);
tracepoint_update_probes(); /* may update entry */ tracepoint_update_probes(); /* may update entry */
......
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