diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-03 12:05:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-03 12:05:19 -0700 |
| commit | f094ee78e01f5ee08d9489b4250fa1963fef81ab (patch) | |
| tree | a58efd67045985057765766bbdfcf46e4b3fa965 | |
| parent | 3d25a941ea5013b552b96330c83052ccace73a48 (diff) | |
| parent | 1c5a1627f48105cbab81d25ec2f72232bfaa8185 (diff) | |
| download | linux-f094ee78e01f5ee08d9489b4250fa1963fef81ab.tar.gz | |
Merge tag 'efi-urgent-for-v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fix from Ard Biesheuvel:
"This works around a shortcoming in the memory acceptation API, which
may apparently hog the CPU for long enough to trigger the softlockup
watchdog.
Note that this only affects confidential VMs running under the Intel
TDX hypervisor, which is why I accepted this for now, but this should
obviously be fixed properly in the future"
* tag 'efi-urgent-for-v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi/unaccepted: touch soft lockup during memory accept
| -rw-r--r-- | drivers/firmware/efi/unaccepted_memory.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/firmware/efi/unaccepted_memory.c b/drivers/firmware/efi/unaccepted_memory.c index 5b439d04079c8..50f6503fe49f5 100644 --- a/drivers/firmware/efi/unaccepted_memory.c +++ b/drivers/firmware/efi/unaccepted_memory.c @@ -4,6 +4,7 @@ #include <linux/memblock.h> #include <linux/spinlock.h> #include <linux/crash_dump.h> +#include <linux/nmi.h> #include <asm/unaccepted_memory.h> /* Protects unaccepted memory bitmap and accepting_list */ @@ -149,6 +150,9 @@ retry: } list_del(&range.list); + + touch_softlockup_watchdog(); + spin_unlock_irqrestore(&unaccepted_memory_lock, flags); } |