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

Merge tag 's390-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Heiko Carstens:

 - Improve ftrace code patching so that stop_machine is not required
   anymore. This requires a small common code patch acked by Steven
   Rostedt:

     https://lore.kernel.org/linux-s390/20210730220741.4da6fdf6@oasis.local.home/

 - Enable KCSAN for s390. This comes with a small common code change to
   fix a compile warning. Acked by Marco Elver:

     https://lore.kernel.org/r/20210729142811.1309391-1-hca@linux.ibm.com

 - Add KFENCE support for s390. This also comes with a minimal x86 patch
   from Marco Elver who said also this can be carried via the s390 tree:

     https://lore.kernel.org/linux-s390/YQJdarx6XSUQ1tFZ@elver.google.com/

 - More changes to prepare the decompressor for relocation.

 - Enable DAT also for CPU restart path.

 - Final set of register asm removal patches; leaving only three
   locations where needed and sane.

 - Add NNPA, Vector-Packed-Decimal-Enhancement Facility 2, PCI MIO
   support to hwcaps flags.

 - Cleanup hwcaps implementation.

 - Add new instructions to in-kernel disassembler.

 - Various QDIO cleanups.

 - Add SCLP debug feature.

 - Various other cleanups and improvements all over the place.

* tag 's390-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (105 commits)
  s390: remove SCHED_CORE from defconfigs
  s390/smp: do not use nodat_stack for secondary CPU start
  s390/smp: enable DAT before CPU restart callback is called
  s390: update defconfigs
  s390/ap: fix state machine hang after failure to enable irq
  KVM: s390: generate kvm hypercall functions
  s390/sclp: add tracing of SCLP interactions
  s390/debug: add early tracing support
  s390/debug: fix debug area life cycle
  s390/debug: keep debug data on resize
  s390/diag: make restart_part2 a local label
  s390/mm,pageattr: fix walk_pte_level() early exit
  s390: fix typo in linker script
  s390: remove do_signal() prototype and do_notify_resume() function
  s390/crypto: fix all kernel-doc warnings in vfio_ap_ops.c
  s390/pci: improve DMA translation init and exit
  s390/pci: simplify CLP List PCI handling
  s390/pci: handle FH state mismatch only on disable
  s390/pci: fix misleading rc in clp_set_pci_fn()
  s390/boot: factor out offset_vmlinux_info() function
  ...
parents adc5ea22 92793224

arch/s390/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ config S390 
	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KASAN

	select HAVE_ARCH_KASAN_VMALLOC

	select HAVE_ARCH_KCSAN

	select HAVE_ARCH_KFENCE

	select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_SOFT_DIRTY

arch/s390/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ all: bzImage 
KBUILD_IMAGE	:= $(boot)/bzImage



install:

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

	sh -x $(srctree)/$(boot)/install.sh $(KERNELRELEASE) $(KBUILD_IMAGE) \

	      System.map "$(INSTALL_PATH)"



bzImage: vmlinux

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

arch/s390/boot/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ KCOV_INSTRUMENT := n 
GCOV_PROFILE := n

UBSAN_SANITIZE := n

KASAN_SANITIZE := n

KCSAN_SANITIZE := n



KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR)

KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR)
@@ -36,7 +37,7 @@ CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char 


obj-y	:= head.o als.o startup.o mem_detect.o ipl_parm.o ipl_report.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 text_dma.o

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

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

obj-$(CONFIG_RELOCATABLE)	+= machine_kexec_reloc.o

obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o
@@ -69,7 +70,3 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE 


$(obj)/startup.a: $(OBJECTS) FORCE

	$(call if_changed,ar)
 


install:

	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \

	      System.map "$(INSTALL_PATH)"

arch/s390/boot/boot.h

+7 −7
Original line number Diff line number Diff line
@@ -2,14 +2,9 @@ 
#ifndef BOOT_BOOT_H

#define BOOT_BOOT_H



#include <asm/extable.h>

#include <linux/types.h>



#define BOOT_STACK_OFFSET 0x8000



#ifndef __ASSEMBLY__



#include <linux/compiler.h>



void startup_kernel(void);

unsigned long detect_memory(void);

bool is_ipl_block_dump(void);
@@ -18,17 +13,22 @@ void setup_boot_command_line(void); 
void parse_boot_command_line(void);

void verify_facilities(void);

void print_missing_facilities(void);

void sclp_early_setup_buffer(void);

void print_pgm_check_info(void);

unsigned long get_random_base(unsigned long safe_addr);

void __printf(1, 2) decompressor_printk(const char *fmt, ...);



/* Symbols defined by linker scripts */

extern const char kernel_version[];

extern unsigned long memory_limit;

extern unsigned long vmalloc_size;

extern int vmalloc_size_set;

extern int kaslr_enabled;

extern char __boot_data_start[], __boot_data_end[];

extern char __boot_data_preserved_start[], __boot_data_preserved_end[];

extern char _decompressor_syms_start[], _decompressor_syms_end[];

extern char _stack_start[], _stack_end[];



unsigned long read_ipl_report(unsigned long safe_offset);



#endif /* __ASSEMBLY__ */

#endif /* BOOT_BOOT_H */

arch/s390/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ KCOV_INSTRUMENT := n 
GCOV_PROFILE := n

UBSAN_SANITIZE := n

KASAN_SANITIZE := n

KCSAN_SANITIZE := n



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

obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o