Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d02a166 authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google) Committed by Greg Kroah-Hartman
Browse files

tracing: Add tracing_reset_all_online_cpus_unlocked() function 

commit e18eb8783ec4949adebc7d7b0fdb65f65bfeefd9 upstream.

Currently the tracing_reset_all_online_cpus() requires the
trace_types_lock held. But only one caller of this function actually has
that lock held before calling it, and the other just takes the lock so
that it can call it. More users of this function is needed where the lock
is not held.

Add a tracing_reset_all_online_cpus_unlocked() function for the one use
case that calls it without being held, and also add a lockdep_assert to
make sure it is held when called.

Then have tracing_reset_all_online_cpus() take the lock internally, such
that callers do not need to worry about taking it.

Link: https://lkml.kernel.org/r/20221123192741.658273220@goodmis.org



Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Zheng Yejian <zhengyejian1@huawei.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarZheng Yejian <zhengyejian1@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e14e9cc5

kernel/trace/trace.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -1931,10 +1931,12 @@ void tracing_reset_online_cpus(struct trace_buffer *buf) 
}

}





/* Must have trace_types_lock held */

/* Must have trace_types_lock held */

void tracing_reset_all_online_cpus(void)

void tracing_reset_all_online_cpus_unlocked(void)

{

{

	struct trace_array *tr;

	struct trace_array *tr;





	lockdep_assert_held(&trace_types_lock);



	list_for_each_entry(tr, &ftrace_trace_arrays, list) {

	list_for_each_entry(tr, &ftrace_trace_arrays, list) {

		if (!tr->clear_trace)

		if (!tr->clear_trace)

			continue;

			continue;
@@ -1946,6 +1948,13 @@ void tracing_reset_all_online_cpus(void) 
	}

	}

}

}





void tracing_reset_all_online_cpus(void)

{

	mutex_lock(&trace_types_lock);

	tracing_reset_all_online_cpus_unlocked();

	mutex_unlock(&trace_types_lock);

}



/*

/*

 * The tgid_map array maps from pid to tgid; i.e. the value stored at index i

 * The tgid_map array maps from pid to tgid; i.e. the value stored at index i

 * is the tgid last observed corresponding to pid=i.

 * is the tgid last observed corresponding to pid=i.

kernel/trace/trace.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -677,6 +677,7 @@ int tracing_is_enabled(void); 
void tracing_reset_online_cpus(struct trace_buffer *buf);

void tracing_reset_online_cpus(struct trace_buffer *buf);

void tracing_reset_current(int cpu);

void tracing_reset_current(int cpu);

void tracing_reset_all_online_cpus(void);

void tracing_reset_all_online_cpus(void);

void tracing_reset_all_online_cpus_unlocked(void);

int tracing_open_generic(struct inode *inode, struct file *filp);

int tracing_open_generic(struct inode *inode, struct file *filp);

int tracing_open_generic_tr(struct inode *inode, struct file *filp);

int tracing_open_generic_tr(struct inode *inode, struct file *filp);

bool tracing_is_disabled(void);

bool tracing_is_disabled(void);

kernel/trace/trace_events.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2440,7 +2440,7 @@ static void trace_module_remove_events(struct module *mod) 
	 * over from this module may be passed to the new module events and

	 * over from this module may be passed to the new module events and

	 * unexpected results may occur.

	 * unexpected results may occur.

	 */

	 */

	tracing_reset_all_online_cpus();

	tracing_reset_all_online_cpus_unlocked();

}

}





static int trace_module_notify(struct notifier_block *self,

static int trace_module_notify(struct notifier_block *self,