Commit 65ad409e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Vasily Gorbik:

 - Fix KMSAN build breakage caused by the conflict between s390 and
   mm-stable trees

 - Add KMSAN page markers for ptdump

 - Add runtime constant support

 - Fix __pa/__va for modules under non-GPL licenses by exporting
   necessary vm_layout struct with EXPORT_SYMBOL to prevent linkage
   problems

 - Fix an endless loop in the CF_DIAG event stop in the CPU Measurement
   Counter Facility code when the counter set size is zero

 - Remove the PROTECTED_VIRTUALIZATION_GUEST config option and enable
   its functionality by default

 - Support allocation of multiple MSI interrupts per device and improve
   logging of architecture-specific limitations

 - Add support for lowcore relocation as a debugging feature to catch
   all null ptr dereferences in the kernel address space, improving
   detection beyond the current implementation's limited write access
   protection

 - Clean up and rework CPU alternatives to allow for callbacks and early
   patching for the lowcore relocation

* tag 's390-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (39 commits)
  s390: Remove protvirt and kvm config guards for uv code
  s390/boot: Add cmdline option to relocate lowcore
  s390/kdump: Make kdump ready for lowcore relocation
  s390/entry: Make system_call() ready for lowcore relocation
  s390/entry: Make ret_from_fork() ready for lowcore relocation
  s390/entry: Make __switch_to() ready for lowcore relocation
  s390/entry: Make restart_int_handler() ready for lowcore relocation
  s390/entry: Make mchk_int_handler() ready for lowcore relocation
  s390/entry: Make int handlers ready for lowcore relocation
  s390/entry: Make pgm_check_handler() ready for lowcore relocation
  s390/entry: Add base register to CHECK_VMAP_STACK/CHECK_STACK macro
  s390/entry: Add base register to SIEEXIT macro
  s390/entry: Add base register to MBEAR macro
  s390/entry: Make __sie64a() ready for lowcore relocation
  s390/head64: Make startup code ready for lowcore relocation
  s390: Add infrastructure to patch lowcore accesses
  s390/atomic_ops: Disable flag outputs constraint for GCC versions below 14.2.0
  s390/entry: Move SIE indicator flag to thread info
  s390/nmi: Simplify ptregs setup
  s390/alternatives: Remove alternative facility list
  ...
parents a6294b5b 6dc2e98d

Documentation/admin-guide/kernel-parameters.txt

+0 −3
Original line number Diff line number Diff line
@@ -3830,9 +3830,6 @@ 


	noalign		[KNL,ARM]



	noaltinstr	[S390,EARLY] Disables alternative instructions

			patching (CPU alternatives feature).



	noapic		[SMP,APIC,EARLY] Tells the kernel to not make use of any

			IOAPICs that may be present in the system.

arch/s390/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -799,17 +799,6 @@ config HAVE_PNETID 


menu "Virtualization"



config PROTECTED_VIRTUALIZATION_GUEST

	def_bool n

	prompt "Protected virtualization guest support"

	help

	  Select this option, if you want to be able to run this

	  kernel as a protected virtualization KVM guest.

	  Protected virtualization capable machines have a mini hypervisor

	  located at machine level (an ultravisor). With help of the

	  Ultravisor, KVM will be able to run "protected" VMs, special

	  VMs whose memory and management data are unavailable to KVM.



config PFAULT

	def_bool y

	prompt "Pseudo page fault support"

arch/s390/boot/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char 


obj-y	:= head.o als.o startup.o physmem_info.o ipl_parm.o ipl_report.o vmem.o

obj-y	+= string.o ebcdic.o sclp_early_core.o mem.o ipl_vmparm.o cmdline.o

obj-y	+= version.o pgm_check_info.o ctype.o ipl_data.o relocs.o

obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE))	+= uv.o

obj-y	+= version.o pgm_check_info.o ctype.o ipl_data.o relocs.o alternative.o uv.o

obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o

obj-y	+= $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o

obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o

arch/s390/boot/alternative.c

0 → 100644
+3 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include "../kernel/alternative.c"

arch/s390/boot/boot.h

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ struct vmlinux_info { 
	unsigned long init_mm_off;

	unsigned long swapper_pg_dir_off;

	unsigned long invalid_pg_dir_off;

	unsigned long alt_instructions;

	unsigned long alt_instructions_end;

#ifdef CONFIG_KASAN

	unsigned long kasan_early_shadow_page_off;

	unsigned long kasan_early_shadow_pte_off;
@@ -89,8 +91,10 @@ extern char _end[], _decompressor_end[]; 
extern unsigned char _compressed_start[];

extern unsigned char _compressed_end[];

extern struct vmlinux_info _vmlinux_info;



#define vmlinux _vmlinux_info



#define __lowcore_pa(x)		((unsigned long)(x) % sizeof(struct lowcore))

#define __abs_lowcore_pa(x)	(((unsigned long)(x) - __abs_lowcore) % sizeof(struct lowcore))

#define __kernel_va(x)		((void *)((unsigned long)(x) - __kaslr_offset_phys + __kaslr_offset))

#define __kernel_pa(x)		((unsigned long)(x) - __kaslr_offset + __kaslr_offset_phys)