Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 371db06b authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Martin Schwidefsky
Browse files

[S390] kprobes: insn slots 



The s390 architecture can execute code on kmalloc/vmalloc memory.
No need for the __ARCH_WANT_KPROBES_INSN_SLOT detour.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b9599798

arch/s390/include/asm/kprobes.h

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/ptrace.h>

#include <linux/percpu.h>



#define  __ARCH_WANT_KPROBES_INSN_SLOT

struct pt_regs;

struct kprobe;
@@ -58,7 +57,7 @@ typedef u16 kprobe_opcode_t; 
/* Architecture specific copy of original instruction */

struct arch_specific_insn {

	/* copy of original instruction */

	kprobe_opcode_t *insn;

	kprobe_opcode_t insn[MAX_INSN_SIZE];

};



struct prev_kprobe {

arch/s390/kernel/kprobes.c

+0 −8
Original line number Diff line number Diff line
@@ -126,10 +126,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
	if (is_prohibited_opcode((kprobe_opcode_t *) p->addr))

		return -EINVAL;



	/* Use the get_insn_slot() facility for correctness */

	if (!(p->ainsn.insn = get_insn_slot()))

		return -ENOMEM;



	p->opcode = *p->addr;

	memcpy(p->ainsn.insn, p->addr, ((p->opcode >> 14) + 3) & -2);
@@ -173,10 +169,6 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p) 


void __kprobes arch_remove_kprobe(struct kprobe *p)

{

	if (p->ainsn.insn) {

		free_insn_slot(p->ainsn.insn, 0);

		p->ainsn.insn = NULL;

	}

}



static void __kprobes enable_singlestep(struct kprobe_ctlblk *kcb,