Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] Kprobes/IA64: kdebug die notification mechanism

As many of you know that kprobes exist in the main line kernel for various
architecture including i386, x86_64, ppc64 and sparc64. Attached patches
following this mail are a port of Kprobes and Jprobes for IA64.

I have tesed this patches for kprobes and Jprobes and this seems to work fine.
I have tested this patch by inserting kprobes on various slots and various
templates including various types of branch instructions.

I have also tested this patch using the tool
http://marc.theaimsgroup.com/?l=linux-kernel&m=111657358022586&w=2 and the
kprobes for IA64 works great.

Here is list of TODO things and pathes for the same will appear soon.

1) Support kprobes on "mov r1=ip" type of instruction
2) Support Kprobes and Jprobes to exist on the same address
3) Support Return probes
3) Architecture independent cleanup of kprobes

This patch adds the kdebug die notification mechanism needed by Kprobes.

For break instruction on Branch type slot, imm21 is ignored and value
zero is placed in IIM register, hence we need to handle kprobes
for switch case zero.

Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Rusty Lynch <Rusty.lynch@intel.com>

From: Rusty Lynch <rusty.lynch@intel.com>

At the point in traps.c where we recieve a break with a zero value, we can
not say if the break was a result of a kprobe or some other debug facility.

This simple patch changes the informational string to a more correct "break
0" value, and applies to the 2.6.12-rc2-mm2 tree with all the kprobes
patches that were just recently included for the next mm cut.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Anil S Keshavamurthy and committed by
Linus Torvalds
7213b252 0aa55e4d

+103 -1
+32 -1
arch/ia64/kernel/traps.c
··· 21 21 #include <asm/intrinsics.h> 22 22 #include <asm/processor.h> 23 23 #include <asm/uaccess.h> 24 + #include <asm/kdebug.h> 24 25 25 26 extern spinlock_t timerlist_lock; 26 27 27 28 fpswa_interface_t *fpswa_interface; 28 29 EXPORT_SYMBOL(fpswa_interface); 30 + 31 + struct notifier_block *ia64die_chain; 32 + static DEFINE_SPINLOCK(die_notifier_lock); 33 + 34 + int register_die_notifier(struct notifier_block *nb) 35 + { 36 + int err = 0; 37 + unsigned long flags; 38 + spin_lock_irqsave(&die_notifier_lock, flags); 39 + err = notifier_chain_register(&ia64die_chain, nb); 40 + spin_unlock_irqrestore(&die_notifier_lock, flags); 41 + return err; 42 + } 29 43 30 44 void __init 31 45 trap_init (void) ··· 151 137 152 138 switch (break_num) { 153 139 case 0: /* unknown error (used by GCC for __builtin_abort()) */ 140 + if (notify_die(DIE_BREAK, "break 0", regs, break_num, TRAP_BRKPT, SIGTRAP) 141 + == NOTIFY_STOP) { 142 + return; 143 + } 154 144 die_if_kernel("bugcheck!", regs, break_num); 155 145 sig = SIGILL; code = ILL_ILLOPC; 156 146 break; ··· 205 187 206 188 case 0x3f000 ... 0x3ffff: /* bundle-update in progress */ 207 189 sig = SIGILL; code = __ILL_BNDMOD; 190 + break; 191 + 192 + case 0x80200: 193 + case 0x80300: 194 + if (notify_die(DIE_BREAK, "kprobe", regs, break_num, TRAP_BRKPT, SIGTRAP) 195 + == NOTIFY_STOP) { 196 + return; 197 + } 198 + sig = SIGTRAP; code = TRAP_BRKPT; 208 199 break; 209 200 210 201 default: ··· 575 548 #endif 576 549 break; 577 550 case 35: siginfo.si_code = TRAP_BRANCH; ifa = 0; break; 578 - case 36: siginfo.si_code = TRAP_TRACE; ifa = 0; break; 551 + case 36: 552 + if (notify_die(DIE_SS, "ss", &regs, vector, 553 + vector, SIGTRAP) == NOTIFY_STOP) 554 + return; 555 + siginfo.si_code = TRAP_TRACE; ifa = 0; break; 579 556 } 580 557 siginfo.si_signo = SIGTRAP; 581 558 siginfo.si_errno = 0;
+8
arch/ia64/mm/fault.c
··· 14 14 #include <asm/processor.h> 15 15 #include <asm/system.h> 16 16 #include <asm/uaccess.h> 17 + #include <asm/kdebug.h> 17 18 18 19 extern void die (char *, struct pt_regs *, long); 19 20 ··· 102 101 if ((REGION_NUMBER(address) == 5) && !user_mode(regs)) 103 102 goto bad_area_no_up; 104 103 #endif 104 + 105 + /* 106 + * This is to handle the kprobes on user space access instructions 107 + */ 108 + if (notify_die(DIE_PAGE_FAULT, "page fault", regs, code, TRAP_BRKPT, 109 + SIGSEGV) == NOTIFY_STOP) 110 + return; 105 111 106 112 down_read(&mm->mmap_sem); 107 113
+2
include/asm-ia64/break.h
··· 12 12 * OS-specific debug break numbers: 13 13 */ 14 14 #define __IA64_BREAK_KDB 0x80100 15 + #define __IA64_BREAK_KPROBE 0x80200 16 + #define __IA64_BREAK_JPROBE 0x80300 15 17 16 18 /* 17 19 * OS-specific break numbers:
+61
include/asm-ia64/kdebug.h
··· 1 + #ifndef _IA64_KDEBUG_H 2 + #define _IA64_KDEBUG_H 1 3 + /* 4 + * include/asm-ia64/kdebug.h 5 + * 6 + * This program is free software; you can redistribute it and/or modify 7 + * it under the terms of the GNU General Public License as published by 8 + * the Free Software Foundation; either version 2 of the License, or 9 + * (at your option) any later version. 10 + * 11 + * This program is distributed in the hope that it will be useful, 12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 + * GNU General Public License for more details. 15 + * 16 + * You should have received a copy of the GNU General Public License 17 + * along with this program; if not, write to the Free Software 18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 + * 20 + * Copyright (C) Intel Corporation, 2005 21 + * 22 + * 2005-Apr Rusty Lynch <rusty.lynch@intel.com> and Anil S Keshavamurthy 23 + * <anil.s.keshavamurthy@intel.com> adopted from 24 + * include/asm-x86_64/kdebug.h 25 + */ 26 + #include <linux/notifier.h> 27 + 28 + struct pt_regs; 29 + 30 + struct die_args { 31 + struct pt_regs *regs; 32 + const char *str; 33 + long err; 34 + int trapnr; 35 + int signr; 36 + }; 37 + 38 + int register_die_notifier(struct notifier_block *nb); 39 + extern struct notifier_block *ia64die_chain; 40 + 41 + enum die_val { 42 + DIE_BREAK = 1, 43 + DIE_SS, 44 + DIE_PAGE_FAULT, 45 + }; 46 + 47 + static inline int notify_die(enum die_val val, char *str, struct pt_regs *regs, 48 + long err, int trap, int sig) 49 + { 50 + struct die_args args = { 51 + .regs = regs, 52 + .str = str, 53 + .err = err, 54 + .trapnr = trap, 55 + .signr = sig 56 + }; 57 + 58 + return notifier_call_chain(&ia64die_chain, val, &args); 59 + } 60 + 61 + #endif