|
Michal Suchanek |
49b518 |
From 6c606e57eecc37d6b36d732b1ff7e55b7dc32dd4 Mon Sep 17 00:00:00 2001
|
|
Michal Suchanek |
49b518 |
From: Nathan Lynch <nathanl@linux.ibm.com>
|
|
Michal Suchanek |
49b518 |
Date: Fri, 18 Nov 2022 09:07:42 -0600
|
|
Michal Suchanek |
49b518 |
Subject: [PATCH] powerpc/rtas: avoid scheduling in rtas_os_term()
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
References: bsc#1065729
|
|
Michal Suchanek |
49b518 |
Patch-mainline: v6.2-rc1
|
|
Michal Suchanek |
49b518 |
Git-commit: 6c606e57eecc37d6b36d732b1ff7e55b7dc32dd4
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
It's unsafe to use rtas_busy_delay() to handle a busy status from
|
|
Michal Suchanek |
49b518 |
the ibm,os-term RTAS function in rtas_os_term():
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
|
|
Michal Suchanek |
49b518 |
BUG: sleeping function called from invalid context at arch/powerpc/kernel/rtas.c:618
|
|
Michal Suchanek |
49b518 |
in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 1, name: swapper/0
|
|
Michal Suchanek |
49b518 |
preempt_count: 2, expected: 0
|
|
Michal Suchanek |
49b518 |
CPU: 7 PID: 1 Comm: swapper/0 Tainted: G D 6.0.0-rc5-02182-gf8553a572277-dirty #9
|
|
Michal Suchanek |
49b518 |
Call Trace:
|
|
Michal Suchanek |
49b518 |
[c000000007b8f000] [c000000001337110] dump_stack_lvl+0xb4/0x110 (unreliable)
|
|
Michal Suchanek |
49b518 |
[c000000007b8f040] [c0000000002440e4] __might_resched+0x394/0x3c0
|
|
Michal Suchanek |
49b518 |
[c000000007b8f0e0] [c00000000004f680] rtas_busy_delay+0x120/0x1b0
|
|
Michal Suchanek |
49b518 |
[c000000007b8f100] [c000000000052d04] rtas_os_term+0xb8/0xf4
|
|
Michal Suchanek |
49b518 |
[c000000007b8f180] [c0000000001150fc] pseries_panic+0x50/0x68
|
|
Michal Suchanek |
49b518 |
[c000000007b8f1f0] [c000000000036354] ppc_panic_platform_handler+0x34/0x50
|
|
Michal Suchanek |
49b518 |
[c000000007b8f210] [c0000000002303c4] notifier_call_chain+0xd4/0x1c0
|
|
Michal Suchanek |
49b518 |
[c000000007b8f2b0] [c0000000002306cc] atomic_notifier_call_chain+0xac/0x1c0
|
|
Michal Suchanek |
49b518 |
[c000000007b8f2f0] [c0000000001d62b8] panic+0x228/0x4d0
|
|
Michal Suchanek |
49b518 |
[c000000007b8f390] [c0000000001e573c] do_exit+0x140c/0x1420
|
|
Michal Suchanek |
49b518 |
[c000000007b8f480] [c0000000001e586c] make_task_dead+0xdc/0x200
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
Use rtas_busy_delay_time() instead, which signals without side effects
|
|
Michal Suchanek |
49b518 |
whether to attempt the ibm,os-term RTAS call again.
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
|
|
Michal Suchanek |
49b518 |
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
|
|
Michal Suchanek |
49b518 |
Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
|
|
Michal Suchanek |
49b518 |
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
|
|
Michal Suchanek |
49b518 |
Link: https://lore.kernel.org/r/20221118150751.469393-5-nathanl@linux.ibm.com
|
|
Michal Suchanek |
49b518 |
Acked-by: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
49b518 |
---
|
|
Michal Suchanek |
49b518 |
arch/powerpc/kernel/rtas.c | 7 ++++++-
|
|
Michal Suchanek |
49b518 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
|
|
Michal Suchanek |
49b518 |
index db43cbdcc74c..f21b39fcaf99 100644
|
|
Michal Suchanek |
49b518 |
--- a/arch/powerpc/kernel/rtas.c
|
|
Michal Suchanek |
49b518 |
+++ b/arch/powerpc/kernel/rtas.c
|
|
Michal Suchanek |
49b518 |
@@ -964,10 +964,15 @@ void rtas_os_term(char *str)
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
+ /*
|
|
Michal Suchanek |
49b518 |
+ * Keep calling as long as RTAS returns a "try again" status,
|
|
Michal Suchanek |
49b518 |
+ * but don't use rtas_busy_delay(), which potentially
|
|
Michal Suchanek |
49b518 |
+ * schedules.
|
|
Michal Suchanek |
49b518 |
+ */
|
|
Michal Suchanek |
49b518 |
do {
|
|
Michal Suchanek |
49b518 |
status = rtas_call(ibm_os_term_token, 1, 1, NULL,
|
|
Michal Suchanek |
49b518 |
__pa(rtas_os_term_buf));
|
|
Michal Suchanek |
49b518 |
- } while (rtas_busy_delay(status));
|
|
Michal Suchanek |
49b518 |
+ } while (rtas_busy_delay_time(status));
|
|
Michal Suchanek |
49b518 |
|
|
Michal Suchanek |
49b518 |
if (status != 0)
|
|
Michal Suchanek |
49b518 |
printk(KERN_EMERG "ibm,os-term call failed %d\n", status);
|
|
Michal Suchanek |
49b518 |
--
|
|
Michal Suchanek |
49b518 |
2.35.3
|
|
Michal Suchanek |
49b518 |
|