Skip to contentSkip to conversation

x86/debug: Handle warnings before the notifier chain

PATCH In review Alexander Shishkin 3 participants 5 messages Jul 24, 2017 – Nov 10, 2017 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/debug: Handle warnings before the notifier chain

Commit

9a93848fe787 ("x86/debug: Implement __WARN() using UD0")

turned warnings into UD0, but the fixup code only runs after the notify_die() chain. This is a problem, in particular, with kgdb, which kicks in as if it was a BUG().

Fix this by running the fixup code before the notifier chain in the invalid op handler path.

Cc Arjan van de Ven <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
---
 arch/x86/kernel/traps.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/kernel/traps.c +7 -3
index bf54309b85..b2157d4a53 100644
@@ -221,9 +221,6 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
 		if (fixup_exception(regs, trapnr))
 			return 0;
 
-		if (fixup_bug(regs, trapnr))
-			return 0;
-
 		tsk->thread.error_code = error_code;
 		tsk->thread.trap_nr = trapnr;
 		die(str, regs, error_code);
@@ -304,6 +301,13 @@ static void do_error_trap(struct pt_regs *regs, long error_code, char *str,
 
 	RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
 
+	/*
+	 * WARN*()s end up here; fix them up before we call the
+	 * notifier chain.
+	 */
+	if (!user_mode(regs) && fixup_bug(regs, trapnr))
+		return;
+
 	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) !=
 			NOTIFY_STOP) {
 		cond_local_irq_enable(regs);
Signature · 1 line
2.13.2
#1 lore raw
Quoted 10 lines · Alexander Shishkin

Commit

9a93848fe787 ("x86/debug: Implement __WARN() using UD0")

turned warnings into UD0, but the fixup code only runs after the notify_die() chain. This is a problem, in particular, with kgdb, which kicks in as if it was a BUG().

Fix this by running the fixup code before the notifier chain in the invalid op handler path.

So arguable it might be nice to have kgdb trap on a WARN, but it treating it as a BUG is obviously undesirable.

Jason, what would you want kgdb to do here?

Quoted 43 lines
Cc Arjan van de Ven <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
---
 arch/x86/kernel/traps.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/kernel/traps.c +7 -3
index bf54309b85..b2157d4a53 100644
@@ -221,9 +221,6 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
 		if (fixup_exception(regs, trapnr))
 			return 0;
 
-		if (fixup_bug(regs, trapnr))
-			return 0;
-
 		tsk->thread.error_code = error_code;
 		tsk->thread.trap_nr = trapnr;
 		die(str, regs, error_code);
@@ -304,6 +301,13 @@ static void do_error_trap(struct pt_regs *regs, long error_code, char *str,
 
 	RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
 
+	/*
+	 * WARN*()s end up here; fix them up before we call the
+	 * notifier chain.
+	 */
+	if (!user_mode(regs) && fixup_bug(regs, trapnr))
+		return;
+
 	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) !=
 			NOTIFY_STOP) {
 		cond_local_irq_enable(regs);
Signature · 1 line
2.13.2
#2 lore raw
Quoted 9 lines · Peter Zijlstra
Quoted 8 lines · Alexander Shishkin

Commit

9a93848fe787 ("x86/debug: Implement __WARN() using UD0")

turned warnings into UD0, but the fixup code only runs after the notify_die() chain. This is a problem, in particular, with kgdb, which kicks in as if it was a BUG().

Quoted 7 lines
Quoted 2 lines

Fix this by running the fixup code before the notifier chain in the invalid op handler path.

So arguable it might be nice to have kgdb trap on a WARN, but it treating it as a BUG is obviously undesirable.

Jason, what would you want kgdb to do here?

Ping.

#3 lore raw

[tip:x86/urgent] x86/debug: Handle warnings before the notifier chain, to fix KGDB crash

In reply to Alexander Shishkin
x86/debug: Handle warnings before the notifier chain, to fix KGDB crash
Commit-ID:  a8d6c1bd62ffefb075c9d3570f07659e2a36ecb3
Gitweb:     https://git.kernel.org/tip/a8d6c1bd62ffefb075c9d3570f07659e2a36ecb3
Author:     Alexander Shishkin <[email protected]>
AuthorDate: Mon, 24 Jul 2017 13:04:28 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 10 Nov 2017 07:16:23 +0100

x86/debug: Handle warnings before the notifier chain, to fix KGDB crash

Commit:

9a93848fe787 ("x86/debug: Implement __WARN() using UD0")

turned warnings into UD0, but the fixup code only runs after the notify_die() chain. This is a problem, in particular, with kgdb, which kicks in as if it was a BUG().

Fix this by running the fixup code before the notifier chain in the invalid op handler path.

---
 arch/x86/kernel/traps.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/kernel/traps.c +7 -3
index 67db4f4..5a6b8f8 100644
@@ -209,9 +209,6 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
 		if (fixup_exception(regs, trapnr))
 			return 0;
 
-		if (fixup_bug(regs, trapnr))
-			return 0;
-
 		tsk->thread.error_code = error_code;
 		tsk->thread.trap_nr = trapnr;
 		die(str, regs, error_code);
@@ -292,6 +289,13 @@ static void do_error_trap(struct pt_regs *regs, long error_code, char *str,
 
 	RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
 
+	/*
+	 * WARN*()s end up here; fix them up before we call the
+	 * notifier chain.
+	 */
+	if (!user_mode(regs) && fixup_bug(regs, trapnr))
+		return;
+
 	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) !=
 			NOTIFY_STOP) {
 		cond_local_irq_enable(regs);
#4 lore raw

[tip:x86/urgent] x86/debug: Handle warnings before the notifier chain, to fix KGDB crash

In reply to Alexander Shishkin
x86/debug: Handle warnings before the notifier chain, to fix KGDB crash
Commit-ID:  b8347c2196492f4e1cccde3d92fda1cc2cc7de7e
Gitweb:     https://git.kernel.org/tip/b8347c2196492f4e1cccde3d92fda1cc2cc7de7e
Author:     Alexander Shishkin <[email protected]>
AuthorDate: Mon, 24 Jul 2017 13:04:28 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 10 Nov 2017 08:04:19 +0100

x86/debug: Handle warnings before the notifier chain, to fix KGDB crash

Commit:

9a93848fe787 ("x86/debug: Implement __WARN() using UD0")

turned warnings into UD0, but the fixup code only runs after the notify_die() chain. This is a problem, in particular, with kgdb, which kicks in as if it was a BUG().

Fix this by running the fixup code before the notifier chain in the invalid op handler path.

---
 arch/x86/kernel/traps.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/kernel/traps.c +7 -3
index 67db4f4..5a6b8f8 100644
@@ -209,9 +209,6 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
 		if (fixup_exception(regs, trapnr))
 			return 0;
 
-		if (fixup_bug(regs, trapnr))
-			return 0;
-
 		tsk->thread.error_code = error_code;
 		tsk->thread.trap_nr = trapnr;
 		die(str, regs, error_code);
@@ -292,6 +289,13 @@ static void do_error_trap(struct pt_regs *regs, long error_code, char *str,
 
 	RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
 
+	/*
+	 * WARN*()s end up here; fix them up before we call the
+	 * notifier chain.
+	 */
+	if (!user_mode(regs) && fixup_bug(regs, trapnr))
+		return;
+
 	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) !=
 			NOTIFY_STOP) {
 		cond_local_irq_enable(regs);