Commit f094ee78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3d25a941 1c5a1627

drivers/firmware/efi/unaccepted_memory.c

+4 −0
Original line number Diff line number Diff line
@@ -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 @@ void accept_memory(phys_addr_t start, phys_addr_t end) 
	}



	list_del(&range.list);



	touch_softlockup_watchdog();



	spin_unlock_irqrestore(&unaccepted_memory_lock, flags);

}