Skip to content

Commit ed2213b

Browse files
nathanlynchmpe
authored andcommitted
powerpc/rtas: avoid device tree lookups in rtas_os_term()
rtas_os_term() is called during panic. Its behavior depends on a couple of conditions in the /rtas node of the device tree, the traversal of which entails locking and local IRQ state changes. If the kernel panics while devtree_lock is held, rtas_os_term() as currently written could hang. Instead of discovering the relevant characteristics at panic time, cache them in file-static variables at boot. Note the lookup for "ibm,extended-os-term" is converted to of_property_read_bool() since it is a boolean property, not an RTAS function token. Signed-off-by: Nathan Lynch <[email protected]> Reviewed-by: Nicholas Piggin <[email protected]> Reviewed-by: Andrew Donnellan <[email protected]> [mpe: Incorporate suggested change from Nick] Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent b10af50 commit ed2213b

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

arch/powerpc/kernel/rtas.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,7 @@ void __noreturn rtas_halt(void)
947947

948948
/* Must be in the RMO region, so we place it here */
949949
static char rtas_os_term_buf[2048];
950+
static s32 ibm_os_term_token = RTAS_UNKNOWN_SERVICE;
950951

951952
void rtas_os_term(char *str)
952953
{
@@ -958,14 +959,13 @@ void rtas_os_term(char *str)
958959
* this property may terminate the partition which we want to avoid
959960
* since it interferes with panic_timeout.
960961
*/
961-
if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term") ||
962-
RTAS_UNKNOWN_SERVICE == rtas_token("ibm,extended-os-term"))
962+
if (ibm_os_term_token == RTAS_UNKNOWN_SERVICE)
963963
return;
964964

965965
snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
966966

967967
do {
968-
status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,
968+
status = rtas_call(ibm_os_term_token, 1, 1, NULL,
969969
__pa(rtas_os_term_buf));
970970
} while (rtas_busy_delay(status));
971971

@@ -1335,6 +1335,13 @@ void __init rtas_initialize(void)
13351335
no_entry = of_property_read_u32(rtas.dev, "linux,rtas-entry", &entry);
13361336
rtas.entry = no_entry ? rtas.base : entry;
13371337

1338+
/*
1339+
* Discover these now to avoid device tree lookups in the
1340+
* panic path.
1341+
*/
1342+
if (of_property_read_bool(rtas.dev, "ibm,extended-os-term"))
1343+
ibm_os_term_token = rtas_token("ibm,os-term");
1344+
13381345
/* If RTAS was found, allocate the RMO buffer for it and look for
13391346
* the stop-self token if any
13401347
*/

0 commit comments

Comments
 (0)