Commit 1566feea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 fixes from Vasily Gorbik:

 - a few ptrace fixes mostly for strace and seccomp_bpf kernel tests
   findings

 - cleanup unused pm callbacks in virtio ccw

 - replace kmalloc + memset with kzalloc in crypto

 - use $(LD) for vDSO linkage to make clang happy

 - fix vDSO clock_getres() to preserve the same behaviour as
   posix_get_hrtimer_res()

 - fix workqueue cpumask warning when NUMA=n and nr_node_ids=2

 - reduce SLSB writes during input processing, improve warnings and
   cleanup qdio_data usage in qdio

 - a few fixes to use scnprintf() instead of snprintf()

* tag 's390-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: fix syscall_get_error for compat processes
  s390/qdio: warn about unexpected SLSB states
  s390/qdio: clean up usage of qdio_data
  s390/numa: let NODES_SHIFT depend on NEED_MULTIPLE_NODES
  s390/vdso: fix vDSO clock_getres()
  s390/vdso: Use $(LD) instead of $(CC) to link vDSO
  s390/protvirt: use scnprintf() instead of snprintf()
  s390: use scnprintf() in sys_##_prefix##_##_name##_show
  s390/crypto: use scnprintf() instead of snprintf()
  s390/zcrypt: use kzalloc
  s390/virtio: remove unused pm callbacks
  s390/qdio: reduce SLSB writes during Input Queue processing
  selftests/seccomp: s390 shares the syscall and return value register
  s390/ptrace: fix setting syscall number
  s390/ptrace: pass invalid syscall numbers to tracing
  s390/ptrace: return -ENOSYS when invalid syscall is supplied
  s390/seccomp: pass syscall arguments via seccomp_data
  s390/qdio: fine-tune SLSB update
parents 7fdfbe08 b3583fca

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ config NUMA 


config NODES_SHIFT

	int

	depends on NEED_MULTIPLE_NODES

	default "1"



config SCHED_SMT

arch/s390/crypto/prng.c

+7 −7
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static ssize_t prng_chunksize_show(struct device *dev, 
				   struct device_attribute *attr,

				   char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%u\n", prng_chunk_size);

	return scnprintf(buf, PAGE_SIZE, "%u\n", prng_chunk_size);

}

static DEVICE_ATTR(chunksize, 0444, prng_chunksize_show, NULL);
@@ -712,7 +712,7 @@ static ssize_t prng_counter_show(struct device *dev, 
		counter = prng_data->prngws.byte_counter;

	mutex_unlock(&prng_data->mutex);



	return snprintf(buf, PAGE_SIZE, "%llu\n", counter);

	return scnprintf(buf, PAGE_SIZE, "%llu\n", counter);

}

static DEVICE_ATTR(byte_counter, 0444, prng_counter_show, NULL);
@@ -721,7 +721,7 @@ static ssize_t prng_errorflag_show(struct device *dev, 
				   struct device_attribute *attr,

				   char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", prng_errorflag);

	return scnprintf(buf, PAGE_SIZE, "%d\n", prng_errorflag);

}

static DEVICE_ATTR(errorflag, 0444, prng_errorflag_show, NULL);
@@ -731,9 +731,9 @@ static ssize_t prng_mode_show(struct device *dev, 
			      char *buf)

{

	if (prng_mode == PRNG_MODE_TDES)

		return snprintf(buf, PAGE_SIZE, "TDES\n");

		return scnprintf(buf, PAGE_SIZE, "TDES\n");

	else

		return snprintf(buf, PAGE_SIZE, "SHA512\n");

		return scnprintf(buf, PAGE_SIZE, "SHA512\n");

}

static DEVICE_ATTR(mode, 0444, prng_mode_show, NULL);
@@ -756,7 +756,7 @@ static ssize_t prng_reseed_limit_show(struct device *dev, 
				      struct device_attribute *attr,

				      char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%u\n", prng_reseed_limit);

	return scnprintf(buf, PAGE_SIZE, "%u\n", prng_reseed_limit);

}

static ssize_t prng_reseed_limit_store(struct device *dev,

				       struct device_attribute *attr,
@@ -787,7 +787,7 @@ static ssize_t prng_strength_show(struct device *dev, 
				  struct device_attribute *attr,

				  char *buf)

{

	return snprintf(buf, PAGE_SIZE, "256\n");

	return scnprintf(buf, PAGE_SIZE, "256\n");

}

static DEVICE_ATTR(strength, 0444, prng_strength_show, NULL);

arch/s390/include/asm/syscall.h

+11 −1
Original line number Diff line number Diff line
@@ -33,7 +33,17 @@ static inline void syscall_rollback(struct task_struct *task, 
static inline long syscall_get_error(struct task_struct *task,

				     struct pt_regs *regs)

{

	return IS_ERR_VALUE(regs->gprs[2]) ? regs->gprs[2] : 0;

	unsigned long error = regs->gprs[2];

#ifdef CONFIG_COMPAT

	if (test_tsk_thread_flag(task, TIF_31BIT)) {

		/*

		 * Sign-extend the value so (int)-EFOO becomes (long)-EFOO

		 * and will match correctly in comparisons.

		 */

		error = (long)(int)error;

	}

#endif

	return IS_ERR_VALUE(error) ? error : 0;

}



static inline long syscall_get_return_value(struct task_struct *task,

arch/s390/include/asm/vdso.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct vdso_data { 
	__u32 tk_shift;			/* Shift used for xtime_nsec	0x60 */

	__u32 ts_dir;			/* TOD steering direction	0x64 */

	__u64 ts_end;			/* TOD steering end		0x68 */

	__u32 hrtimer_res;		/* hrtimer resolution		0x70 */

};



struct vdso_per_cpu_data {

arch/s390/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ int main(void) 
	OFFSET(__VDSO_TK_SHIFT, vdso_data, tk_shift);

	OFFSET(__VDSO_TS_DIR, vdso_data, ts_dir);

	OFFSET(__VDSO_TS_END, vdso_data, ts_end);

	OFFSET(__VDSO_CLOCK_REALTIME_RES, vdso_data, hrtimer_res);

	OFFSET(__VDSO_ECTG_BASE, vdso_per_cpu_data, ectg_timer_base);

	OFFSET(__VDSO_ECTG_USER, vdso_per_cpu_data, ectg_user_time);

	OFFSET(__VDSO_GETCPU_VAL, vdso_per_cpu_data, getcpu_val);
@@ -86,7 +87,6 @@ int main(void) 
	DEFINE(__CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE);

	DEFINE(__CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE);

	DEFINE(__CLOCK_THREAD_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID);

	DEFINE(__CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);

	DEFINE(__CLOCK_COARSE_RES, LOW_RES_NSEC);

	BLANK();

	/* idle data offsets */

CRA Git | Maintained and supported by SUSTech CRA and CCSE