Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
signal: Cleanup flush_sigqueue_mask()
Mop up the stale return value comment and add a lockdep check instead of
commenting on the locking requirement.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/20241001083835.374933959@linutronix.de
+12
-15
+12
-15
kernel/signal.c
+12
-15
kernel/signal.c
···
704
704
kick_process(t);
705
705
}
706
706
707
-
/*
708
-
* Remove signals in mask from the pending set and queue.
709
-
* Returns 1 if any signals were found.
710
-
*
711
-
* All callers must be holding the siglock.
712
-
*/
713
-
static void flush_sigqueue_mask(sigset_t *mask, struct sigpending *s)
707
+
/* Remove signals in mask from the pending set and queue. */
708
+
static void flush_sigqueue_mask(struct task_struct *p, sigset_t *mask, struct sigpending *s)
714
709
{
715
710
struct sigqueue *q, *n;
716
711
sigset_t m;
712
+
713
+
lockdep_assert_held(&p->sighand->siglock);
717
714
718
715
sigandsets(&m, mask, &s->signal);
719
716
if (sigisemptyset(&m))
···
845
848
* This is a stop signal. Remove SIGCONT from all queues.
846
849
*/
847
850
siginitset(&flush, sigmask(SIGCONT));
848
-
flush_sigqueue_mask(&flush, &signal->shared_pending);
851
+
flush_sigqueue_mask(p, &flush, &signal->shared_pending);
849
852
for_each_thread(p, t)
850
-
flush_sigqueue_mask(&flush, &t->pending);
853
+
flush_sigqueue_mask(p, &flush, &t->pending);
851
854
} else if (sig == SIGCONT) {
852
855
unsigned int why;
853
856
/*
854
857
* Remove all stop signals from all queues, wake all threads.
855
858
*/
856
859
siginitset(&flush, SIG_KERNEL_STOP_MASK);
857
-
flush_sigqueue_mask(&flush, &signal->shared_pending);
860
+
flush_sigqueue_mask(p, &flush, &signal->shared_pending);
858
861
for_each_thread(p, t) {
859
-
flush_sigqueue_mask(&flush, &t->pending);
862
+
flush_sigqueue_mask(p, &flush, &t->pending);
860
863
task_clear_jobctl_pending(t, JOBCTL_STOP_PENDING);
861
864
if (likely(!(t->ptrace & PT_SEIZED))) {
862
865
t->jobctl &= ~JOBCTL_STOPPED;
···
4111
4114
sigemptyset(&mask);
4112
4115
sigaddset(&mask, sig);
4113
4116
4114
-
flush_sigqueue_mask(&mask, ¤t->signal->shared_pending);
4115
-
flush_sigqueue_mask(&mask, ¤t->pending);
4117
+
flush_sigqueue_mask(current, &mask, ¤t->signal->shared_pending);
4118
+
flush_sigqueue_mask(current, &mask, ¤t->pending);
4116
4119
recalc_sigpending();
4117
4120
}
4118
4121
spin_unlock_irq(¤t->sighand->siglock);
···
4179
4182
if (sig_handler_ignored(sig_handler(p, sig), sig)) {
4180
4183
sigemptyset(&mask);
4181
4184
sigaddset(&mask, sig);
4182
-
flush_sigqueue_mask(&mask, &p->signal->shared_pending);
4185
+
flush_sigqueue_mask(p, &mask, &p->signal->shared_pending);
4183
4186
for_each_thread(p, t)
4184
-
flush_sigqueue_mask(&mask, &t->pending);
4187
+
flush_sigqueue_mask(p, &mask, &t->pending);
4185
4188
}
4186
4189
}
4187
4190