public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Namhyung Kim <namhyung@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de,
	namhyung@gmail.com, mingo@elte.hu
Subject: [tip:perf/core] kprobes: Add sparse context annotations
Date: Wed, 15 Sep 2010 10:05:39 GMT	[thread overview]
Message-ID: <tip-635c17c2b2b4e5cd34f5dcba19d751b4e58533c2@git.kernel.org> (raw)
In-Reply-To: <1284512670-2369-6-git-send-email-namhyung@gmail.com>

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);

  reply	other threads:[~2010-09-15 10:06 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-15  1:04 [PATCH RESEND 0/5] kprobes cleanups Namhyung Kim
2010-09-15  1:04 ` [PATCH 1/5] kprobes: remove redundant address check Namhyung Kim
2010-09-15 10:04   ` [tip:perf/core] kprobes: Remove " tip-bot for Namhyung Kim
2010-09-15  1:04 ` [PATCH 2/5] kprobes: verify jprobe entry point Namhyung Kim
2010-09-15 10:04   ` [tip:perf/core] kprobes: Verify " tip-bot for Namhyung Kim
2010-09-15  1:04 ` [PATCH 3/5] kprobes: make functions static Namhyung Kim
2010-09-15 10:04   ` [tip:perf/core] kprobes: Make " tip-bot for Namhyung Kim
2010-09-15  1:04 ` [PATCH 4/5] kprobes: remove __dummy_buf Namhyung Kim
2010-09-15 10:05   ` [tip:perf/core] kprobes: Remove __dummy_buf tip-bot for Namhyung Kim
2010-09-15  1:04 ` [PATCH 5/5] kprobes: add sparse context annotations Namhyung Kim
2010-09-15 10:05   ` tip-bot for Namhyung Kim [this message]
2010-09-15  2:42 ` [PATCH RESEND 0/5] kprobes cleanups Masami Hiramatsu
2010-09-15  8:39   ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-635c17c2b2b4e5cd34f5dcba19d751b4e58533c2@git.kernel.org \
    --to=namhyung@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox