Skip to content

Commit d893931

Browse files
nathanlynchgregkh
authored andcommitted
powerpc/rtas: avoid device tree lookups in rtas_os_term()
[ Upstream commit ed2213b ] 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] Signed-off-by: Sasha Levin <[email protected]>
1 parent 23a249b commit d893931

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
@@ -788,6 +788,7 @@ void __noreturn rtas_halt(void)
788788

789789
/* Must be in the RMO region, so we place it here */
790790
static char rtas_os_term_buf[2048];
791+
static s32 ibm_os_term_token = RTAS_UNKNOWN_SERVICE;
791792

792793
void rtas_os_term(char *str)
793794
{
@@ -799,14 +800,13 @@ void rtas_os_term(char *str)
799800
* this property may terminate the partition which we want to avoid
800801
* since it interferes with panic_timeout.
801802
*/
802-
if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term") ||
803-
RTAS_UNKNOWN_SERVICE == rtas_token("ibm,extended-os-term"))
803+
if (ibm_os_term_token == RTAS_UNKNOWN_SERVICE)
804804
return;
805805

806806
snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
807807

808808
do {
809-
status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,
809+
status = rtas_call(ibm_os_term_token, 1, 1, NULL,
810810
__pa(rtas_os_term_buf));
811811
} while (rtas_busy_delay(status));
812812

@@ -1167,6 +1167,13 @@ void __init rtas_initialize(void)
11671167
no_entry = of_property_read_u32(rtas.dev, "linux,rtas-entry", &entry);
11681168
rtas.entry = no_entry ? rtas.base : entry;
11691169

1170+
/*
1171+
* Discover these now to avoid device tree lookups in the
1172+
* panic path.
1173+
*/
1174+
if (of_property_read_bool(rtas.dev, "ibm,extended-os-term"))
1175+
ibm_os_term_token = rtas_token("ibm,os-term");
1176+
11701177
/* If RTAS was found, allocate the RMO buffer for it and look for
11711178
* the stop-self token if any
11721179
*/

0 commit comments

Comments
 (0)