Commit 2547f79b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 updates from Heiko Carstens:

 - Provide a new interface for dynamic configuration and deconfiguration
   of hotplug memory, allowing with and without memmap_on_memory
   support. This makes the way memory hotplug is handled on s390 much
   more similar to other architectures

 - Remove compat support. There shouldn't be any compat user space
   around anymore, therefore get rid of a lot of code which also doesn't
   need to be tested anymore

 - Add stackprotector support. GCC 16 will get new compiler options,
   which allow to generate code required for kernel stackprotector
   support

 - Merge pai_crypto and pai_ext PMU drivers into a new driver. This
   removes a lot of duplicated code. The new driver is also extendable
   and allows to support new PMUs

 - Add driver override support for AP queues

 - Rework and extend zcrypt and AP trace events to allow for tracing of
   crypto requests

 - Support block sizes larger than 65535 bytes for CCW tape devices

 - Since the rework of the virtual kernel address space the module area
   and the kernel image are within the same 4GB area. This eliminates
   the need of weak per cpu variables. Get rid of
   ARCH_MODULE_NEEDS_WEAK_PER_CPU

 - Various other small improvements and fixes

* tag 's390-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (92 commits)
  watchdog: diag288_wdt: Remove KMSG_COMPONENT macro
  s390/entry: Use lay instead of aghik
  s390/vdso: Get rid of -m64 flag handling
  s390/vdso: Rename vdso64 to vdso
  s390: Rename head64.S to head.S
  s390/vdso: Use common STABS_DEBUG and DWARF_DEBUG macros
  s390: Add stackprotector support
  s390/modules: Simplify module_finalize() slightly
  s390: Remove KMSG_COMPONENT macro
  s390/percpu: Get rid of ARCH_MODULE_NEEDS_WEAK_PER_CPU
  s390/ap: Restrict driver_override versus apmask and aqmask use
  s390/ap: Rename mutex ap_perms_mutex to ap_attr_mutex
  s390/ap: Support driver_override for AP queue devices
  s390/ap: Use all-bits-one apmask/aqmask for vfio in_use() checks
  s390/debug: Update description of resize operation
  s390/syscalls: Switch to generic system call table generation
  s390/syscalls: Remove system call table pointer from thread_struct
  s390/uapi: Remove 31 bit support from uapi header files
  s390: Remove compat support
  tools: Remove s390 compat support
  ...
parents 4a21d1b3 283f90b5

Documentation/arch/s390/s390dbf.rst

+2 −3
Original line number Diff line number Diff line
@@ -243,9 +243,8 @@ Examples: 


Changing the size of debug areas

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

It is possible the change the size of debug areas through piping

the number of pages to the debugfs file "pages". The resize request will

also flush the debug areas.

To resize a debug area, write the desired page count to the "pages" file.

Existing data is preserved if it fits; otherwise, oldest entries are dropped.



Example:

arch/s390/Kconfig

+4 −17
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ config CC_HAS_ASM_AOR_FORMAT_FLAGS 
	  Clang versions before 19.1.0 do not support A,

	  O, and R inline assembly format flags.



config CC_HAS_STACKPROTECTOR_GLOBAL

	def_bool $(cc-option, -mstack-protector-guard=global -mstack-protector-guard-record)



config S390

	def_bool y

	#
@@ -140,7 +143,6 @@ config S390 
	select ARCH_INLINE_WRITE_UNLOCK_IRQ

	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE

	select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE

	select ARCH_MODULE_NEEDS_WEAK_PER_CPU

	select ARCH_STACKWALK

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC
@@ -245,6 +247,7 @@ config S390 
	select HAVE_SAMPLE_FTRACE_DIRECT_MULTI

	select HAVE_SETUP_PER_CPU_AREA

	select HAVE_SOFTIRQ_ON_OWN_STACK

	select HAVE_STACKPROTECTOR if CC_HAS_STACKPROTECTOR_GLOBAL

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_VIRT_CPU_ACCOUNTING

	select HAVE_VIRT_CPU_ACCOUNTING_IDLE
@@ -504,22 +507,6 @@ config COMMAND_LINE_SIZE 
	  This allows you to specify the maximum length of the kernel command

	  line.



config COMPAT

	def_bool n

	prompt "Kernel support for 31 bit emulation"

	select ARCH_WANT_OLD_COMPAT_IPC

	select COMPAT_OLD_SIGACTION

	select HAVE_UID16

	depends on MULTIUSER

	depends on !CC_IS_CLANG && !LD_IS_LLD

	help

	  Select this option if you want to enable your system kernel to

	  handle system-calls from ELF binaries for 31 bit ESA.  This option

	  (and some other stuff like libraries and such) is needed for

	  executing 31 bit applications.



	  If unsure say N.



config SMP

	def_bool y

arch/s390/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ ifdef CONFIG_EXPOLINE 
  aflags-y += -DCC_USING_EXPOLINE

endif



ifeq ($(CONFIG_STACKPROTECTOR),y)

  KBUILD_CFLAGS += -mstack-protector-guard=global -mstack-protector-guard-record

endif



ifdef CONFIG_FUNCTION_TRACER

  ifeq ($(call cc-option,-mfentry -mnop-mcount),)

    # make use of hotpatch feature if the compiler supports it
@@ -135,10 +139,9 @@ zfcpdump: 
	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



archheaders:

	$(Q)$(MAKE) $(build)=$(syscalls) uapi

	$(Q)$(MAKE) $(build)=$(syscalls) all



archprepare:

	$(Q)$(MAKE) $(build)=$(syscalls) kapi

	$(Q)$(MAKE) $(build)=$(tools) kapi $(extra_tools)

ifeq ($(KBUILD_EXTMOD),)

# We need to generate vdso-offsets.h before compiling certain files in kernel/.
@@ -149,12 +152,9 @@ ifeq ($(KBUILD_EXTMOD),) 
# this hack.

prepare: vdso_prepare

vdso_prepare: prepare0

	$(Q)$(MAKE) $(build)=arch/s390/kernel/vdso64 include/generated/vdso64-offsets.h

	$(if $(CONFIG_COMPAT),$(Q)$(MAKE) \

		$(build)=arch/s390/kernel/vdso32 include/generated/vdso32-offsets.h)

	$(Q)$(MAKE) $(build)=arch/s390/kernel/vdso include/generated/vdso-offsets.h



vdso-install-y			+= arch/s390/kernel/vdso64/vdso64.so.dbg

vdso-install-$(CONFIG_COMPAT)	+= arch/s390/kernel/vdso32/vdso32.so.dbg

vdso-install-y			+= arch/s390/kernel/vdso/vdso.so.dbg



endif

arch/s390/appldata/appldata_base.c

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ 
 * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>

 */



#define KMSG_COMPONENT	"appldata"

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

#define pr_fmt(fmt) "appldata: " fmt



#include <linux/export.h>

#include <linux/module.h>

arch/s390/appldata/appldata_os.c

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ 
 * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>

 */



#define KMSG_COMPONENT	"appldata"

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

#define pr_fmt(fmt) "appldata: " fmt



#include <linux/module.h>

#include <linux/init.h>