lkml.org 
[lkml]   [2010]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] kprobes: Add sparse context annotations
    Commit-ID:  635c17c2b2b4e5cd34f5dcba19d751b4e58533c2
    Gitweb: http://git.kernel.org/tip/635c17c2b2b4e5cd34f5dcba19d751b4e58533c2
    Author: Namhyung Kim <namhyung@gmail.com>
    AuthorDate: Wed, 15 Sep 2010 10:04:30 +0900
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 15 Sep 2010 10:44:02 +0200

    kprobes: Add sparse context annotations

    This removes following warnings when build with C=1

    warning: context imbalance in 'kretprobe_hash_lock' - wrong count at exit
    warning: context imbalance in 'kretprobe_table_lock' - wrong count at exit
    warning: context imbalance in 'kretprobe_hash_unlock' - unexpected unlock
    warning: context imbalance in 'kretprobe_table_unlock' - unexpected unlock

    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    LKML-Reference: <1284512670-2369-6-git-send-email-namhyung@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    kernel/kprobes.c | 4 ++++
    1 files changed, 4 insertions(+), 0 deletions(-)

    diff --git a/kernel/kprobes.c b/kernel/kprobes.c
    index c53aad5..6dd5359 100644
    --- a/kernel/kprobes.c
    +++ b/kernel/kprobes.c
    @@ -831,6 +831,7 @@ void __kprobes recycle_rp_inst(struct kretprobe_instance *ri,

    void __kprobes kretprobe_hash_lock(struct task_struct *tsk,
    struct hlist_head **head, unsigned long *flags)
    +__acquires(hlist_lock)
    {
    unsigned long hash = hash_ptr(tsk, KPROBE_HASH_BITS);
    spinlock_t *hlist_lock;
    @@ -842,6 +843,7 @@ void __kprobes kretprobe_hash_lock(struct task_struct *tsk,

    static void __kprobes kretprobe_table_lock(unsigned long hash,
    unsigned long *flags)
    +__acquires(hlist_lock)
    {
    spinlock_t *hlist_lock = kretprobe_table_lock_ptr(hash);
    spin_lock_irqsave(hlist_lock, *flags);
    @@ -849,6 +851,7 @@ static void __kprobes kretprobe_table_lock(unsigned long hash,

    void __kprobes kretprobe_hash_unlock(struct task_struct *tsk,
    unsigned long *flags)
    +__releases(hlist_lock)
    {
    unsigned long hash = hash_ptr(tsk, KPROBE_HASH_BITS);
    spinlock_t *hlist_lock;
    @@ -859,6 +862,7 @@ void __kprobes kretprobe_hash_unlock(struct task_struct *tsk,

    static void __kprobes kretprobe_table_unlock(unsigned long hash,
    unsigned long *flags)
    +__releases(hlist_lock)
    {
    spinlock_t *hlist_lock = kretprobe_table_lock_ptr(hash);
    spin_unlock_irqrestore(hlist_lock, *flags);

    \
     
     \ /
      Last update: 2010-09-15 12:09    [W:0.042 / U:1.120 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site