signal: annotate siglock acquisition
PATCH 1/1 signal: annotate siglock acquisition
lock_task_sighand() conditionally acquires sighand->siglock in case of returning non-NULL but unlock_task_sighand() releases it unconditionally. This leads sparse to complain about the lock context imbalance. Annotate it to make sparse happier.
--- kernel/signal.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
kernel/signal.c +6 -3
@@ -1037,7 +1037,7 @@ int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p,unsigned long flags;int ret = -ESRCH ; -if (lock_task_sighand (p, &flags)) { +if (__cond_lock (&p->sighand->siglock,lock_task_sighand (p, &flags))) { ret =send_signal (sig, info, p, group);unlock_task_sighand (p, &flags); }
@@ -1226,7 +1226,8 @@ int kill_pid_info_as_uid(int sig, struct siginfo *info, struct pid *pid, goto out_unlock;if (sig) { -if (lock_task_sighand (p, &flags)) { +if (__cond_lock (&p->sighand->siglock, +lock_task_sighand (p, &flags))) { ret =__send_signal (sig, info, p,1 ,0 );unlock_task_sighand (p, &flags); }else
@@ -1403,7 +1404,9 @@ int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)BUG_ON (!(q->flags &SIGQUEUE_PREALLOC )); ret =-1 ; -if (!likely (lock_task_sighand (t, &flags))) +if (likely (lock_task_sighand (t, &flags))) +__acquire (&t->sighand->siglock); +else goto ret; ret =1 ;/* the signal is ignored */
Signature · 1 line
1.7.2.2
Quoted 6 lines · Namhyung Kim
lock_task_sighand()conditionally acquiressighand->siglockin case of returning non-NULL butunlock_task_sighand()releases it unconditionally. This leads sparse to complain about the lock context imbalance. Annotate it to make sparse happier.
kernel/signal.c int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group) · line 1412
Quoted 10 lines
kernel/signal.c +3
-1@@ -1403,7 +1404,9 @@ int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)BUG_ON (!(q->flags &SIGQUEUE_PREALLOC )); ret =-1 ; -if (!likely (lock_task_sighand (t, &flags))) +if (likely (lock_task_sighand (t, &flags))) +__acquire (&t->sighand->siglock); +else goto ret; ret =1 ;/* the signal is ignored */
making sparse happy is good, but changing a likely clause is not, unless you meant it ;)
maybe -->
if (!likely(lock_task_sighand(t, &flags))) goto ret; else __acquire(&t->sighand->siglock);
Quoted 16 lines · Eric Dumazet
Quoted 11 lines · Namhyung Kim
kernel/signal.c +3
-1@@ -1403,7 +1404,9 @@ int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group) BUG_ON(!(q->flags & SIGQUEUE_PREALLOC)); ret = -1; - if (!likely(lock_task_sighand(t, &flags))) + if (likely(lock_task_sighand(t, &flags))) + __acquire(&t->sighand->siglock); + else goto ret;ret = 1; /* the signal is ignored */
making sparse happy is good, but changing a likely clause is not, unless you meant it ;)
Quoted 10 lines
maybe -->
if (!likely(lock_task_sighand(t, &flags)))
goto ret;
else
__acquire(&t->sighand->siglock);
What's the difference? I didn't change the semantics of likely clause but simply exchange the order of then-else part because IMHO a negative expression make it hard to understand, generally. I've checked compiled binaries for both cases on x86 and they produced exactly same code.
Thanks.
Signature · 2 lines
Regards, Namhyung Kim
Quoted 6 lines · Namhyung Kim
What's the difference? I didn't change the semantics of likely clause but simply exchange the order of then-else part because IMHO a negative expression make it hard to understand, generally. I've checked compiled binaries for both cases on x86 and they produced exactly same code.
Anyway, re-reading your patch, I just dont get why you use __cond_lock() two times, but not on this part ?
if (!likely(__cond_lock(&t->sighand->siglock,
lock_task_sighand(t, &flags)))) goto ret;
This way, your patch would not be misleading.
Another way to deal with this sparse mess is to use a macro, like we do for read_trylock() :
#define read_trylock(lock) __cond_lock(lock, _raw_read_trylock(lock))
-->
#define lock_task_sighand(t, flags) \ __cond_lock(&(t)->sighand->siglock, \ _raw_lock_task_sighand(t, flags))
Quoted 4 lines · Eric Dumazet
#define
lock_task_sighand(t, flags)\
__cond_lock(&(t)->sighand->siglock, \
_raw_lock_task_sighand(t, flags))
Looks great! Will use it in a new patch.
Many thanks.
Signature · 2 lines
Regards, Namhyung Kim