Commit 1334ac11 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 s390 fixes from Martin Schwidefsky:
 "A couple of bug fixes:

   - correct some CPU-MF counter names for z13 and z14

   - correct locking in the vfio-ccw fsm_io_helper function

   - provide arch_uretprobe_is_alive to avoid sigsegv with uretprobes

   - fix a corner case with CPU-MF sampling in regard to execve

   - fix expoline code revert for loadable modules

   - update chpid descriptor for resource accessibility events

   - fix dasd I/O errors due to outdated device alias infomation"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: correct module section names for expoline code revert
  vfio: ccw: process ssch with interrupts disabled
  s390: update sampling tag after task pid change
  s390/cpum_cf: rename IBM z13/z14 counter names
  s390/dasd: fix IO error for newly defined devices
  s390/uprobes: implement arch_uretprobe_is_alive()
  s390/cio: update chpid descriptor after resource accessibility event
parents 69bfd470 6cf09958

arch/s390/include/asm/thread_info.h

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ struct thread_info { 
void arch_release_task_struct(struct task_struct *tsk);

int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);



void arch_setup_new_exec(void);

#define arch_setup_new_exec arch_setup_new_exec



#endif



/*

arch/s390/kernel/module.c

+2 −2
Original line number Diff line number Diff line
@@ -465,11 +465,11 @@ int module_finalize(const Elf_Ehdr *hdr, 
			apply_alternatives(aseg, aseg + s->sh_size);



		if (IS_ENABLED(CONFIG_EXPOLINE) &&

		    (!strcmp(".nospec_call_table", secname)))

		    (!strncmp(".s390_indirect", secname, 14)))

			nospec_revert(aseg, aseg + s->sh_size);



		if (IS_ENABLED(CONFIG_EXPOLINE) &&

		    (!strcmp(".nospec_return_table", secname)))

		    (!strncmp(".s390_return", secname, 12)))

			nospec_revert(aseg, aseg + s->sh_size);

	}

arch/s390/kernel/perf_cpum_cf_events.c

+4 −4
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ CPUMF_EVENT_ATTR(cf_zec12, L1I_OFFBOOK_L3_SOURCED_WRITES_IV, 0x00a1); 
CPUMF_EVENT_ATTR(cf_zec12, TX_NC_TABORT, 0x00b1);

CPUMF_EVENT_ATTR(cf_zec12, TX_C_TABORT_NO_SPECIAL, 0x00b2);

CPUMF_EVENT_ATTR(cf_zec12, TX_C_TABORT_SPECIAL, 0x00b3);

CPUMF_EVENT_ATTR(cf_z13, L1D_WRITES_RO_EXCL, 0x0080);

CPUMF_EVENT_ATTR(cf_z13, L1D_RO_EXCL_WRITES, 0x0080);

CPUMF_EVENT_ATTR(cf_z13, DTLB1_WRITES, 0x0081);

CPUMF_EVENT_ATTR(cf_z13, DTLB1_MISSES, 0x0082);

CPUMF_EVENT_ATTR(cf_z13, DTLB1_HPAGE_WRITES, 0x0083);
@@ -179,7 +179,7 @@ CPUMF_EVENT_ATTR(cf_z13, TX_C_TABORT_NO_SPECIAL, 0x00db); 
CPUMF_EVENT_ATTR(cf_z13, TX_C_TABORT_SPECIAL, 0x00dc);

CPUMF_EVENT_ATTR(cf_z13, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0);

CPUMF_EVENT_ATTR(cf_z13, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1);

CPUMF_EVENT_ATTR(cf_z14, L1D_WRITES_RO_EXCL, 0x0080);

CPUMF_EVENT_ATTR(cf_z14, L1D_RO_EXCL_WRITES, 0x0080);

CPUMF_EVENT_ATTR(cf_z14, DTLB2_WRITES, 0x0081);

CPUMF_EVENT_ATTR(cf_z14, DTLB2_MISSES, 0x0082);

CPUMF_EVENT_ATTR(cf_z14, DTLB2_HPAGE_WRITES, 0x0083);
@@ -371,7 +371,7 @@ static struct attribute *cpumcf_zec12_pmu_event_attr[] __initdata = { 
};



static struct attribute *cpumcf_z13_pmu_event_attr[] __initdata = {

	CPUMF_EVENT_PTR(cf_z13, L1D_WRITES_RO_EXCL),

	CPUMF_EVENT_PTR(cf_z13, L1D_RO_EXCL_WRITES),

	CPUMF_EVENT_PTR(cf_z13, DTLB1_WRITES),

	CPUMF_EVENT_PTR(cf_z13, DTLB1_MISSES),

	CPUMF_EVENT_PTR(cf_z13, DTLB1_HPAGE_WRITES),
@@ -431,7 +431,7 @@ static struct attribute *cpumcf_z13_pmu_event_attr[] __initdata = { 
};



static struct attribute *cpumcf_z14_pmu_event_attr[] __initdata = {

	CPUMF_EVENT_PTR(cf_z14, L1D_WRITES_RO_EXCL),

	CPUMF_EVENT_PTR(cf_z14, L1D_RO_EXCL_WRITES),

	CPUMF_EVENT_PTR(cf_z14, DTLB2_WRITES),

	CPUMF_EVENT_PTR(cf_z14, DTLB2_MISSES),

	CPUMF_EVENT_PTR(cf_z14, DTLB2_HPAGE_WRITES),

arch/s390/kernel/process.c

+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/random.h>

#include <linux/export.h>

#include <linux/init_task.h>

#include <asm/cpu_mf.h>

#include <asm/io.h>

#include <asm/processor.h>

#include <asm/vtimer.h>
@@ -48,6 +49,15 @@ void flush_thread(void) 
{

}



void arch_setup_new_exec(void)

{

	if (S390_lowcore.current_pid != current->pid) {

		S390_lowcore.current_pid = current->pid;

		if (test_facility(40))

			lpp(&S390_lowcore.lpp);

	}

}



void arch_release_task_struct(struct task_struct *tsk)

{

	runtime_instr_release(tsk);

arch/s390/kernel/uprobes.c

+9 −0
Original line number Diff line number Diff line
@@ -150,6 +150,15 @@ unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline, 
	return orig;

}



bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check ctx,

			     struct pt_regs *regs)

{

	if (ctx == RP_CHECK_CHAIN_CALL)

		return user_stack_pointer(regs) <= ret->stack;

	else

		return user_stack_pointer(regs) < ret->stack;

}



/* Instruction Emulation */



static void adjust_psw_addr(psw_t *psw, unsigned long len)

CRA Git | Maintained and supported by SUSTech CRA and CCSE