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
Unified · Split
| @@ -4,6 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | #include <linux/memblock.h> |
| 5 | 5 | #include <linux/spinlock.h> |
| 6 | 6 | #include <linux/crash_dump.h> |
| 7 | +#include <linux/nmi.h> | |
| 7 | 8 | #include <asm/unaccepted_memory.h> |
| 8 | 9 | |
| 9 | 10 | /* Protects unaccepted memory bitmap and accepting_list */ |
| @@ -149,6 +150,9 @@ retry: · 139 unmodified lines | ||
| 149 | 150 | } |
| 150 | 151 | |
| 151 | 152 | list_del(&range.list); |
| 153 | + | |
| 154 | + touch_softlockup_watchdog(); | |
| 155 | + | |
| 152 | 156 | spin_unlock_irqrestore(&unaccepted_memory_lock, flags); |
| 153 | 157 | } |
| 154 | 158 | |