[PATCH v4 2/3] LoongArch: Return earlier in die() if notify_die() returns NOTIFY_STOP
From: Tiezhu Yang
Date: Tue Aug 22 2023 - 04:54:10 EST
After the call to oops_exit(), it should not panic or execute
the crash kernel if the oops is to be suppressed.
Suggested-by: Maciej W. Rozycki <macro@xxxxxxxxxxx>
Signed-off-by: Tiezhu Yang <yangtiezhu@xxxxxxxxxxx>
---
arch/loongarch/kernel/traps.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c
index bbdfc5b..7d0ddd2 100644
--- a/arch/loongarch/kernel/traps.c
+++ b/arch/loongarch/kernel/traps.c
@@ -404,6 +404,9 @@ void die(const char *str, struct pt_regs *regs)
oops_exit();
+ if (ret == NOTIFY_STOP)
+ return;
+
if (regs && kexec_should_crash(current))
crash_kexec(regs);
@@ -413,8 +416,7 @@ void die(const char *str, struct pt_regs *regs)
if (panic_on_oops)
panic("Fatal exception");
- if (ret != NOTIFY_STOP)
- make_task_dead(SIGSEGV);
+ make_task_dead(SIGSEGV);
}
static inline void setup_vint_size(unsigned int size)
--
2.1.0