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

Merge tag 'x86_urgent_for_v5.13_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:
 "The three SEV commits are not really urgent material. But we figured
  since getting them in now will avoid a huge amount of conflicts
  between future SEV changes touching tip, the kvm and probably other
  trees, sending them to you now would be best.

  The idea is that the tip, kvm etc branches for 5.14 will all base
  ontop of -rc2 and thus everything will be peachy. What is more, those
  changes are purely mechanical and defines movement so they should be
  fine to go now (famous last words).

  Summary:

   - Enable -Wundef for the compressed kernel build stage

   - Reorganize SEV code to streamline and simplify future development"

* tag 'x86_urgent_for_v5.13_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot/compressed: Enable -Wundef
  x86/msr: Rename MSR_K8_SYSCFG to MSR_AMD64_SYSCFG
  x86/sev: Move GHCB MSR protocol and NAE definitions in a common header
  x86/sev-es: Rename sev-es.{ch} to sev.{ch}
parents 63d1cb53 a554e740

Documentation/virt/kvm/amd-memory-encryption.rst

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ to SEV:: 
		  [ecx]:

			Bits[31:0]  Number of encrypted guests supported simultaneously



If support for SEV is present, MSR 0xc001_0010 (MSR_K8_SYSCFG) and MSR 0xc001_0015

If support for SEV is present, MSR 0xc001_0010 (MSR_AMD64_SYSCFG) and MSR 0xc001_0015

(MSR_K7_HWCR) can be used to determine if it can be enabled::



	0xc001_0010:

Documentation/x86/amd-memory-encryption.rst

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ CPUID function 0x8000001f reports information related to SME:: 
			   system physical addresses, not guest physical

			   addresses)



If support for SME is present, MSR 0xc00100010 (MSR_K8_SYSCFG) can be used to

If support for SME is present, MSR 0xc00100010 (MSR_AMD64_SYSCFG) can be used to

determine if SME is enabled and/or to enable memory encryption::



	0xc0010010:
@@ -79,7 +79,7 @@ The state of SME in the Linux kernel can be documented as follows: 
	  The CPU supports SME (determined through CPUID instruction).



	- Enabled:

	  Supported and bit 23 of MSR_K8_SYSCFG is set.

	  Supported and bit 23 of MSR_AMD64_SYSCFG is set.



	- Active:

	  Supported, Enabled and the Linux kernel is actively applying
@@ -89,7 +89,7 @@ The state of SME in the Linux kernel can be documented as follows: 
SME can also be enabled and activated in the BIOS. If SME is enabled and

activated in the BIOS, then all memory accesses will be encrypted and it will

not be necessary to activate the Linux memory encryption support.  If the BIOS

merely enables SME (sets bit 23 of the MSR_K8_SYSCFG), then Linux can activate

merely enables SME (sets bit 23 of the MSR_AMD64_SYSCFG), then Linux can activate

memory encryption by default (CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y) or

by supplying mem_encrypt=on on the kernel command line.  However, if BIOS does

not enable SME, then Linux will not be able to activate memory encryption, even

arch/x86/boot/compressed/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \ 


KBUILD_CFLAGS := -m$(BITS) -O2

KBUILD_CFLAGS += -fno-strict-aliasing -fPIE

KBUILD_CFLAGS += -Wundef

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

cflags-$(CONFIG_X86_32) := -march=i386

cflags-$(CONFIG_X86_64) := -mcmodel=small -mno-red-zone
@@ -48,10 +49,10 @@ KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no) 
KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h

KBUILD_CFLAGS += $(CLANG_FLAGS)



# sev-es.c indirectly inludes inat-table.h which is generated during

# sev.c indirectly inludes inat-table.h which is generated during

# compilation and stored in $(objtree). Add the directory to the includes so

# that the compiler finds it even with out-of-tree builds (make O=/some/path).

CFLAGS_sev-es.o += -I$(objtree)/arch/x86/lib/

CFLAGS_sev.o += -I$(objtree)/arch/x86/lib/



KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

GCOV_PROFILE := n
@@ -93,7 +94,7 @@ ifdef CONFIG_X86_64 
	vmlinux-objs-y += $(obj)/idt_64.o $(obj)/idt_handlers_64.o

	vmlinux-objs-y += $(obj)/mem_encrypt.o

	vmlinux-objs-y += $(obj)/pgtable_64.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev-es.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev.o

endif



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

arch/x86/boot/compressed/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ void __puthex(unsigned long value) 
	}

}



#if CONFIG_X86_NEED_RELOCS

#ifdef CONFIG_X86_NEED_RELOCS

static void handle_relocations(void *output, unsigned long output_len,

			       unsigned long virt_addr)

{

arch/x86/boot/compressed/misc.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct mem_vector { 
	u64 size;

};



#if CONFIG_RANDOMIZE_BASE

#ifdef CONFIG_RANDOMIZE_BASE

/* kaslr.c */

void choose_random_location(unsigned long input,

			    unsigned long input_size,