Commit 81d55984 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Vasily Gorbik:

 - Add support for KASAN_VMALLOC feature.

 - Remove the last user of problematic diag 0x44 call.

 - Adjust sampling interval and avoid sample data block overflow
   condition on pressure in perf code.

 - Prefer EOPNOTSUPP over ENOTSUPP and comments fixes.

* tag 's390-5.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/kasan: add KASAN_VMALLOC support
  s390: remove last diag 0x44 caller
  s390/uv: use EOPNOTSUPP instead of ENOTSUPP
  s390/cpum_sf: Avoid SBD overflow condition in irq handler
  s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits
  s390/test_unwind: fix spelling mistake "reqister" -> "register"
  s390/spinlock: remove confusing comment in arch_spin_lock_wait
parents f791ede3 3e39ce26

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ config S390 
	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_JUMP_LABEL_RELATIVE

	select HAVE_ARCH_KASAN

	select HAVE_ARCH_KASAN_VMALLOC

	select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_SOFT_DIRTY

arch/s390/include/asm/setup.h

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#define MACHINE_FLAG_DIAG9C	BIT(3)

#define MACHINE_FLAG_ESOP	BIT(4)

#define MACHINE_FLAG_IDTE	BIT(5)

#define MACHINE_FLAG_DIAG44	BIT(6)

#define MACHINE_FLAG_EDAT1	BIT(7)

#define MACHINE_FLAG_EDAT2	BIT(8)

#define MACHINE_FLAG_TOPOLOGY	BIT(10)
@@ -94,7 +93,6 @@ extern unsigned long __swsusp_reset_dma; 
#define MACHINE_HAS_DIAG9C	(S390_lowcore.machine_flags & MACHINE_FLAG_DIAG9C)

#define MACHINE_HAS_ESOP	(S390_lowcore.machine_flags & MACHINE_FLAG_ESOP)

#define MACHINE_HAS_IDTE	(S390_lowcore.machine_flags & MACHINE_FLAG_IDTE)

#define MACHINE_HAS_DIAG44	(S390_lowcore.machine_flags & MACHINE_FLAG_DIAG44)

#define MACHINE_HAS_EDAT1	(S390_lowcore.machine_flags & MACHINE_FLAG_EDAT1)

#define MACHINE_HAS_EDAT2	(S390_lowcore.machine_flags & MACHINE_FLAG_EDAT2)

#define MACHINE_HAS_TOPOLOGY	(S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY)

arch/s390/include/asm/uv.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline int share(unsigned long addr, u16 cmd) 
	};



	if (!is_prot_virt_guest())

		return -ENOTSUPP;

		return -EOPNOTSUPP;

	/*

	 * Sharing is page wise, if we encounter addresses that are

	 * not page aligned, we assume something went wrong. If

arch/s390/kernel/early.c

+0 −16
Original line number Diff line number Diff line
@@ -204,21 +204,6 @@ static __init void detect_diag9c(void) 
		S390_lowcore.machine_flags |= MACHINE_FLAG_DIAG9C;

}



static __init void detect_diag44(void)

{

	int rc;



	diag_stat_inc(DIAG_STAT_X044);

	asm volatile(

		"	diag	0,0,0x44\n"

		"0:	la	%0,0\n"

		"1:\n"

		EX_TABLE(0b,1b)

		: "=d" (rc) : "0" (-EOPNOTSUPP) : "cc");

	if (!rc)

		S390_lowcore.machine_flags |= MACHINE_FLAG_DIAG44;

}



static __init void detect_machine_facilities(void)

{

	if (test_facility(8)) {
@@ -331,7 +316,6 @@ void __init startup_init(void) 
	setup_arch_string();

	setup_boot_command_line();

	detect_diag9c();

	detect_diag44();

	detect_machine_facilities();

	save_vector_registers();

	setup_topology();

arch/s390/kernel/perf_cpum_sf.c

+16 −6
Original line number Diff line number Diff line
@@ -1303,18 +1303,28 @@ static void hw_perf_event_update(struct perf_event *event, int flush_all) 
		 */

		if (flush_all && done)

			break;



		/* If an event overflow happened, discard samples by

		 * processing any remaining sample-data-blocks.

		 */

		if (event_overflow)

			flush_all = 1;

	}



	/* Account sample overflows in the event hardware structure */

	if (sampl_overflow)

		OVERFLOW_REG(hwc) = DIV_ROUND_UP(OVERFLOW_REG(hwc) +

						 sampl_overflow, 1 + num_sdb);



	/* Perf_event_overflow() and perf_event_account_interrupt() limit

	 * the interrupt rate to an upper limit. Roughly 1000 samples per

	 * task tick.

	 * Hitting this limit results in a large number

	 * of throttled REF_REPORT_THROTTLE entries and the samples

	 * are dropped.

	 * Slightly increase the interval to avoid hitting this limit.

	 */

	if (event_overflow) {

		SAMPL_RATE(hwc) += DIV_ROUND_UP(SAMPL_RATE(hwc), 10);

		debug_sprintf_event(sfdbg, 1, "%s: rate adjustment %ld\n",

				    __func__,

				    DIV_ROUND_UP(SAMPL_RATE(hwc), 10));

	}



	if (sampl_overflow || event_overflow)

		debug_sprintf_event(sfdbg, 4, "%s: "

				    "overflows: sample %llu event %llu"

CRA Git | Maintained and supported by SUSTech CRA and CCSE