From mboxrd@z Thu Jan  1 00:00:00 1970
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Date: Thu, 02 Sep 2010 04:15:19 +0000
Subject: Re: [PATCH] kprobes: add sparse context annotation
Message-Id: <4C7F24D7.3010804@hitachi.com>
List-Id: <kernel-janitors.vger.kernel.org>
References: <1281082375-13356-1-git-send-email-namhyung@gmail.com>
In-Reply-To: <1281082375-13356-1-git-send-email-namhyung@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: kernel-janitors@vger.kernel.org

(2010/08/06 17:17), Namhyung Kim wrote:
> 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>

Thanks for the fix!

Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>

> 
> ---
> 
> oops.. there was an typo. apply this version instead.
> Thanks.
> 
> 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);