[PATCH] Kprobes ia64 qp fix
Fix a bug where a kprobe still fires when the instruction is predicated off. So given the p6=0, and we have an instruction like: (p6) move loc1=0 we should not be triggering the kprobe. This is handled by carrying over the qp section of the original instruction into the break instruction. Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Signed-off-by: Rusty Lynch <Rusty.lynch@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
8bc76772ad
commit
13608d6433
|
@ -115,19 +115,19 @@ int arch_prepare_kprobe(struct kprobe *p)
|
|||
case 0:
|
||||
major_opcode = (bundle->quad0.slot0 >> SLOT0_OPCODE_SHIFT);
|
||||
kprobe_inst = bundle->quad0.slot0;
|
||||
bundle->quad0.slot0 = BREAK_INST;
|
||||
bundle->quad0.slot0 = BREAK_INST | (0x3f & kprobe_inst);
|
||||
break;
|
||||
case 1:
|
||||
major_opcode = (bundle->quad1.slot1_p1 >> SLOT1_p1_OPCODE_SHIFT);
|
||||
kprobe_inst = (bundle->quad0.slot1_p0 |
|
||||
(bundle->quad1.slot1_p1 << (64-46)));
|
||||
bundle->quad0.slot1_p0 = BREAK_INST;
|
||||
bundle->quad0.slot1_p0 = BREAK_INST | (0x3f & kprobe_inst);
|
||||
bundle->quad1.slot1_p1 = (BREAK_INST >> (64-46));
|
||||
break;
|
||||
case 2:
|
||||
major_opcode = (bundle->quad1.slot2 >> SLOT2_OPCODE_SHIFT);
|
||||
kprobe_inst = bundle->quad1.slot2;
|
||||
bundle->quad1.slot2 = BREAK_INST;
|
||||
bundle->quad1.slot2 = BREAK_INST | (0x3f & kprobe_inst);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue