lkml.org 
[lkml]   [2004]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [3/3] PATCH Kprobes for x86_64- 2.6.9-final
    [3/3] kprobes-arch-sparc64-changes.patch


    Minor changes required to port kprobes for x86_64.

    Signed-off-by: Prasanna S Panchamukhi <prasanna@in.ibm.com>



    ---

    linux-2.6.9-final-prasanna/arch/sparc64/kernel/kprobes.c | 28 ++++++++++-----
    linux-2.6.9-final-prasanna/include/asm-sparc64/kprobes.h | 6 +++
    2 files changed, 25 insertions(+), 9 deletions(-)

    diff -puN arch/sparc64/kernel/kprobes.c~kprobes-arch-sparc64-changes arch/sparc64/kernel/kprobes.c
    --- linux-2.6.9-final/arch/sparc64/kernel/kprobes.c~kprobes-arch-sparc64-changes 2004-10-28 16:47:08.000000000 +0530
    +++ linux-2.6.9-final-prasanna/arch/sparc64/kernel/kprobes.c 2004-10-28 16:47:08.000000000 +0530
    @@ -15,7 +15,7 @@
    * traps. The top-level scheme is similar to that used
    * in the x86 kprobes implementation.
    *
    - * In the kprobe->insn[] array we store the original
    + * At kprobe->insn we allocate enough bytes and then store the original
    * instruction at index zero and a break instruction at
    * index one.
    *
    @@ -38,10 +38,20 @@
    * - Mark that we are no longer actively in a kprobe.
    */

    -void arch_prepare_kprobe(struct kprobe *p)
    +int arch_prepare_kprobe(struct kprobe *p)
    +{
    + p->ainsn.insn = (kprobe_opcode_t *) kmalloc(MAX_INSN_SIZE, GFP_ATOMIC);
    + if (!p->ainsn.insn) {
    + return -ENOMEM;
    + }
    +
    + p->ainsn.insn[0] = *p->addr;
    + p->ainsn.insn[1] = BREAKPOINT_INSTRUCTION_2;
    + return 0;
    +}
    +
    +void arch_remove_kprobe(struct kprobe *p)
    {
    - p->insn[0] = *p->addr;
    - p->insn[1] = BREAKPOINT_INSTRUCTION_2;
    }

    /* kprobe_status settings */
    @@ -59,8 +69,8 @@ static inline void prepare_singlestep(st
    current_kprobe_orig_tstate_pil = (regs->tstate & TSTATE_PIL);
    regs->tstate |= TSTATE_PIL;

    - regs->tpc = (unsigned long) &p->insn[0];
    - regs->tnpc = (unsigned long) &p->insn[1];
    + regs->tpc = (unsigned long) &p->ainsn.insn[0];
    + regs->tnpc = (unsigned long) &p->ainsn.insn[1];
    }

    static inline void disarm_kprobe(struct kprobe *p, struct pt_regs *regs)
    @@ -199,19 +209,19 @@ static void retpc_fixup(struct pt_regs *
    * instruction. To avoid the SMP problems that can occur when we
    * temporarily put back the original opcode to single-step, we
    * single-stepped a copy of the instruction. The address of this
    - * copy is p->insn.
    + * copy is p->ainsn.insn.
    *
    * This function prepares to return from the post-single-step
    * breakpoint trap.
    */
    static void resume_execution(struct kprobe *p, struct pt_regs *regs)
    {
    - u32 insn = p->insn[0];
    + u32 insn = p->ainsn.insn[0];

    regs->tpc = current_kprobe_orig_tnpc;
    regs->tnpc = relbranch_fixup(insn,
    (unsigned long) p->addr,
    - (unsigned long) &p->insn[0],
    + (unsigned long) &p->ainsn.insn[0],
    regs->tnpc);
    retpc_fixup(regs, insn, (unsigned long) p->addr);

    diff -puN include/asm-sparc64/kprobes.h~kprobes-arch-sparc64-changes include/asm-sparc64/kprobes.h
    --- linux-2.6.9-final/include/asm-sparc64/kprobes.h~kprobes-arch-sparc64-changes 2004-10-28 16:47:08.000000000 +0530
    +++ linux-2.6.9-final-prasanna/include/asm-sparc64/kprobes.h 2004-10-28 16:47:08.000000000 +0530
    @@ -10,6 +10,12 @@ typedef u32 kprobe_opcode_t;
    #define BREAKPOINT_INSTRUCTION_2 0x91d02071 /* ta 0x71 */
    #define MAX_INSN_SIZE 2

    +/* Architecture specific copy of original instruction*/
    +struct arch_specific_insn {
    + /* copy of the original instruction */
    + kprobe_opcode_t insn[MAX_INSN_SIZE];
    +};
    +
    #ifdef CONFIG_KPROBES
    extern int kprobe_exceptions_notify(struct notifier_block *self,
    unsigned long val, void *data);
    _
    --

    Prasanna S Panchamukhi
    Linux Technology Center
    India Software Labs, IBM Bangalore
    Ph: 91-80-25044636
    <prasanna@in.ibm.com>
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:07    [W:0.032 / U:36.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site