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

Merge tag 'x86-build-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 build updates from Ingo Molnar:
 "Misc dependency fixes, plus a documentation update about memory
  protection keys support"

* tag 'x86-build-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/Kconfig: Update config and kernel doc for MPK feature on AMD
  x86/boot: Discard .discard.unreachable for arch/x86/boot/compressed/vmlinux
  x86/boot/build: Add phony targets in arch/x86/boot/Makefile to PHONY
  x86/boot/build: Make 'make bzlilo' not depend on vmlinux or $(obj)/bzImage
  x86/boot/build: Add cpustr.h to targets and remove clean-files
parents ae1a4113 38f3e775

Documentation/core-api/protection-keys.rst

+3 −2
Original line number Diff line number Diff line
@@ -5,8 +5,9 @@ Memory Protection Keys 
======================



Memory Protection Keys for Userspace (PKU aka PKEYs) is a feature

which is found on Intel's Skylake "Scalable Processor" Server CPUs.

It will be avalable in future non-server parts.

which is found on Intel's Skylake (and later) "Scalable Processor"

Server CPUs. It will be available in future non-server Intel parts

and future AMD processors.



For anyone wishing to test or use this feature, it is available in

Amazon's EC2 C5 instances and is known to work there using an Ubuntu

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1888,10 +1888,10 @@ config X86_UMIP 
	  results are dummy.



config X86_INTEL_MEMORY_PROTECTION_KEYS

	prompt "Intel Memory Protection Keys"

	prompt "Memory Protection Keys"

	def_bool y

	# Note: only available in 64-bit mode

	depends on CPU_SUP_INTEL && X86_64

	depends on X86_64 && (CPU_SUP_INTEL || CPU_SUP_AMD)

	select ARCH_USES_HIGH_VMA_FLAGS

	select ARCH_HAS_PKEYS

	---help---

arch/x86/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ drivers-$(CONFIG_FB) += arch/x86/video/ 


boot := arch/x86/boot



BOOT_TARGETS = bzlilo bzdisk fdimage fdimage144 fdimage288 isoimage

BOOT_TARGETS = bzdisk fdimage fdimage144 fdimage288 isoimage



PHONY += bzImage $(BOOT_TARGETS)
@@ -267,8 +267,8 @@ endif 
$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@



PHONY += install

install:

PHONY += install bzlilo

install bzlilo:

	$(Q)$(MAKE) $(build)=$(boot) $@



PHONY += vdso_install

arch/x86/boot/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -57,11 +57,10 @@ $(obj)/cpu.o: $(obj)/cpustr.h 


quiet_cmd_cpustr = CPUSTR  $@

      cmd_cpustr = $(obj)/mkcpustr > $@

targets += cpustr.h

$(obj)/cpustr.h: $(obj)/mkcpustr FORCE

	$(call if_changed,cpustr)

endif

clean-files += cpustr.h

targets += cpustr.h



# ---------------------------------------------------------------------------
@@ -129,6 +128,8 @@ quiet_cmd_genimage = GENIMAGE $3 
cmd_genimage = sh $(srctree)/$(src)/genimage.sh $2 $3 $(obj)/bzImage \

			$(obj)/mtools.conf '$(image_cmdline)' $(FDINITRD)



PHONY += bzdisk fdimage fdimage144 fdimage288 isoimage bzlilo install



# This requires write access to /dev/fd0

bzdisk: $(obj)/bzImage $(obj)/mtools.conf

	$(call cmd,genimage,bzdisk,/dev/fd0)
@@ -146,7 +147,7 @@ isoimage: $(obj)/bzImage 
	$(call cmd,genimage,isoimage,$(obj)/image.iso)

	@$(kecho) 'Kernel: $(obj)/image.iso is ready'



bzlilo: $(obj)/bzImage

bzlilo:

	if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi

	if [ -f $(INSTALL_PATH)/System.map ]; then mv $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi

	cat $(obj)/bzImage > $(INSTALL_PATH)/vmlinuz

arch/x86/boot/compressed/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -74,4 +74,6 @@ SECTIONS 
#endif

	. = ALIGN(PAGE_SIZE);	/* keep ZO size page aligned */

	_end = .;



	DISCARDS

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE