Skip to content

Commit 4e33393

Browse files
nathanlynchsmb49
authored andcommitted
powerpc/rtas: avoid device tree lookups in rtas_os_term()
BugLink: https://bugs.launchpad.net/bugs/2003914 [ 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 <nathanl@linux.ibm.com> Reviewed-by: Nicholas Piggin <npiggin@gmail.com> Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> [mpe: Incorporate suggested change from Nick] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20221118150751.469393-4-nathanl@linux.ibm.com Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent af649c4 commit 4e33393

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

715715
/* Must be in the RMO region, so we place it here */
716716
static char rtas_os_term_buf[2048];
717+
static s32 ibm_os_term_token = RTAS_UNKNOWN_SERVICE;
717718

718719
void rtas_os_term(char *str)
719720
{
@@ -725,14 +726,13 @@ void rtas_os_term(char *str)
725726
* this property may terminate the partition which we want to avoid
726727
* since it interferes with panic_timeout.
727728
*/
728-
if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term") ||
729-
RTAS_UNKNOWN_SERVICE == rtas_token("ibm,extended-os-term"))
729+
if (ibm_os_term_token == RTAS_UNKNOWN_SERVICE)
730730
return;
731731

732732
snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
733733

734734
do {
735-
status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,
735+
status = rtas_call(ibm_os_term_token, 1, 1, NULL,
736736
__pa(rtas_os_term_buf));
737737
} while (rtas_busy_delay(status));
738738

@@ -1215,6 +1215,13 @@ void __init rtas_initialize(void)
12151215
no_entry = of_property_read_u32(rtas.dev, "linux,rtas-entry", &entry);
12161216
rtas.entry = no_entry ? rtas.base : entry;
12171217

1218+
/*
1219+
* Discover these now to avoid device tree lookups in the
1220+
* panic path.
1221+
*/
1222+
if (of_property_read_bool(rtas.dev, "ibm,extended-os-term"))
1223+
ibm_os_term_token = rtas_token("ibm,os-term");
1224+
12181225
/* If RTAS was found, allocate the RMO buffer for it and look for
12191226
* the stop-self token if any
12201227
*/

0 commit comments

Comments
 (0)