Commit 847d4287 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 updates from Vasily Gorbik:

 - Remove address space overrides using set_fs()

 - Convert to generic vDSO

 - Convert to generic page table dumper

 - Add ARCH_HAS_DEBUG_WX support

 - Add leap seconds handling support

 - Add NVMe firmware-assisted kernel dump support

 - Extend NVMe boot support with memory clearing control and addition of
   kernel parameters

 - AP bus and zcrypt api code rework. Add adapter configure/deconfigure
   interface. Extend debug features. Add failure injection support

 - Add ECC secure private keys support

 - Add KASan support for running protected virtualization host with
   4-level paging

 - Utilize destroy page ultravisor call to speed up secure guests
   shutdown

 - Implement ioremap_wc() and ioremap_prot() with MIO in PCI code

 - Various checksum improvements

 - Other small various fixes and improvements all over the code

* tag 's390-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (85 commits)
  s390/uaccess: fix indentation
  s390/uaccess: add default cases for __put_user_fn()/__get_user_fn()
  s390/zcrypt: fix wrong format specifications
  s390/kprobes: move insn_page to text segment
  s390/sie: fix typo in SIGP code description
  s390/lib: fix kernel doc for memcmp()
  s390/zcrypt: Introduce Failure Injection feature
  s390/zcrypt: move ap_msg param one level up the call chain
  s390/ap/zcrypt: revisit ap and zcrypt error handling
  s390/ap: Support AP card SCLP config and deconfig operations
  s390/sclp: Add support for SCLP AP adapter config/deconfig
  s390/ap: add card/queue deconfig state
  s390/ap: add error response code field for ap queue devices
  s390/ap: split ap queue state machine state from device state
  s390/zcrypt: New config switch CONFIG_ZCRYPT_DEBUG
  s390/zcrypt: introduce msg tracking in zcrypt functions
  s390/startup: correct early pgm check info formatting
  s390: remove orphaned extern variables declarations
  s390/kasan: make sure int handler always run with DAT on
  s390/ipl: add support to control memory clearing for nvme re-IPL
  ...
parents 96685f86 10e5afb3

Documentation/features/vm/ioremap_prot/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |        s390: | TODO |

    |        s390: |  ok  |

    |          sh: |  ok  |

    |       sparc: | TODO |

    |          um: | TODO |

arch/s390/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ config S390 
	def_bool y

	select ARCH_BINFMT_ELF_STATE

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEBUG_WX

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE
@@ -73,6 +74,7 @@ config S390 
	select ARCH_HAS_STRICT_MODULE_RWX

	select ARCH_HAS_SYSCALL_WRAPPER

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAS_VDSO_DATA

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_INLINE_READ_LOCK

	select ARCH_INLINE_READ_LOCK_BH
@@ -118,6 +120,8 @@ config S390 
	select GENERIC_CPU_AUTOPROBE

	select GENERIC_CPU_VULNERABILITIES

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_GETTIMEOFDAY

	select GENERIC_PTDUMP

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

	select HAVE_ALIGNED_STRUCT_PAGE if SLUB
@@ -149,6 +153,7 @@ config S390 
	select HAVE_FUNCTION_TRACER

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GCC_PLUGINS

	select HAVE_GENERIC_VDSO

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZ4

arch/s390/Kconfig.debug

+0 −12
Original line number Diff line number Diff line
@@ -3,17 +3,5 @@ 
config TRACE_IRQFLAGS_SUPPORT

	def_bool y



config S390_PTDUMP

	bool "Export kernel pagetable layout to userspace via debugfs"

	depends on DEBUG_KERNEL

	select DEBUG_FS

	help

	  Say Y here if you want to show the kernel pagetable layout in a

	  debugfs file. This information is only useful for kernel developers

	  who are working in architecture specific areas of the kernel.

	  It is probably not a good idea to enable this feature in a production

	  kernel.

	  If in doubt, say "N"



config EARLY_PRINTK

	def_bool y

arch/s390/boot/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -73,7 +73,3 @@ $(obj)/startup.a: $(OBJECTS) FORCE 
install:

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

	      System.map "$(INSTALL_PATH)"
 


chkbss := $(obj-y)

chkbss-target := startup.a

include $(srctree)/arch/s390/scripts/Makefile.chkbss

arch/s390/boot/compressed/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -62,7 +62,3 @@ $(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE 
OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed

$(obj)/piggy.o: $(obj)/vmlinux.bin$(suffix-y) FORCE

	$(call if_changed,objcopy)
 


chkbss := $(filter-out piggy.o info.o, $(obj-y))

chkbss-target := vmlinux.bin

include $(srctree)/arch/s390/scripts/Makefile.chkbss

CRA Git | Maintained and supported by SUSTech CRA and CCSE