Commit 2c96136a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cc_for_v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 confidential computing update from Borislav Petkov:

 - Add support for unaccepted memory as specified in the UEFI spec v2.9.

   The gist of it all is that Intel TDX and AMD SEV-SNP confidential
   computing guests define the notion of accepting memory before using
   it and thus preventing a whole set of attacks against such guests
   like memory replay and the like.

   There are a couple of strategies of how memory should be accepted -
   the current implementation does an on-demand way of accepting.

* tag 'x86_cc_for_v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  virt: sevguest: Add CONFIG_CRYPTO dependency
  x86/efi: Safely enable unaccepted memory in UEFI
  x86/sev: Add SNP-specific unaccepted memory support
  x86/sev: Use large PSC requests if applicable
  x86/sev: Allow for use of the early boot GHCB for PSC requests
  x86/sev: Put PSC struct on the stack in prep for unaccepted memory support
  x86/sev: Fix calculation of end address based on number of pages
  x86/tdx: Add unaccepted memory support
  x86/tdx: Refactor try_accept_one()
  x86/tdx: Make _tdx_hypercall() and __tdx_module_call() available in boot stub
  efi/unaccepted: Avoid load_unaligned_zeropad() stepping into unaccepted memory
  efi: Add unaccepted memory support
  x86/boot/compressed: Handle unaccepted memory
  efi/libstub: Implement support for unaccepted memory
  efi/x86: Get full memory map in allocate_e820()
  mm: Add support for unaccepted memory
parents 3e5822e0 84b9b44b

arch/x86/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -887,9 +887,11 @@ config INTEL_TDX_GUEST 
	bool "Intel TDX (Trust Domain Extensions) - Guest Support"

	depends on X86_64 && CPU_SUP_INTEL

	depends on X86_X2APIC

	depends on EFI_STUB

	select ARCH_HAS_CC_PLATFORM

	select X86_MEM_ENCRYPT

	select X86_MCE

	select UNACCEPTED_MEMORY

	help

	  Support running as a guest under Intel TDX.  Without this support,

	  the guest kernel can not boot or run under TDX.
@@ -1544,11 +1546,13 @@ config X86_MEM_ENCRYPT 
config AMD_MEM_ENCRYPT

	bool "AMD Secure Memory Encryption (SME) support"

	depends on X86_64 && CPU_SUP_AMD

	depends on EFI_STUB

	select DMA_COHERENT_POOL

	select ARCH_USE_MEMREMAP_PROT

	select INSTRUCTION_DECODER

	select ARCH_HAS_CC_PLATFORM

	select X86_MEM_ENCRYPT

	select UNACCEPTED_MEMORY

	help

	  Say yes to enable support for the encryption of system memory.

	  This requires an AMD processor that supports Secure Memory

arch/x86/boot/compressed/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ ifdef CONFIG_X86_64 
endif



vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o

vmlinux-objs-$(CONFIG_INTEL_TDX_GUEST) += $(obj)/tdx.o $(obj)/tdcall.o

vmlinux-objs-$(CONFIG_INTEL_TDX_GUEST) += $(obj)/tdx.o $(obj)/tdcall.o $(obj)/tdx-shared.o

vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) += $(obj)/mem.o



vmlinux-objs-$(CONFIG_EFI) += $(obj)/efi.o

vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_mixed.o

arch/x86/boot/compressed/efi.h

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ typedef guid_t efi_guid_t __aligned(__alignof__(u32)); 
#define ACPI_TABLE_GUID				EFI_GUID(0xeb9d2d30, 0x2d88, 0x11d3,  0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)

#define ACPI_20_TABLE_GUID			EFI_GUID(0x8868e871, 0xe4f1, 0x11d3,  0xbc, 0x22, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81)

#define EFI_CC_BLOB_GUID			EFI_GUID(0x067b1f5f, 0xcf26, 0x44c5, 0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42)

#define LINUX_EFI_UNACCEPTED_MEM_TABLE_GUID	EFI_GUID(0xd5d1de3c, 0x105c, 0x44f9,  0x9e, 0xa9, 0xbc, 0xef, 0x98, 0x12, 0x00, 0x31)



#define EFI32_LOADER_SIGNATURE	"EL32"

#define EFI64_LOADER_SIGNATURE	"EL64"
@@ -32,6 +33,7 @@ typedef struct { 
} efi_table_hdr_t;



#define EFI_CONVENTIONAL_MEMORY		 7

#define EFI_UNACCEPTED_MEMORY		15



#define EFI_MEMORY_MORE_RELIABLE \

				((u64)0x0000000000010000ULL)	/* higher reliability */
@@ -104,6 +106,14 @@ struct efi_setup_data { 
	u64 reserved[8];

};



struct efi_unaccepted_memory {

	u32 version;

	u32 unit_size;

	u64 phys_base;

	u64 size;

	unsigned long bitmap[];

};



static inline int efi_guidcmp (efi_guid_t left, efi_guid_t right)

{

	return memcmp(&left, &right, sizeof (efi_guid_t));

arch/x86/boot/compressed/error.c

+19 −0
Original line number Diff line number Diff line
@@ -22,3 +22,22 @@ void error(char *m) 
	while (1)

		asm("hlt");

}



/* EFI libstub  provides vsnprintf() */

#ifdef CONFIG_EFI_STUB

void panic(const char *fmt, ...)

{

	static char buf[1024];

	va_list args;

	int len;



	va_start(args, fmt);

	len = vsnprintf(buf, sizeof(buf), fmt, args);

	va_end(args);



	if (len && buf[len - 1] == '\n')

		buf[len - 1] = '\0';



	error(buf);

}

#endif

arch/x86/boot/compressed/error.h

+1 −0
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ 


void warn(char *m);

void error(char *m) __noreturn;

void panic(const char *fmt, ...) __noreturn __cold;



#endif /* BOOT_COMPRESSED_ERROR_H */