Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull second round of s390 updates from Martin Schwidefsky:

 - rework of the vdso code to avoid the use of the access register mode

 - use perf AUX buffers for the transport of diagnostic sample data

 - add perf_regs and user stack dump support

 - enable perf call graphs for user space programs

 - add perf register support for floating-point registers

 - all remaining s390 related timer_setup conversions

 - bug fixes and cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (30 commits)
  s390: remove unused parameter from Makefile
  zfcp: purely mechanical update using timer API, plus blank lines
  s390/scsi: Convert timers to use timer_setup()
  s390/cpum_sf: correctly set the PID and TID in perf samples
  s390/cpum_sf: load program parameter at sampler enablement
  s390/perf: add perf register support for floating-point registers
  s390/perf: extend perf_regs support to include floating-point registers
  s390/perf: define common DWARF register string table
  s390/perf: add support for perf_regs and libdw
  s390/perf: add perf_regs support and user stack dump
  s390/cpum_sf: do not register PMU if no sampling mode is authorized
  s390/cpumf: remove raw event support in basic-only sampling mode
  s390/perf: add callback to perf to enable using AUX buffer
  s390/cpumf: enable using AUX buffer
  s390/cpumf: introduce AUX buffer for dump diagnostic sample data
  s390/disassembler: increase show_code buffer size
  s390: Remove CONFIG_HARDENED_USERCOPY
  s390: enable CPU alternatives unconditionally
  s390/nmi: remove unused code
  s390/mm: remove unused code
  ...
parents c3e9c04b ab35727e

arch/s390/Kconfig

+3 −16
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ config S390 
	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GCC_PLUGINS

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZ4
@@ -158,6 +159,8 @@ config S390 
	select HAVE_KRETPROBES

	select HAVE_KVM

	select HAVE_LIVEPATCH

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_MEMBLOCK_PHYS_MAP
@@ -538,22 +541,6 @@ config ARCH_RANDOM 


	  If unsure, say Y.



config ALTERNATIVES

	def_bool y

	prompt "Patch optimized instructions for running CPU type"

	help

	  When enabled the kernel code is compiled with additional

	  alternative instructions blocks optimized for newer CPU types.

	  These alternative instructions blocks are patched at kernel boot

	  time when running CPU supports them. This mechanism is used to

	  optimize some critical code paths (i.e. spinlocks) for newer CPUs

	  even if kernel is build to support older machine generations.



	  This mechanism could be disabled by appending "noaltinstr"

	  option to the kernel command line.



	  If unsure, say Y.



endmenu



menu "Memory setup"

arch/s390/configs/default_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ CONFIG_STACK_TRACER=y 
CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_DMA_API_DEBUG=y

CONFIG_LKDTM=m

CONFIG_TEST_LIST_SORT=y

CONFIG_TEST_SORT=y
@@ -637,14 +638,12 @@ CONFIG_RBTREE_TEST=y 
CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_DMA_API_DEBUG=y

CONFIG_TEST_BPF=m

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_S390_PTDUMP=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -660,13 +659,11 @@ CONFIG_CRYPTO_PCRYPT=m 
CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

arch/s390/configs/gcov_defconfig

+0 −4
Original line number Diff line number Diff line
@@ -587,7 +587,6 @@ CONFIG_BIG_KEYS=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -605,13 +604,10 @@ CONFIG_CRYPTO_PCRYPT=m 
CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

arch/s390/configs/performance_defconfig

+0 −4
Original line number Diff line number Diff line
@@ -585,7 +585,6 @@ CONFIG_BIG_KEYS=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -603,13 +602,10 @@ CONFIG_CRYPTO_PCRYPT=m 
CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

arch/s390/include/asm/alternative.h

+3 −17
Original line number Diff line number Diff line
@@ -15,14 +15,9 @@ struct alt_instr { 
	u8  replacementlen;	/* length of new instruction */

} __packed;



#ifdef CONFIG_ALTERNATIVES

extern void apply_alternative_instructions(void);

extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);

#else

static inline void apply_alternative_instructions(void) {};

static inline void apply_alternatives(struct alt_instr *start,

				      struct alt_instr *end) {};

#endif

void apply_alternative_instructions(void);

void apply_alternatives(struct alt_instr *start, struct alt_instr *end);



/*

 * |661:       |662:	  |6620      |663:

 * +-----------+---------------------+
@@ -109,7 +104,6 @@ static inline void apply_alternatives(struct alt_instr *start, 
	b_altinstr(num)":\n\t" altinstr "\n" e_altinstr(num) ":\n"	\

	INSTR_LEN_SANITY_CHECK(altinstr_len(num))



#ifdef CONFIG_ALTERNATIVES

/* alternative assembly primitive: */

#define ALTERNATIVE(oldinstr, altinstr, facility) \

	".pushsection .altinstr_replacement, \"ax\"\n"			\
@@ -130,14 +124,6 @@ static inline void apply_alternatives(struct alt_instr *start, 
	ALTINSTR_ENTRY(facility1, 1)					\

	ALTINSTR_ENTRY(facility2, 2)					\

	".popsection\n"

#else

/* Alternative instructions are disabled, let's put just oldinstr in */

#define ALTERNATIVE(oldinstr, altinstr, facility) \

	oldinstr "\n"



#define ALTERNATIVE_2(oldinstr, altinstr1, facility1, altinstr2, facility2) \

	oldinstr "\n"

#endif



/*

 * Alternative instructions for different CPU types or capabilities.