dequeue_synchronous_signal: use SI_FROMKERNEL()
PATCH 1/2 dequeue_synchronous_signal: use SI_FROMKERNEL()
Cosmetic, to make the intent more clear to the reader.
--- kernel/signal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/signal.c +2 -2
@@ -681,8 +681,8 @@ static int dequeue_synchronous_signal(kernel_siginfo_t *info)* Return the first synchronous signal in the queue. */ list_for_each_entry (q, &pending->list, list) { -/* Synchronous signals have a positive si_code */ -if ((q->info.si_code >SI_USER ) && +/* Synchronous signals are always from kernel */ +if (SI_FROMKERNEL (&q->info) && (sigmask (q->info.si_signo) &SYNCHRONOUS_MASK )) { sync = q; goto next;
Signature · 1 line
2.52.0
PATCH 2/2 dequeue_synchronous_signal: kill the unnecessary still-pending check
The signals in SYNCHRONOUS_MASK are not real-time signals, so at most one instance can be queued. Add a static_assert() to ensure.
Remove the list_for_each_entry_continue() loop and simplify the code.
--- kernel/signal.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
kernel/signal.c +5 -12
@@ -665,6 +665,8 @@ int dequeue_signal(sigset_t *mask, kernel_siginfo_t *info, enum pid_type *type) }EXPORT_SYMBOL_GPL (dequeue_signal); +static_assert (ilog2 (SYNCHRONOUS_MASK ) +1 <SIGRTMIN ); +static int dequeue_synchronous_signal (kernel_siginfo_t *info) {struct task_struct *tsk = current;
@@ -676,7 +678,6 @@ static int dequeue_synchronous_signal(kernel_siginfo_t *info)*/ if (!((pending->signal.sig[0 ] & ~tsk->blocked.sig[0 ]) &SYNCHRONOUS_MASK ))return 0 ; -/* * Return the first synchronous signal in the queue. */
@@ -685,22 +686,14 @@ static int dequeue_synchronous_signal(kernel_siginfo_t *info)if (SI_FROMKERNEL (&q->info) && (sigmask (q->info.si_signo) &SYNCHRONOUS_MASK )) { sync = q; - goto next; +break ; } } -return 0 ; -next: -/* -* Check if there is another siginfo for the same signal. -*/ -list_for_each_entry_continue (q, &pending->list, list) { -if (q->info.si_signo == sync->info.si_signo) - goto still_pending; - } +if (!sync) +return 0 ;sigdelset (&pending->signal, sync->info.si_signo);recalc_sigpending (); -still_pending:list_del_init (&sync->list);copy_siginfo (info, &sync->info);__sigqueue_free (sync);
Signature · 1 line
2.52.0
Re: [PATCH 2/2] dequeue_synchronous_signal: kill the unnecessary still-pending check
Quoted 4 lines · On Sun, 26 Apr 2026 18:21:29 +0200 Oleg Nesterov <[email protected]> wrote:
The signals in
SYNCHRONOUS_MASKare not real-time signals, so at most one instance can be queued. Add astatic_assert()to ensure.Remove the
list_for_each_entry_continue()loop and simplify the code.
AI review asked a thing:
https://sashiko.dev/#/patchset/[email protected]
Re: [PATCH 2/2] dequeue_synchronous_signal: kill the unnecessary still-pending check
Quoted 10 lines · Andrew Morton
Quoted 4 lines · On Sun, 26 Apr 2026 18:21:29 +0200 Oleg Nesterov <[email protected]> wrote:
The signals in
SYNCHRONOUS_MASKare not real-time signals, so at most one instance can be queued. Add astatic_assert()to ensure.Remove the
list_for_each_entry_continue()loop and simplify the code.AI review asked a thing:
https://sashiko.dev/#/patchset/[email protected]
OOPS. Indeed I am stupid. I forgor that posixtimer_send_sigqueue() checks prepare_signal() but not legacy_queue().
Heh ;) Dear Sashiko, thanks for your quick NACK!
Oleg.