lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: kprobes SMP support.

Browse Source 
Presently kprobes support relies on several saved opcode variables for
saving and restoring state, without any specific locking. This is
inherently racy on SMP, and given that we already use per-CPU variables
for everything else, convert these over too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2010-06-14 17:06:10 +09:00
parent da28c59799
commit 57fcfdf9b2
1 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
arch/sh/kernel/kprobes.c
View File

@@ -20,9 +20,9 @@
DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
static struct kprobe saved_current_opcode; static DEFINE_PER_CPU(struct kprobe, saved_current_opcode);
static struct kprobe saved_next_opcode; static DEFINE_PER_CPU(struct kprobe, saved_next_opcode);
static struct kprobe saved_next_opcode2; static DEFINE_PER_CPU(struct kprobe, saved_next_opcode2);
#define OPCODE_JMP(x) (((x) & 0xF0FF) == 0x402b) #define OPCODE_JMP(x) (((x) & 0xF0FF) == 0x402b)
#define OPCODE_JSR(x) (((x) & 0xF0FF) == 0x400b) #define OPCODE_JSR(x) (((x) & 0xF0FF) == 0x400b)
@@ -102,16 +102,21 @@ int __kprobes kprobe_handle_illslot(unsigned long pc)
void __kprobes arch_remove_kprobe(struct kprobe *p) void __kprobes arch_remove_kprobe(struct kprobe *p)
{ {
if (saved_next_opcode.addr != 0x0) { struct kprobe *saved = &__get_cpu_var(saved_next_opcode);
arch_disarm_kprobe(p);
arch_disarm_kprobe(&saved_next_opcode);
saved_next_opcode.addr = 0x0;
saved_next_opcode.opcode = 0x0;
if (saved_next_opcode2.addr != 0x0) { if (saved->addr) {
arch_disarm_kprobe(&saved_next_opcode2); arch_disarm_kprobe(p);
saved_next_opcode2.addr = 0x0; arch_disarm_kprobe(saved);
saved_next_opcode2.opcode = 0x0;
saved->addr = NULL;
saved->opcode = 0;
saved = &__get_cpu_var(saved_next_opcode2);
if (saved->addr) {
arch_disarm_kprobe(saved);
saved->addr = NULL;
saved->opcode = 0;
} }
} }
} }
@@ -141,57 +146,59 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
*/ */
static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs) static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
{ {
kprobe_opcode_t *addr = NULL; __get_cpu_var(saved_current_opcode).addr = (kprobe_opcode_t *)regs->pc;
saved_current_opcode.addr = (kprobe_opcode_t *) (regs->pc);
addr = saved_current_opcode.addr;
if (p != NULL) { if (p != NULL) {
struct kprobe *op1, *op2;
arch_disarm_kprobe(p); arch_disarm_kprobe(p);
op1 = &__get_cpu_var(saved_next_opcode);
op2 = &__get_cpu_var(saved_next_opcode2);
if (OPCODE_JSR(p->opcode) || OPCODE_JMP(p->opcode)) { if (OPCODE_JSR(p->opcode) || OPCODE_JMP(p->opcode)) {
unsigned int reg_nr = ((p->opcode >> 8) & 0x000F); unsigned int reg_nr = ((p->opcode >> 8) & 0x000F);
saved_next_opcode.addr = op1->addr = (kprobe_opcode_t *) regs->regs[reg_nr];
(kprobe_opcode_t *) regs->regs[reg_nr];
} else if (OPCODE_BRA(p->opcode) || OPCODE_BSR(p->opcode)) { } else if (OPCODE_BRA(p->opcode) || OPCODE_BSR(p->opcode)) {
unsigned long disp = (p->opcode & 0x0FFF); unsigned long disp = (p->opcode & 0x0FFF);
saved_next_opcode.addr = op1->addr =
(kprobe_opcode_t *) (regs->pc + 4 + disp * 2); (kprobe_opcode_t *) (regs->pc + 4 + disp * 2);
} else if (OPCODE_BRAF(p->opcode) || OPCODE_BSRF(p->opcode)) { } else if (OPCODE_BRAF(p->opcode) || OPCODE_BSRF(p->opcode)) {
unsigned int reg_nr = ((p->opcode >> 8) & 0x000F); unsigned int reg_nr = ((p->opcode >> 8) & 0x000F);
saved_next_opcode.addr = op1->addr =
(kprobe_opcode_t *) (regs->pc + 4 + (kprobe_opcode_t *) (regs->pc + 4 +
regs->regs[reg_nr]); regs->regs[reg_nr]);
} else if (OPCODE_RTS(p->opcode)) { } else if (OPCODE_RTS(p->opcode)) {
saved_next_opcode.addr = (kprobe_opcode_t *) regs->pr; op1->addr = (kprobe_opcode_t *) regs->pr;
} else if (OPCODE_BF(p->opcode) || OPCODE_BT(p->opcode)) { } else if (OPCODE_BF(p->opcode) || OPCODE_BT(p->opcode)) {
unsigned long disp = (p->opcode & 0x00FF); unsigned long disp = (p->opcode & 0x00FF);
/* case 1 */ /* case 1 */
saved_next_opcode.addr = p->addr + 1; op1->addr = p->addr + 1;
/* case 2 */ /* case 2 */
saved_next_opcode2.addr = op2->addr =
(kprobe_opcode_t *) (regs->pc + 4 + disp * 2); (kprobe_opcode_t *) (regs->pc + 4 + disp * 2);
saved_next_opcode2.opcode = *(saved_next_opcode2.addr); op2->opcode = *(op2->addr);
arch_arm_kprobe(&saved_next_opcode2); arch_arm_kprobe(op2);
} else if (OPCODE_BF_S(p->opcode) || OPCODE_BT_S(p->opcode)) { } else if (OPCODE_BF_S(p->opcode) || OPCODE_BT_S(p->opcode)) {
unsigned long disp = (p->opcode & 0x00FF); unsigned long disp = (p->opcode & 0x00FF);
/* case 1 */ /* case 1 */
saved_next_opcode.addr = p->addr + 2; op1->addr = p->addr + 2;
/* case 2 */ /* case 2 */
saved_next_opcode2.addr = op2->addr =
(kprobe_opcode_t *) (regs->pc + 4 + disp * 2); (kprobe_opcode_t *) (regs->pc + 4 + disp * 2);
saved_next_opcode2.opcode = *(saved_next_opcode2.addr); op2->opcode = *(op2->addr);
arch_arm_kprobe(&saved_next_opcode2); arch_arm_kprobe(op2);
} else { } else {
saved_next_opcode.addr = p->addr + 1; op1->addr = p->addr + 1;
} }
saved_next_opcode.opcode = *(saved_next_opcode.addr); op1->opcode = *(op1->addr);
arch_arm_kprobe(&saved_next_opcode); arch_arm_kprobe(op1);
} }
} }
@@ -376,21 +383,23 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs)
cur->post_handler(cur, regs, 0); cur->post_handler(cur, regs, 0);
} }
if (saved_next_opcode.addr != 0x0) { p = &__get_cpu_var(saved_next_opcode);
arch_disarm_kprobe(&saved_next_opcode); if (p->addr) {
saved_next_opcode.addr = 0x0; arch_disarm_kprobe(p);
saved_next_opcode.opcode = 0x0; p->addr = NULL;
p->opcode = 0;
addr = saved_current_opcode.addr; addr = __get_cpu_var(saved_current_opcode).addr;
saved_current_opcode.addr = 0x0; __get_cpu_var(saved_current_opcode).addr = NULL;
p = get_kprobe(addr); p = get_kprobe(addr);
arch_arm_kprobe(p); arch_arm_kprobe(p);
if (saved_next_opcode2.addr != 0x0) { p = &__get_cpu_var(saved_next_opcode2);
arch_disarm_kprobe(&saved_next_opcode2); if (p->addr) {
saved_next_opcode2.addr = 0x0; arch_disarm_kprobe(p);
saved_next_opcode2.opcode = 0x0; p->addr = NULL;
p->opcode = 0;
} }
} }
@@ -572,14 +581,5 @@ static struct kprobe trampoline_p = {
int __init arch_init_kprobes(void) int __init arch_init_kprobes(void)
{ {
saved_next_opcode.addr = 0x0;
saved_next_opcode.opcode = 0x0;
saved_current_opcode.addr = 0x0;
saved_current_opcode.opcode = 0x0;
saved_next_opcode2.addr = 0x0;
saved_next_opcode2.opcode = 0x0;
return register_kprobe(&trampoline_p); return register_kprobe(&trampoline_p);
} }