|
@@ -1008,6 +1008,7 @@ static int subsystem_open(struct inode *inode, struct file *filp)
|
|
|
int ret;
|
|
|
|
|
|
/* Make sure the system still exists */
|
|
|
+ mutex_lock(&trace_types_lock);
|
|
|
mutex_lock(&event_mutex);
|
|
|
list_for_each_entry(tr, &ftrace_trace_arrays, list) {
|
|
|
list_for_each_entry(dir, &tr->systems, list) {
|
|
@@ -1023,6 +1024,7 @@ static int subsystem_open(struct inode *inode, struct file *filp)
|
|
|
}
|
|
|
exit_loop:
|
|
|
mutex_unlock(&event_mutex);
|
|
|
+ mutex_unlock(&trace_types_lock);
|
|
|
|
|
|
if (!system)
|
|
|
return -ENODEV;
|
|
@@ -1617,6 +1619,7 @@ static void __add_event_to_tracers(struct ftrace_event_call *call,
|
|
|
int trace_add_event_call(struct ftrace_event_call *call)
|
|
|
{
|
|
|
int ret;
|
|
|
+ mutex_lock(&trace_types_lock);
|
|
|
mutex_lock(&event_mutex);
|
|
|
|
|
|
ret = __register_event(call, NULL);
|
|
@@ -1624,11 +1627,13 @@ int trace_add_event_call(struct ftrace_event_call *call)
|
|
|
__add_event_to_tracers(call, NULL);
|
|
|
|
|
|
mutex_unlock(&event_mutex);
|
|
|
+ mutex_unlock(&trace_types_lock);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
- * Must be called under locking both of event_mutex and trace_event_sem.
|
|
|
+ * Must be called under locking of trace_types_lock, event_mutex and
|
|
|
+ * trace_event_sem.
|
|
|
*/
|
|
|
static void __trace_remove_event_call(struct ftrace_event_call *call)
|
|
|
{
|
|
@@ -1640,11 +1645,13 @@ static void __trace_remove_event_call(struct ftrace_event_call *call)
|
|
|
/* Remove an event_call */
|
|
|
void trace_remove_event_call(struct ftrace_event_call *call)
|
|
|
{
|
|
|
+ mutex_lock(&trace_types_lock);
|
|
|
mutex_lock(&event_mutex);
|
|
|
down_write(&trace_event_sem);
|
|
|
__trace_remove_event_call(call);
|
|
|
up_write(&trace_event_sem);
|
|
|
mutex_unlock(&event_mutex);
|
|
|
+ mutex_unlock(&trace_types_lock);
|
|
|
}
|
|
|
|
|
|
#define for_each_event(event, start, end) \
|
|
@@ -1788,6 +1795,7 @@ static int trace_module_notify(struct notifier_block *self,
|
|
|
{
|
|
|
struct module *mod = data;
|
|
|
|
|
|
+ mutex_lock(&trace_types_lock);
|
|
|
mutex_lock(&event_mutex);
|
|
|
switch (val) {
|
|
|
case MODULE_STATE_COMING:
|
|
@@ -1798,6 +1806,7 @@ static int trace_module_notify(struct notifier_block *self,
|
|
|
break;
|
|
|
}
|
|
|
mutex_unlock(&event_mutex);
|
|
|
+ mutex_unlock(&trace_types_lock);
|
|
|
|
|
|
return 0;
|
|
|
}
|