Re: [PATCH] get_signal: simplify/cleanup the the usage of ksig->info

From: Oleg Nesterov
Date: Fri Feb 23 2024 - 09:21:39 EST


On 02/23, Wen Yang wrote:
>
>
> On 2024/2/23 18:50, Oleg Nesterov wrote:
> >get_signal() uses signr or ksig->info.si_signo in a chaotic way, this
> >looks confusing. Change it to always use signr.
> >
> >This allows us to simplify the SIGNAL_GROUP_EXIT/group_exec_task branch,
> >it no longer needs to touch ksig at all.
> >
> >Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
> >---
> > kernel/signal.c | 15 +++++++++------
> > 1 file changed, 9 insertions(+), 6 deletions(-)
> >
> >diff --git a/kernel/signal.c b/kernel/signal.c
> >index c9c57d053ce4..690982e6595e 100644
> >--- a/kernel/signal.c
> >+++ b/kernel/signal.c
> >@@ -2727,12 +2727,15 @@ bool get_signal(struct ksignal *ksig)
> > /* Has this task already been marked for death? */
> > if ((signal->flags & SIGNAL_GROUP_EXIT) ||
> > signal->group_exec_task) {
> >- clear_siginfo(&ksig->info);
> >- ksig->info.si_signo = signr = SIGKILL;
> >+ signr = SIGKILL;
> > sigdelset(&current->pending.signal, SIGKILL);
> > trace_signal_deliver(SIGKILL, SEND_SIG_NOINFO,
> >- &sighand->action[SIGKILL - 1]);
> >+ &sighand->action[SIGKILL - 1]);
> > recalc_sigpending();
> >+ /*
> >+ * implies do_group_exit(), no need to initialize
> >+ * ksig->info
> >+ */
> > goto fatal;
>
> There is little question:
> If the this conditions is met:
> current->flags & PF_USER_WORKER
> It may execute “goto out“ instead of do_group_exit().

Yes, but vhost/io workers do not use ksig at all.

Oleg.