From: Ben Horgan <ben.horgan@arm.com>
To: ben.horgan@arm.com, linux-efi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: ardb@kernel.org, catalin.marinas@arm.com, will@kernel.org,
YeoReum.Yun@arm.com, Mark.Rutland@arm.com
Subject: [PATCH v1] arm64/efi: Don't fail check current_in_efi() if preemptible
Date: Mon, 5 Jan 2026 13:58:47 +0000 [thread overview]
Message-ID: <20260105135847.1585034-1-ben.horgan@arm.com> (raw)
As EFI runtime services can now be run without disabling preemption remove
the check for non preemptible in current_in_efi(). Without this change,
firmware errors that were previously recovered from by
__efi_runtime_kernel_fixup_exception() will lead to a kernel oops.
Fixes: a5baf582f4c0 ("arm64/efi: Call EFI runtime services without disabling preemption")
Signed-off-by: Ben Horgan <ben.horgan@arm.com>
---
On the partner platform I was testing on this issue caused the boot to fail.
---
arch/arm64/include/asm/efi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h
index aa91165ca140..e8a9783235cb 100644
--- a/arch/arm64/include/asm/efi.h
+++ b/arch/arm64/include/asm/efi.h
@@ -45,7 +45,7 @@ void arch_efi_call_virt_teardown(void);
* switching to the EFI runtime stack.
*/
#define current_in_efi() \
- (!preemptible() && efi_rt_stack_top != NULL && \
+ (efi_rt_stack_top != NULL && \
on_task_stack(current, READ_ONCE(efi_rt_stack_top[-1]), 1))
#define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)
--
2.43.0
next reply other threads:[~2026-01-05 13:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-05 13:58 Ben Horgan [this message]
2026-01-05 14:48 ` [PATCH v1] arm64/efi: Don't fail check current_in_efi() if preemptible Yeoreum Yun
2026-01-06 7:58 ` Richard Lyu
2026-01-06 10:23 ` Ard Biesheuvel
2026-01-06 14:17 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260105135847.1585034-1-ben.horgan@arm.com \
--to=ben.horgan@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=YeoReum.Yun@arm.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox