kprobes: add sparse context annotation
Subsystems (2)
PATCH 1/1 kprobes: add sparse context annotation
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
kernel/kprobes.c +4 -0
@@ -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 (hlisk_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 (hlisk_lock) {spinlock_t *hlist_lock =kretprobe_table_lock_ptr (hash);spin_unlock_irqrestore (hlist_lock, *flags);
Signature · 1 line
1.7.0.4
PATCH 1/1 kprobes: add sparse context annotation
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
---
oops.. there was an typo. apply this version instead. Thanks.
kernel/kprobes.c +4 -0
@@ -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);
Signature · 1 line
1.7.0.4
Quoted 6 lines · Namhyung Kim
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
Good catch :)
Thanks!
Quoted 39 lines
Signed-off-by Namhyung Kim <[email protected]>kernel/kprobes.c +4
-0@@ -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 (hlisk_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 (hlisk_lock) {spinlock_t *hlist_lock =kretprobe_table_lock_ptr (hash);spin_unlock_irqrestore (hlist_lock, *flags);
Quoted 13 lines · Ananth N Mavinakayanahalli
Review
Quoted 3 lines · Namhyung Kim
void
__kprobeskretprobe_hash_unlock(structtask_struct*tsk,(quoted diff) +1
-0unsigned long *flags) +__releases(hlisk_lock)You surely meant
hlist_lock, didn't you?Quoted 5 lines
{
(quoted diff) +0
-0unsigned 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,
Quoted 9 lines
kernel/kprobes.c void __kprobes kretprobe_hash_unlock(struct task_struct *tsk, · line 865
Quoted 3 lines
kernel/kprobes.c +1
-0static void __kprobes kretprobe_table_unlock(unsigned long hash, unsigned long *flags) +__releases(hlisk_lock)^^^^^^Quoted 5 lines
kernel/kprobes.c +0
-0{spinlock_t *hlist_lock =kretprobe_table_lock_ptr (hash);spin_unlock_irqrestore (hlist_lock, *flags);Signature · 1 line
1.7.0.4
Oops, right...
Signature · 4 lines
Masami HIRAMATSU 2nd Research Dept. Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
Review
Quoted 3 lines · Namhyung Kim
void
__kprobeskretprobe_hash_unlock(structtask_struct*tsk,(quoted diff) +1
-0unsigned long *flags) +__releases(hlisk_lock)
You surely meant hlist_lock, didn't you?
kernel/kprobes.c void __kprobes kretprobe_hash_unlock(struct task_struct *tsk, · line 865
Quoted 8 lines
{
kernel/kprobes.c +1
-0unsigned 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(hlisk_lock)
^^^^^^
Quoted 5 lines
kernel/kprobes.c +0
-0{spinlock_t *hlist_lock =kretprobe_table_lock_ptr (hash);spin_unlock_irqrestore (hlist_lock, *flags);Signature · 1 line
1.7.0.4
Quoted 8 lines · Namhyung Kim
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 unlockSigned-off-by Namhyung Kim <[email protected]>
Thanks for the fix!
Quoted 42 lines
---
oops.. there was an typo. apply this version instead. Thanks.
kernel/kprobes.c +4
-0@@ -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);