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

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

Pull more s390 updates from Alexander Gordeev:

 - The rework that uncoupled physical and virtual address spaces
   inadvertently prevented KASAN shadow mappings from using large pages.
   Restore large page mappings for KASAN shadows

 - Add decompressor routine physmem_alloc() that may fail, unlike
   physmem_alloc_or_die(). This allows callers to implement fallback
   paths

 - Allow falling back from large pages to smaller pages (1MB or 4KB) if
   the allocation of 2GB pages in the decompressor can not be fulfilled

 - Add to the decompressor boot print support of "%%" format string,
   width and padding hadnling, length modifiers and decimal conversion
   specifiers

 - Add to the decompressor message severity levels similar to kernel
   ones. Support command-line options that control console output
   verbosity

 - Replaces boot_printk() calls with appropriate loglevel- specific
   helpers such as boot_emerg(), boot_warn(), and boot_debug().

 - Collect all boot messages into a ring buffer independent of the
   current log level. This is particularly useful for early crash
   analysis

 - If 'earlyprintk' command line parameter is not specified, store
   decompressor boot messages in a ring buffer to be printed later by
   the kernel, once the console driver is registered

 - Add 'bootdebug' command line parameter to enable printing of
   decompressor debug messages when needed. That parameters allows
   message suppressing and filtering

 - Dump boot messages on a decompressor crash, but only if 'bootdebug'
   command line parameter is enabled

 - When CONFIG_PRINTK_TIME is enabled, add timestamps to boot messages
   in the same format as regular printk()

 - Dump physical memory tracking information on boot: online ranges,
   reserved areas and vmem allocations

 - Dump virtual memory layout and randomization details

 - Improve decompression error reporting and dump the message ring
   buffer in case the boot failed and system halted

 - Add an exception handler which handles exceptions when FPU control
   register is attempted to be set to an invalid value. Remove '.fixup'
   section as result of this change

 - Use 'A', 'O', and 'R' inline assembly format flags, which allows
   recent Clang compilers to generate better FPU code

 - Rework uaccess code so it reads better and generates more efficient
   code

 - Cleanup futex inline assembly code

 - Disable KMSAN instrumention for futex inline assemblies, which
   contain dereferenced user pointers. Otherwise, shadows for the user
   pointers would be accessed

 - PFs which are not initially configured but in standby create only a
   single-function PCI domain. If they are configured later on, sibling
   PFs and their child VFs will not be added to their PCI domain
   breaking SR-IOV expectations.

   Fix that by allowing initially configured but in standby PFs create
   multi-function PCI domains

 - Add '-std=gnu11' to decompressor and purgatory CFLAGS to avoid
   compile errors caused by kernel's own definitions of 'bool', 'false',
   and 'true' conflicting with the C23 reserved keywords

 - Fix sclp subsystem failure when a sclp console is not present

 - Fix misuse of non-NULL terminated strings in vmlogrdr driver

 - Various other small improvements, cleanups and fixes

* tag 's390-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (53 commits)
  s390/vmlogrdr: Use array instead of string initializer
  s390/vmlogrdr: Use internal_name for error messages
  s390/sclp: Initialize sclp subsystem via arch_cpu_finalize_init()
  s390/tools: Use array instead of string initializer
  s390/vmem: Fix null-pointer-arithmetic warning in vmem_map_init()
  s390: Add '-std=gnu11' to decompressor and purgatory CFLAGS
  s390/bitops: Use correct constraint for arch_test_bit() inline assembly
  s390/pci: Fix SR-IOV for PFs initially in standby
  s390/futex: Avoid KMSAN instrumention for user pointers
  s390/uaccess: Rename get_put_user_noinstr_attributes to uaccess_kmsan_or_inline
  s390/futex: Cleanup futex_atomic_cmpxchg_inatomic()
  s390/futex: Generate futex atomic op functions
  s390/uaccess: Remove INLINE_COPY_FROM_USER and INLINE_COPY_TO_USER
  s390/uaccess: Use asm goto for put_user()/get_user()
  s390/uaccess: Remove usage of the oac specifier
  s390/uaccess: Replace EX_TABLE_UA_LOAD_MEM exception handling
  s390/uaccess: Cleanup noinstr __put_user()/__get_user() inline assembly constraints
  s390/uaccess: Remove __put_user_fn()/__get_user_fn() wrappers
  s390/uaccess: Move put_user() / __put_user() close to put_user() asm code
  s390/uaccess: Use asm goto for __mvc_kernel_nofault()
  ...
parents 90cb2200 87f017d0

arch/s390/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -52,13 +52,19 @@ config KASAN_SHADOW_OFFSET 
	depends on KASAN

	default 0x1C000000000000



config GCC_ASM_FLAG_OUTPUT_BROKEN

config CC_ASM_FLAG_OUTPUT_BROKEN

	def_bool CC_IS_GCC && GCC_VERSION < 140200

	help

	  GCC versions before 14.2.0 may die with an internal

	  compiler error in some configurations if flag output

	  operands are used within inline assemblies.



config CC_HAS_ASM_AOR_FORMAT_FLAGS

	def_bool !(CC_IS_CLANG && CLANG_VERSION < 190100)

	help

	  Clang versions before 19.1.0 do not support A,

	  O, and R inline assembly format flags.



config S390

	def_bool y

	#
@@ -72,6 +78,7 @@ config S390 
	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_CRC32

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_HAS_DEBUG_VIRTUAL

arch/s390/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__ 
ifndef CONFIG_AS_IS_LLVM

KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))

endif

KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 -mpacked-stack

KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 -mpacked-stack -std=gnu11

KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY

KBUILD_CFLAGS_DECOMPRESSOR += -D__DECOMPRESSOR

KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float -mbackchain

arch/s390/boot/als.c

+5 −5
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void print_missing_facilities(void) 
			 * z/VM adds a four character prefix.

			 */

			if (strlen(als_str) > 70) {

				boot_printk("%s\n", als_str);

				boot_emerg("%s\n", als_str);

				*als_str = '\0';

			}

			u16_to_decimal(val_str, i * BITS_PER_LONG + j);
@@ -54,7 +54,7 @@ void print_missing_facilities(void) 
			first = 0;

		}

	}

	boot_printk("%s\n", als_str);

	boot_emerg("%s\n", als_str);

}



static void facility_mismatch(void)
@@ -62,10 +62,10 @@ static void facility_mismatch(void) 
	struct cpuid id;



	get_cpu_id(&id);

	boot_printk("The Linux kernel requires more recent processor hardware\n");

	boot_printk("Detected machine-type number: %4x\n", id.machine);

	boot_emerg("The Linux kernel requires more recent processor hardware\n");

	boot_emerg("Detected machine-type number: %4x\n", id.machine);

	print_missing_facilities();

	boot_printk("See Principles of Operations for facility bits\n");

	boot_emerg("See Principles of Operations for facility bits\n");

	disabled_wait();

}

arch/s390/boot/boot.h

+23 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#ifndef __ASSEMBLY__



#include <linux/printk.h>

#include <asm/physmem_info.h>



struct machine_info {
@@ -47,13 +48,16 @@ void physmem_set_usable_limit(unsigned long limit); 
void physmem_reserve(enum reserved_range_type type, unsigned long addr, unsigned long size);

void physmem_free(enum reserved_range_type type);

/* for continuous/multiple allocations per type */

unsigned long physmem_alloc_top_down(enum reserved_range_type type, unsigned long size,

unsigned long physmem_alloc_or_die(enum reserved_range_type type, unsigned long size,

				   unsigned long align);

unsigned long physmem_alloc(enum reserved_range_type type, unsigned long size,

			    unsigned long align, bool die_on_oom);

/* for single allocations, 1 per type */

unsigned long physmem_alloc_range(enum reserved_range_type type, unsigned long size,

				  unsigned long align, unsigned long min, unsigned long max,

				  bool die_on_oom);

unsigned long get_physmem_alloc_pos(void);

void dump_physmem_reserved(void);

bool ipl_report_certs_intersects(unsigned long addr, unsigned long size,

				 unsigned long *intersection_start);

bool is_ipl_block_dump(void);
@@ -69,12 +73,28 @@ void print_pgm_check_info(void); 
unsigned long randomize_within_range(unsigned long size, unsigned long align,

				     unsigned long min, unsigned long max);

void setup_vmem(unsigned long kernel_start, unsigned long kernel_end, unsigned long asce_limit);

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

int __printf(1, 2) boot_printk(const char *fmt, ...);

void print_stacktrace(unsigned long sp);

void error(char *m);

int get_random(unsigned long limit, unsigned long *value);

void boot_rb_dump(void);



#ifndef boot_fmt

#define boot_fmt(fmt)	fmt

#endif



#define boot_emerg(fmt, ...)	boot_printk(KERN_EMERG boot_fmt(fmt), ##__VA_ARGS__)

#define boot_alert(fmt, ...)	boot_printk(KERN_ALERT boot_fmt(fmt), ##__VA_ARGS__)

#define boot_crit(fmt, ...)	boot_printk(KERN_CRIT boot_fmt(fmt), ##__VA_ARGS__)

#define boot_err(fmt, ...)	boot_printk(KERN_ERR boot_fmt(fmt), ##__VA_ARGS__)

#define boot_warn(fmt, ...)	boot_printk(KERN_WARNING boot_fmt(fmt), ##__VA_ARGS__)

#define boot_notice(fmt, ...)	boot_printk(KERN_NOTICE boot_fmt(fmt), ##__VA_ARGS__)

#define boot_info(fmt, ...)	boot_printk(KERN_INFO boot_fmt(fmt), ##__VA_ARGS__)

#define boot_debug(fmt, ...)	boot_printk(KERN_DEBUG boot_fmt(fmt), ##__VA_ARGS__)



extern struct machine_info machine;

extern int boot_console_loglevel;

extern bool boot_ignore_loglevel;



/* Symbols defined by linker scripts */

extern const char kernel_version[];

arch/s390/boot/decompressor.c

+11 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/kernel.h>

#include <linux/string.h>

#include <asm/boot_data.h>

#include <asm/page.h>

#include "decompressor.h"

#include "boot.h"
@@ -63,6 +64,15 @@ static unsigned long free_mem_end_ptr = (unsigned long) _end + BOOT_HEAP_SIZE; 
#include "../../../../lib/decompress_unzstd.c"

#endif



static void decompress_error(char *m)

{

	if (bootdebug)

		boot_rb_dump();

	boot_emerg("Decompression error: %s\n", m);

	boot_emerg(" -- System halted\n");

	disabled_wait();

}



unsigned long mem_safe_offset(void)

{

	return ALIGN(free_mem_end_ptr, PAGE_SIZE);
@@ -71,5 +81,5 @@ unsigned long mem_safe_offset(void) 
void deploy_kernel(void *output)

{

	__decompress(_compressed_start, _compressed_end - _compressed_start,

		     NULL, NULL, output, vmlinux.image_size, NULL, error);

		     NULL, NULL, output, vmlinux.image_size, NULL, decompress_error);

}