lkml.org 
[lkml]   [2009]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/9] hw-breakpoints: Drop callback and task parameters from modify helper
    Date
    Drop the callback and task parameters from modify_user_hw_breakpoint().
    For now we have no user that need to modify a breakpoint to the point
    of changing its handler or its task context.

    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: "K. Prasad" <prasad@linux.vnet.ibm.com>
    ---
    arch/x86/kernel/ptrace.c | 4 ++--
    include/linux/hw_breakpoint.h | 9 ++-------
    kernel/hw_breakpoint.c | 7 +++----
    3 files changed, 7 insertions(+), 13 deletions(-)

    diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
    index 04d182a..dbb3955 100644
    --- a/arch/x86/kernel/ptrace.c
    +++ b/arch/x86/kernel/ptrace.c
    @@ -618,7 +618,7 @@ ptrace_modify_breakpoint(struct perf_event *bp, int len, int type,
    attr.bp_type = gen_type;
    attr.disabled = disabled;

    - return modify_user_hw_breakpoint(bp, &attr, bp->callback, tsk);
    + return modify_user_hw_breakpoint(bp, &attr);
    }

    /*
    @@ -740,7 +740,7 @@ static int ptrace_set_breakpoint_addr(struct task_struct *tsk, int nr,

    attr = bp->attr;
    attr.bp_addr = addr;
    - bp = modify_user_hw_breakpoint(bp, &attr, bp->callback, tsk);
    + bp = modify_user_hw_breakpoint(bp, &attr);
    }
    /*
    * CHECKME: the previous code returned -EIO if the addr wasn't a
    diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h
    index a03daed..d33096e 100644
    --- a/include/linux/hw_breakpoint.h
    +++ b/include/linux/hw_breakpoint.h
    @@ -57,10 +57,7 @@ register_user_hw_breakpoint(struct perf_event_attr *attr,

    /* FIXME: only change from the attr, and don't unregister */
    extern struct perf_event *
    -modify_user_hw_breakpoint(struct perf_event *bp,
    - struct perf_event_attr *attr,
    - perf_callback_t triggered,
    - struct task_struct *tsk);
    +modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr);

    /*
    * Kernel breakpoints are not associated with any particular thread.
    @@ -97,9 +94,7 @@ register_user_hw_breakpoint(struct perf_event_attr *attr,
    struct task_struct *tsk) { return NULL; }
    static inline struct perf_event *
    modify_user_hw_breakpoint(struct perf_event *bp,
    - struct perf_event_attr *attr,
    - perf_callback_t triggered,
    - struct task_struct *tsk) { return NULL; }
    + struct perf_event_attr *attr) { return NULL; }
    static inline struct perf_event *
    register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr,
    perf_callback_t triggered,
    diff --git a/kernel/hw_breakpoint.c b/kernel/hw_breakpoint.c
    index cf5ee16..2d10b01 100644
    --- a/kernel/hw_breakpoint.c
    +++ b/kernel/hw_breakpoint.c
    @@ -312,9 +312,7 @@ EXPORT_SYMBOL_GPL(register_user_hw_breakpoint);
    * @tsk: pointer to 'task_struct' of the process to which the address belongs
    */
    struct perf_event *
    -modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr,
    - perf_callback_t triggered,
    - struct task_struct *tsk)
    +modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)
    {
    /*
    * FIXME: do it without unregistering
    @@ -323,7 +321,8 @@ modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr,
    */
    unregister_hw_breakpoint(bp);

    - return perf_event_create_kernel_counter(attr, -1, tsk->pid, triggered);
    + return perf_event_create_kernel_counter(attr, -1, bp->ctx->task->pid,
    + bp->callback);
    }
    EXPORT_SYMBOL_GPL(modify_user_hw_breakpoint);

    --
    1.6.2.3


    \
     
     \ /
      Last update: 2009-12-06 08:39    [W:0.027 / U:0.184 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site