Commit e831cbfc 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 more s390 updates from Heiko Carstens:
 "This includes one bpf/jit bug fix where the jit compiler could
  sometimes write generated code out of bounds of the allocated memory
  area.

  The rest of the patches are only cleanups and minor improvements"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/irq: reduce size of external interrupt handler hash array
  s390/compat,uid16: use current_cred()
  s390/ap_bus: use and-mask instead of a cast
  s390/ftrace: avoid pointer arithmetics with function pointers
  s390: make various functions static, add declarations to header files
  s390/compat signal: add couple of __force annotations
  s390/mm: add __releases()/__acquires() annotations to gmap_alloc_table()
  s390: keep Kconfig sorted
  s390/irq: rework irq subclass handling
  s390/irq: use hlists for external interrupt handler array
  s390/dumpstack: convert print_symbol to %pSR
  s390/perf: Remove print_hex_dump_bytes() debug output
  s390: update defconfig
  s390/bpf,jit: fix address randomization
parents 5b419784 9e75c627

arch/s390/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ config S390 
	def_bool y

	select ARCH_DISCARD_MEMBLOCK

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_INLINE_READ_LOCK

	select ARCH_INLINE_READ_LOCK_BH
@@ -91,7 +92,6 @@ config S390 
	select ARCH_INLINE_WRITE_UNLOCK_BH

	select ARCH_INLINE_WRITE_UNLOCK_IRQ

	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE

	select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS

	select ARCH_SAVE_PAGE_KEYS if HIBERNATION

	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_EXTABLE_SORT
@@ -135,15 +135,15 @@ config S390 
	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_UID16 if 32BIT

	select HAVE_VIRT_CPU_ACCOUNTING

	select VIRT_TO_BUS

	select INIT_ALL_POSSIBLE

	select KTIME_SCALAR if 32BIT

	select MODULES_USE_ELF_RELA

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION

	select OLD_SIGSUSPEND3

	select SYSCTL_EXCEPTION_TRACE

	select USE_GENERIC_SMP_HELPERS if SMP

	select VIRT_CPU_ACCOUNTING

	select VIRT_TO_BUS



config SCHED_OMIT_FRAME_POINTER

	def_bool y

arch/s390/defconfig

+27 −12
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -27,6 +26,7 @@ CONFIG_RD_BZIP2=y 
CONFIG_RD_LZMA=y

CONFIG_RD_XZ=y

CONFIG_RD_LZO=y

CONFIG_RD_LZ4=y

CONFIG_EXPERT=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y
@@ -38,11 +38,13 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

# CONFIG_EFI_PARTITION is not set

CONFIG_DEFAULT_DEADLINE=y

CONFIG_HZ_100=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CRASH_DUMP=y

CONFIG_BINFMT_MISC=m

CONFIG_HIBERNATION=y
@@ -92,40 +94,49 @@ CONFIG_SCSI_CONSTANTS=y 
CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_ZFCP=y

CONFIG_SCSI_VIRTIO=y

CONFIG_NETDEVICES=y

CONFIG_BONDING=m

CONFIG_DUMMY=m

CONFIG_EQUALIZER=m

CONFIG_TUN=m

CONFIG_VIRTIO_NET=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

CONFIG_RAW_DRIVER=m

CONFIG_VIRTIO_BALLOON=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_XFS_FS=y

CONFIG_XFS_QUOTA=y

CONFIG_XFS_POSIX_ACL=y

CONFIG_XFS_RT=y

CONFIG_BTRFS_FS=y

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_FANOTIFY=y

CONFIG_FUSE_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_HUGETLBFS=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_TIMER_STATS=y

CONFIG_PROVE_LOCKING=y

CONFIG_PROVE_RCU=y

CONFIG_LOCK_STAT=y

CONFIG_DEBUG_LOCKDEP=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_PROVE_RCU=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_RCU_TRACE=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y

CONFIG_LATENCYTOP=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_KPROBES_SANITY_TEST=y

# CONFIG_STRICT_DEVMEM is not set

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_AUTHENC=m

CONFIG_CRYPTO_TEST=m
@@ -137,8 +148,10 @@ CONFIG_CRYPTO_ECB=m 
CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m
@@ -165,6 +178,8 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRYPTO_DEFLATE=m

CONFIG_CRYPTO_ZLIB=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

CONFIG_ZCRYPT=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

arch/s390/include/asm/irq.h

+8 −4
Original line number Diff line number Diff line
@@ -78,10 +78,14 @@ typedef void (*ext_int_handler_t)(struct ext_code, unsigned int, unsigned long); 


int register_external_interrupt(u16 code, ext_int_handler_t handler);

int unregister_external_interrupt(u16 code, ext_int_handler_t handler);

void service_subclass_irq_register(void);

void service_subclass_irq_unregister(void);

void measurement_alert_subclass_register(void);

void measurement_alert_subclass_unregister(void);



enum irq_subclass {

	IRQ_SUBCLASS_MEASUREMENT_ALERT = 5,

	IRQ_SUBCLASS_SERVICE_SIGNAL = 9,

};



void irq_subclass_register(enum irq_subclass subclass);

void irq_subclass_unregister(enum irq_subclass subclass);



#define irq_canonicalize(irq)  (irq)

arch/s390/kernel/compat_linux.c

+5 −4
Original line number Diff line number Diff line
@@ -221,25 +221,26 @@ static int groups16_from_user(struct group_info *group_info, u16 __user *groupli 


asmlinkage long sys32_getgroups16(int gidsetsize, u16 __user *grouplist)

{

	const struct cred *cred = current_cred();

	int i;



	if (gidsetsize < 0)

		return -EINVAL;



	get_group_info(current->cred->group_info);

	i = current->cred->group_info->ngroups;

	get_group_info(cred->group_info);

	i = cred->group_info->ngroups;

	if (gidsetsize) {

		if (i > gidsetsize) {

			i = -EINVAL;

			goto out;

		}

		if (groups16_to_user(grouplist, current->cred->group_info)) {

		if (groups16_to_user(grouplist, cred->group_info)) {

			i = -EFAULT;

			goto out;

		}

	}

out:

	put_group_info(current->cred->group_info);

	put_group_info(cred->group_info);

	return i;

}

arch/s390/kernel/compat_signal.c

+5 −5
Original line number Diff line number Diff line
@@ -332,9 +332,9 @@ static int setup_frame32(int sig, struct k_sigaction *ka, 
	/* Set up to return from userspace.  If provided, use a stub

	   already in userspace.  */

	if (ka->sa.sa_flags & SA_RESTORER) {

		regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE;

		regs->gprs[14] = (__u64 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;

	} else {

		regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE;

		regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;

		if (__put_user(S390_SYSCALL_OPCODE | __NR_sigreturn,

			       (u16 __force __user *)(frame->retcode)))

			goto give_sigsegv;
@@ -400,9 +400,9 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, 
	/* Set up to return from userspace.  If provided, use a stub

	   already in userspace.  */

	if (ka->sa.sa_flags & SA_RESTORER) {

		regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE;

		regs->gprs[14] = (__u64 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;

	} else {

		regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE;

		regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;

		err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,

				  (u16 __force __user *)(frame->retcode));

	}
@@ -417,7 +417,7 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, 
	regs->psw.mask = PSW_MASK_BA |

		(psw_user_bits & PSW_MASK_ASC) |

		(regs->psw.mask & ~PSW_MASK_ASC);

	regs->psw.addr = (__u64) ka->sa.sa_handler;

	regs->psw.addr = (__u64 __force) ka->sa.sa_handler;



	regs->gprs[2] = map_signal(sig);

	regs->gprs[3] = (__force __u64) &frame->info;

CRA Git | Maintained and supported by SUSTech CRA and CCSE