History

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

Linus Torvalds committed 2 years ago

Commit f094ee72 parents 3d25a94 1c5a1621 file · +4 −0Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t