Commit 1aac9cb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - Make sure single object builds in arch/x86/virt/ ala
      make ... arch/x86/virt/vmx/tdx/seamcall.o
   work again

 - Do not do ROM range scans and memory validation when the kernel is
   running as a SEV-SNP guest as those can get problematic and, before
   that, are not really needed in such a guest

 - Exclude the build-time generated vdso-image-x32.o object from objtool
   validation and in particular the return sites in there due to a
   warning which fires when an unpatched return thunk is being used

 - Improve the NMI CPUs stall message to show additional information
   about the state of each CPU wrt the NMI handler

 - Enable gcc named address spaces support only on !KCSAN configs due to
   compiler options incompatibility

 - Revert a change which was trying to use GB pages for mapping regions
   only when the regions would be large enough but that change lead to
   kexec failing

 - A documentation fixlet

* tag 'x86_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Use obj-y to descend into arch/x86/virt/
  x86/sev: Skip ROM range scans and validation for SEV-SNP guests
  x86/vdso: Fix rethunk patching for vdso-image-x32.o too
  x86/nmi: Upgrade NMI backtrace stall checks & messages
  x86/percpu: Disable named address spaces for KCSAN
  Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped."
  Documentation/x86: Fix title underline length
parents 712e1425 3f1a9bc5

Documentation/arch/x86/resctrl.rst

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ Memory b/w domain is L3 cache. 
	MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;...



Memory bandwidth Allocation specified in MiBps

---------------------------------------------

----------------------------------------------



Memory bandwidth domain is L3 cache.

::

arch/x86/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ obj-y += net/ 


obj-$(CONFIG_KEXEC_FILE) += purgatory/



obj-y += virt/svm/

obj-y += virt/



# for cleaning

subdir- += boot tools

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2439,6 +2439,8 @@ config USE_X86_SEG_SUPPORT 
	# with named address spaces - see GCC PR sanitizer/111736.

	#

	depends on !KASAN

	# -fsanitize=thread (KCSAN) is also incompatible.

	depends on !KCSAN



config CC_HAS_SLS

	def_bool $(cc-option,-mharden-sls=all)

arch/x86/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -251,8 +251,6 @@ archheaders: 


libs-y  += arch/x86/lib/



core-y += arch/x86/virt/



# drivers-y are linked after core-y

drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/

drivers-$(CONFIG_PCI)            += arch/x86/pci/

arch/x86/entry/vdso/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o 
obj-$(CONFIG_COMPAT_32)				+= vdso-image-32.o vdso32-setup.o



OBJECT_FILES_NON_STANDARD_vdso-image-32.o	:= n

OBJECT_FILES_NON_STANDARD_vdso-image-x32.o	:= n

OBJECT_FILES_NON_STANDARD_vdso-image-64.o	:= n

OBJECT_FILES_NON_STANDARD_vdso32-setup.o	:= n