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

Merge tag 's390-5.9-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Vasily Gorbik:

 - Fix order in trace_hardirqs_off_caller() to make locking state
   consistent even if the IRQ tracer calls into lockdep again. Touches
   common code. Acked-by Peter Zijlstra.

 - Correctly handle secure storage violation exception to avoid kernel
   panic triggered by user space misbehaviour.

 - Switch the idle->seqcount over to using raw_write_*() to avoid
  "suspicious RCU usage".

 - Fix memory leaks on hard unplug in pci code.

 - Use kvmalloc instead of kmalloc for larger allocations in zcrypt.

 - Add few missing __init annotations to static functions to avoid
   section mismatch complains when functions are not inlined.

* tag 's390-5.9-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: add 3f program exception handler
  lockdep: fix order in trace_hardirqs_off_caller()
  s390/pci: fix leak of DMA tables on hard unplug
  s390/init: add missing __init annotations
  s390/zcrypt: fix kmalloc 256k failure
  s390/idle: fix suspicious RCU usage
parents 92ab97ad cd4d3d5f

arch/s390/kernel/entry.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ void do_protection_exception(struct pt_regs *regs); 
void do_dat_exception(struct pt_regs *regs);

void do_secure_storage_access(struct pt_regs *regs);

void do_non_secure_storage_access(struct pt_regs *regs);

void do_secure_storage_violation(struct pt_regs *regs);



void addressing_exception(struct pt_regs *regs);

void data_exception(struct pt_regs *regs);

arch/s390/kernel/idle.c

+2 −3
Original line number Diff line number Diff line
@@ -39,14 +39,13 @@ void enabled_wait(void) 
	local_irq_restore(flags);



	/* Account time spent with enabled wait psw loaded as idle time. */

	/* XXX seqcount has tracepoints that require RCU */

	write_seqcount_begin(&idle->seqcount);

	raw_write_seqcount_begin(&idle->seqcount);

	idle_time = idle->clock_idle_exit - idle->clock_idle_enter;

	idle->clock_idle_enter = idle->clock_idle_exit = 0ULL;

	idle->idle_time += idle_time;

	idle->idle_count++;

	account_idle_time(cputime_to_nsecs(idle_time));

	write_seqcount_end(&idle->seqcount);

	raw_write_seqcount_end(&idle->seqcount);

}

NOKPROBE_SYMBOL(enabled_wait);

arch/s390/kernel/pgm_check.S

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ PGM_CHECK(do_dat_exception) /* 3b */ 
PGM_CHECK_DEFAULT			/* 3c */

PGM_CHECK(do_secure_storage_access)	/* 3d */

PGM_CHECK(do_non_secure_storage_access)	/* 3e */

PGM_CHECK_DEFAULT			/* 3f */

PGM_CHECK(do_secure_storage_violation)	/* 3f */

PGM_CHECK(monitor_event_exception)	/* 40 */

PGM_CHECK_DEFAULT			/* 41 */

PGM_CHECK_DEFAULT			/* 42 */

arch/s390/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static struct notifier_block kdump_mem_nb = { 
/*

 * Make sure that the area behind memory_end is protected

 */

static void reserve_memory_end(void)

static void __init reserve_memory_end(void)

{

	if (memory_end_set)

		memblock_reserve(memory_end, ULONG_MAX);
@@ -628,7 +628,7 @@ static void reserve_memory_end(void) 
/*

 * Make sure that oldmem, where the dump is stored, is protected

 */

static void reserve_oldmem(void)

static void __init reserve_oldmem(void)

{

#ifdef CONFIG_CRASH_DUMP

	if (OLDMEM_BASE)
@@ -640,7 +640,7 @@ static void reserve_oldmem(void) 
/*

 * Make sure that oldmem, where the dump is stored, is protected

 */

static void remove_oldmem(void)

static void __init remove_oldmem(void)

{

#ifdef CONFIG_CRASH_DUMP

	if (OLDMEM_BASE)

arch/s390/mm/fault.c

+20 −0
Original line number Diff line number Diff line
@@ -859,6 +859,21 @@ void do_non_secure_storage_access(struct pt_regs *regs) 
}

NOKPROBE_SYMBOL(do_non_secure_storage_access);



void do_secure_storage_violation(struct pt_regs *regs)

{

	/*

	 * Either KVM messed up the secure guest mapping or the same

	 * page is mapped into multiple secure guests.

	 *

	 * This exception is only triggered when a guest 2 is running

	 * and can therefore never occur in kernel context.

	 */

	printk_ratelimited(KERN_WARNING

			   "Secure storage violation in task: %s, pid %d\n",

			   current->comm, current->pid);

	send_sig(SIGSEGV, current, 0);

}



#else

void do_secure_storage_access(struct pt_regs *regs)

{
@@ -869,4 +884,9 @@ void do_non_secure_storage_access(struct pt_regs *regs) 
{

	default_trap_handler(regs);

}



void do_secure_storage_violation(struct pt_regs *regs)

{

	default_trap_handler(regs);

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE