evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[S390] kprobes: instruction swap

Browse source 
Move the definition of the helper structure ins_replace_args to the
only place where it is used and drop the old member as it is not needed.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky 2011-01-05 12:47:18 +01:00 • committed by Martin Schwidefsky
parent fc0a1fea6b
commit 5a8b589f8a
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/s390/include/asm/kprobes.h
View file

@ -64,11 +64,6 @@ struct arch_specific_insn {
int reg; int reg;
}; };
struct ins_replace_args {
kprobe_opcode_t *ptr;
kprobe_opcode_t old;
kprobe_opcode_t new;
};
struct prev_kprobe { struct prev_kprobe {
struct kprobe *kp; struct kprobe *kp;
unsigned long status; unsigned long status;

16
arch/s390/kernel/kprobes.c
View file

@ -157,17 +157,21 @@ void __kprobes get_instruction_type(struct arch_specific_insn *ainsn)
} }
} }
struct ins_replace_args {
kprobe_opcode_t *ptr;
kprobe_opcode_t opcode;
};
static int __kprobes swap_instruction(void *aref) static int __kprobes swap_instruction(void *aref)
{ {
struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
unsigned long status = kcb->kprobe_status; unsigned long status = kcb->kprobe_status;
struct ins_replace_args *args = aref; struct ins_replace_args *args = aref;
int rc;
kcb->kprobe_status = KPROBE_SWAP_INST; kcb->kprobe_status = KPROBE_SWAP_INST;
rc = probe_kernel_write(args->ptr, &args->new, sizeof(args->new)); probe_kernel_write(args->ptr, &args->opcode, sizeof(args->opcode));
kcb->kprobe_status = status; kcb->kprobe_status = status;
return rc; return 0;
} }
void __kprobes arch_arm_kprobe(struct kprobe *p) void __kprobes arch_arm_kprobe(struct kprobe *p)
@ -175,8 +179,7 @@ void __kprobes arch_arm_kprobe(struct kprobe *p)
struct ins_replace_args args; struct ins_replace_args args;
args.ptr = p->addr; args.ptr = p->addr;
args.old = p->opcode; args.opcode = BREAKPOINT_INSTRUCTION;
args.new = BREAKPOINT_INSTRUCTION;
stop_machine(swap_instruction, &args, NULL); stop_machine(swap_instruction, &args, NULL);
} }
@ -185,8 +188,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
struct ins_replace_args args; struct ins_replace_args args;
args.ptr = p->addr; args.ptr = p->addr;
args.old = BREAKPOINT_INSTRUCTION; args.opcode = p->opcode;
args.new = p->opcode;
stop_machine(swap_instruction, &args, NULL); stop_machine(swap_instruction, &args, NULL);
} }