f53835584a
- edk2-OvmfPkg-Clarify-invariants-for-NestedInterruptTplLib.patch [bz#2189136] - edk2-OvmfPkg-Relax-assertion-that-interrupts-do-not-occur.patch [bz#2189136] - Resolves: bz#2189136 (windows 11 installation broken with edk2-20230301gitf80f052277c8-1.el9)
73 lines
3.0 KiB
Diff
73 lines
3.0 KiB
Diff
From d259d959bab00b76e7187e79731201c9a3628d7c Mon Sep 17 00:00:00 2001
|
|
From: Michael Brown <mcb30@ipxe.org>
|
|
Date: Tue, 9 May 2023 12:09:30 +0000
|
|
Subject: [PATCH 1/2] OvmfPkg: Clarify invariants for NestedInterruptTplLib
|
|
|
|
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
RH-MergeRequest: 35: OvmfPkg: backport NestedInterruptTplLib updates
|
|
RH-Bugzilla: 2189136
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
RH-Commit: [1/2] 3f4c655bd43f38f43769c01eadbf96ce578818d0 (kraxel/centos-edk2)
|
|
|
|
NestedInterruptTplLib relies on CPU interrupts being disabled to
|
|
guarantee exclusive (and hence atomic) access to the shared state in
|
|
IsrState. Nothing in the calling interrupt handler should have
|
|
re-enabled interrupts before calling NestedInterruptRestoreTPL(), and
|
|
the loop in NestedInterruptRestoreTPL() itself maintains the invariant
|
|
that interrupts are disabled at the start of each iteration.
|
|
|
|
Add assertions to clarify this invariant, and expand the comments
|
|
around the calls to RestoreTPL() and DisableInterrupts() to clarify
|
|
the expectations around enabling and disabling interrupts.
|
|
|
|
Signed-off-by: Michael Brown <mcb30@ipxe.org>
|
|
Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
(cherry picked from commit ae0be176a83efebe9a8c13d2124151f7dd13443a)
|
|
---
|
|
OvmfPkg/Library/NestedInterruptTplLib/Tpl.c | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c b/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
|
|
index e19d98878e..e921a09c55 100644
|
|
--- a/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
|
|
+++ b/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
|
|
@@ -104,6 +104,7 @@ NestedInterruptRestoreTPL (
|
|
// defer our call to RestoreTPL() to the in-progress outer instance
|
|
// of the same interrupt handler.
|
|
//
|
|
+ ASSERT (GetInterruptState () == FALSE);
|
|
if (InterruptedTPL == IsrState->InProgressRestoreTPL) {
|
|
//
|
|
// Trigger outer instance of this interrupt handler to perform the
|
|
@@ -153,6 +154,7 @@ NestedInterruptRestoreTPL (
|
|
//
|
|
// Check shared state loop invariants.
|
|
//
|
|
+ ASSERT (GetInterruptState () == FALSE);
|
|
ASSERT (IsrState->InProgressRestoreTPL < InterruptedTPL);
|
|
ASSERT (IsrState->DeferredRestoreTPL == FALSE);
|
|
|
|
@@ -167,13 +169,17 @@ NestedInterruptRestoreTPL (
|
|
|
|
//
|
|
// Call RestoreTPL() to allow event notifications to be
|
|
- // dispatched. This will implicitly re-enable interrupts.
|
|
+ // dispatched. This will implicitly re-enable interrupts (if
|
|
+ // InterruptedTPL is below TPL_HIGH_LEVEL), even though we are
|
|
+ // still inside the interrupt handler.
|
|
//
|
|
gBS->RestoreTPL (InterruptedTPL);
|
|
|
|
//
|
|
// Re-disable interrupts after the call to RestoreTPL() to ensure
|
|
- // that we have exclusive access to the shared state.
|
|
+ // that we have exclusive access to the shared state. Interrupts
|
|
+ // will be re-enabled by the IRET or equivalent instruction when
|
|
+ // we subsequently return from the interrupt handler.
|
|
//
|
|
DisableInterrupts ();
|
|
|
|
--
|
|
2.39.1
|
|
|