Messages in this thread Patch in this message | | | Subject | Re: PATCH? trace_remove_event_call() should fail if call is active | From | Steven Rostedt <> | Date | Wed, 03 Jul 2013 16:36:27 -0400 |
| |
On Wed, 2013-07-03 at 16:34 -0400, Steven Rostedt wrote: > OK, what about the below patch, followed by an updated version of your > patch. I'll send that as a reply to this one.
This is a modification of your patch:
If you like it, please add a proper change log and SOB tag. Oh, and we need to still update trace_kprobes.c
-- Steve
From: Oleg Nesterov <oleg@redhat.com>
Index: linux-trace.git/kernel/trace/trace_events.c =================================================================== --- linux-trace.git.orig/kernel/trace/trace_events.c +++ linux-trace.git/kernel/trace/trace_events.c @@ -1761,16 +1761,45 @@ static void __trace_remove_event_call(st destroy_preds(call); } +static int probe_remove_event_call(struct ftrace_event_call *call) +{ + struct trace_array *tr; + struct ftrace_event_file *file; + + if (call->flags & TRACE_EVENT_FL_REF_MASK) + return -EBUSY; + +#ifdef CONFIG_PERF_EVENTS + if (call->perf_refcount) + return -EBUSY; +#endif + do_for_each_event_file(tr, file) { + if (file->event_call != call) + continue; + if (file->flags & FTRACE_EVENT_FL_ENABLED) + return -EBUSY; + break; + } while_for_each_event_file(); + + __trace_remove_event_call(call); + + return 0; +} + /* Remove an event_call */ -void trace_remove_event_call(struct ftrace_event_call *call) +int trace_remove_event_call(struct ftrace_event_call *call) { + int ret; + mutex_lock(&trace_types_lock); mutex_lock(&event_mutex); down_write(&trace_event_sem); - __trace_remove_event_call(call); + ret = probe_remove_event_call(call); up_write(&trace_event_sem); mutex_unlock(&event_mutex); mutex_unlock(&trace_types_lock); + + return ret; } #define for_each_event(event, start, end) \ Index: linux-trace.git/include/linux/ftrace_event.h =================================================================== --- linux-trace.git.orig/include/linux/ftrace_event.h +++ linux-trace.git/include/linux/ftrace_event.h @@ -338,7 +338,7 @@ extern int trace_define_field(struct ftr const char *name, int offset, int size, int is_signed, int filter_type); extern int trace_add_event_call(struct ftrace_event_call *call); -extern void trace_remove_event_call(struct ftrace_event_call *call); +extern int trace_remove_event_call(struct ftrace_event_call *call); #define is_signed_type(type) (((type)(-1)) < (type)1)
| |