Skip to contentSkip to conversation

ftrace: fix deadlock when setting set_ftrace_pid

PATCH Applied KOSAKI Motohiro 3 participants 4 messages Mar 6, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ftrace: fix deadlock when setting set_ftrace_pid

Impact: fix deadlock bug

reproduce way:

	# cd /sys/kernel/debug/tracing
	# echo $$ > set_ftrace_pid

then, console become hangup.

detail:
when writing set_ftracepid, kernel callstack is following

	ftrace_pid_write()
		mutex_lock(&ftrace_lock);
		ftrace_update_pid_func()
			mutex_lock(&ftrace_lock);
			mutex_unlock(&ftrace_lock);
		mutex_unlock(&ftrace_lock);

then, system alaways deadlock when ftrace_pid_write() is called.

In past days, ftrace_pid_write() use ftrace_start_lock, but commit e6ea44e9b4c12325337cd1c06103cd515a1c02b2 consolidate ftrace_start_lock to ftrace_lock.

---

kernel/trace/ftrace.c +1 -6
index 5a3a06b..0d3b393 100644
@@ -218,10 +218,8 @@ static void ftrace_update_pid_func(void)
 {
 	ftrace_func_t func;
 
-	mutex_lock(&ftrace_lock);
-
 	if (ftrace_trace_function == ftrace_stub)
-		goto out;
+		return;
 
 	func = ftrace_trace_function;
 
@@ -238,9 +236,6 @@ static void ftrace_update_pid_func(void)
 #else
 	__ftrace_trace_function = func;
 #endif
-
- out:
-	mutex_unlock(&ftrace_lock);
 }
 
 /* set when tracing only a pid */
Reviewed-by on v1 1/1
#1 lore raw
Quoted 46 lines · KOSAKI Motohiro

Impact: fix deadlock bug

reproduce way:

	# cd /sys/kernel/debug/tracing
	# echo $$ > set_ftrace_pid

then, console become hangup.

detail:
when writing set_ftracepid, kernel callstack is following

	ftrace_pid_write()
		mutex_lock(&ftrace_lock);
		ftrace_update_pid_func()
			mutex_lock(&ftrace_lock);
			mutex_unlock(&ftrace_lock);
		mutex_unlock(&ftrace_lock);

then, system alaways deadlock when ftrace_pid_write() is called.

In past days, ftrace_pid_write() use ftrace_start_lock, but commit e6ea44e9b4c12325337cd1c06103cd515a1c02b2 consolidate ftrace_start_lock to ftrace_lock.

---

kernel/trace/ftrace.c +1 -3
index 5a3a06b..0d3b393 100644
@@ -218,10 +218,8 @@ static void ftrace_update_pid_func(void)
 {
 	ftrace_func_t func;
 
-	mutex_lock(&ftrace_lock);
-
 	if (ftrace_trace_function == ftrace_stub)
-		goto out;
+		return;
 
 	func = ftrace_trace_function;
 

kernel/trace/ftrace.c static void ftrace_update_pid_func(void) · line 241

Quoted 9 lines
kernel/trace/ftrace.c +0 -3
@@ -238,9 +236,6 @@ static void ftrace_update_pid_func(void)
 #else
 	__ftrace_trace_function = func;
 #endif
-
- out:
-	mutex_unlock(&ftrace_lock);
 }
 
 /* set when tracing only a pid */
Applied
#2 lore raw
Quoted 53 lines · Lai Jiangshan
Quoted 52 lines · KOSAKI Motohiro

Impact: fix deadlock bug

reproduce way:

	# cd /sys/kernel/debug/tracing
	# echo $$ > set_ftrace_pid

then, console become hangup.

detail:
when writing set_ftracepid, kernel callstack is following

	ftrace_pid_write()
		mutex_lock(&ftrace_lock);
		ftrace_update_pid_func()
			mutex_lock(&ftrace_lock);
			mutex_unlock(&ftrace_lock);
		mutex_unlock(&ftrace_lock);

then, system alaways deadlock when ftrace_pid_write() is called.

In past days, ftrace_pid_write() use ftrace_start_lock, but commit e6ea44e9b4c12325337cd1c06103cd515a1c02b2 consolidate ftrace_start_lock to ftrace_lock.

---

kernel/trace/ftrace.c +1 -6
index 5a3a06b..0d3b393 100644
@@ -218,10 +218,8 @@ static void ftrace_update_pid_func(void)
 {
 	ftrace_func_t func;
 
-	mutex_lock(&ftrace_lock);
-
 	if (ftrace_trace_function == ftrace_stub)
-		goto out;
+		return;
 
 	func = ftrace_trace_function;
 
@@ -238,9 +236,6 @@ static void ftrace_update_pid_func(void)
 #else
 	__ftrace_trace_function = func;
 #endif
-
- out:
-	mutex_unlock(&ftrace_lock);
 }
 
Quoted 5 lines

kernel/trace/ftrace.c static void ftrace_update_pid_func(void) · line 241

Quoted 3 lines
kernel/trace/ftrace.c +0 -0
 /* set when tracing only a pid */

Applied, thanks!

Ingo

#3 lore raw

[tip:tracing/ftrace] tracing: fix deadlock when setting set_ftrace_pid

In reply to KOSAKI Motohiro
Commit-ID:  10dd3ebe213c31bff14b4dae3c5d32a76b1fad7c
Gitweb:     http://git.kernel.org/tip/10dd3ebe213c31bff14b4dae3c5d32a76b1fad7c
Author:     "KOSAKI Motohiro" <[email protected]>
AuthorDate: Fri, 6 Mar 2009 15:29:04 +0900
Commit:     Ingo Molnar <[email protected]>
CommitDate: Fri, 6 Mar 2009 12:07:38 +0100

tracing: fix deadlock when setting set_ftrace_pid

Impact: fix deadlock while using set_ftrace_pid

Reproducer:

	# cd /sys/kernel/debug/tracing
	# echo $$ > set_ftrace_pid

then, console becomes hung.

Details:

when writing set_ftracepid, kernel callstack is following

	ftrace_pid_write()
		mutex_lock(&ftrace_lock);
		ftrace_update_pid_func()
			mutex_lock(&ftrace_lock);
			mutex_unlock(&ftrace_lock);
		mutex_unlock(&ftrace_lock);

then, system always deadlocks when ftrace_pid_write() is called.

In past days, ftrace_pid_write() used ftrace_start_lock, but commit e6ea44e9b4c12325337cd1c06103cd515a1c02b2 consolidated ftrace_start_lock to ftrace_lock.

LKML-Reference: <[email protected]>

---
 kernel/trace/ftrace.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
kernel/trace/ftrace.c +1 -6
index d7a06a0..d33d306 100644
@@ -218,10 +218,8 @@ static void ftrace_update_pid_func(void)
 {
 	ftrace_func_t func;
 
-	mutex_lock(&ftrace_lock);
-
 	if (ftrace_trace_function == ftrace_stub)
-		goto out;
+		return;
 
 	func = ftrace_trace_function;
 
@@ -238,9 +236,6 @@ static void ftrace_update_pid_func(void)
 #else
 	__ftrace_trace_function = func;
 #endif
-
- out:
-	mutex_unlock(&ftrace_lock);
 }
 
 /* set when tracing only a pid */