Skip to contentSkip to conversation

signal: annotate siglock acquisition

PATCH RESEND In review Namhyung Kim 2 participants 3 messages Sep 25, 2010

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 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 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
kernel/signal.c +4 -0
index bded651..766ae03 100644
@@ -1038,6 +1038,7 @@ int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p,
 	int ret = -ESRCH;
 
 	if (lock_task_sighand(p, &flags)) {
+		__acquire(&p->sighand->siglock);  /* make sparse happy */
 		ret = send_signal(sig, info, p, group);
 		unlock_task_sighand(p, &flags);
 	}
@@ -1227,6 +1228,7 @@ int kill_pid_info_as_uid(int sig, struct siginfo *info, struct pid *pid,
 
 	if (sig) {
 		if (lock_task_sighand(p, &flags)) {
+			__acquire(&p->sighand->siglock);
 			ret = __send_signal(sig, info, p, 1, 0);
 			unlock_task_sighand(p, &flags);
 		} else
@@ -1406,6 +1408,8 @@ int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)
 	if (!likely(lock_task_sighand(t, &flags)))
 		goto ret;
 
+	__acquire(&t->sighand->siglock); /* make sparse happy */
+
 	ret = 1; /* the signal is ignored */
 	if (!prepare_signal(sig, t, 0))
 		goto out;
Signature · 1 line
1.7.2.2
#1 lore raw
Quoted 4 lines · Namhyung Kim

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.

That's not a good way to do it; use __cond_lock instead.

#2 lore raw
Quoted 8 lines · Al Viro
Quoted 4 lines · Namhyung Kim

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.

That's not a good way to do it; use __cond_lock instead.

Thanks. I'll resend a patch that uses it.

Signature · 2 lines
Regards,
Namhyung Kim