diff mbox series

[38/45] signal: Add task argument to flush_sigqueue_mask()

Message ID	20230606142033.172901153@linutronix.de
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Message-ID: <20230606142033.172901153@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Frederic Weisbecker <frederic@kernel.org>, Anna-Maria Behnsen <anna-maria@linutronix.de>, John Stultz <jstultz@google.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@kernel.org>, Stephen Boyd <sboyd@kernel.org>, Eric Biederman <ebiederm@xmission.com>, Oleg Nesterov <oleg@redhat.com> Subject: [patch 38/45] signal: Add task argument to flush_sigqueue_mask() References: <20230606132949.068951363@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Tue, 6 Jun 2023 16:38:19 +0200 (CEST) Precedence: bulk
Series	posix-timers: Cure inconsistencies and the SIG_IGN mess \| [00/45] posix-timers: Cure inconsistencies and the SIG_IGN mess [01/45] selftests/timers/posix_timers: Make signal distribution test less fragile [02/45] selftests/timers/posix_timers: Use TAP reporting format [03/45] selftests/timers/posix_timers: Add SIG_IGN test [04/45] selftests/timers/posix_timers: Validate signal rules [05/45] selftests/timers/posix-timers: Validate SIGEV_NONE [06/45] selftests/timers/posix-timers: Validate timer_gettime() [07/45] selftests/timers/posix-timers: Validate overrun after unblock [08/45] posix-timers: Convert timer list to hlist [09/45] posix-cpu-timers: Fix posix_cpu_timer_get() behaviour [10/45] posix-cpu-timers: Use @now instead of @val for clarity [11/45] posix-cpu-timers: Remove incorrect comment in posix_cpu_timer_set() [12/45] posix-cpu-timers: Simplify posix_cpu_timer_set() [13/45] posix-cpu-timers: Replace old expiry retrieval in posix_cpu_timer_set() [14/45] posix-timers: Consolidate interval retrieval [15/45] posix-timers: Clear overrun in common_timer_set() [16/45] posix-timers: Consolidate timer setup [17/45] posix-cpu-timers: Make k_itimer::it_active consistent [18/45] posix-timers: Consolidate signal queueing [19/45] signal: Remove task argument from dequeue_signal() [20/45] signal: Replace BUG_ON()s [21/45] signal: Confine POSIX_TIMERS properly [22/45] signal: Get rid of resched_timer logic [23/45] posix-timers: Cure si_sys_private race [24/45] signal: Allow POSIX timer signals to be dropped [25/45] posix-timers: Drop signal if timer has been deleted or reprogrammed [26/45] posix-timers: Rename k_itimer::it_requeue_pending [27/45] posix-timers: Add proper state tracking [28/45] posix-timers: Make signal delivery consistent [29/45] posix-timers: Make signal overrun accounting sensible [30/45] posix-cpu-timers: Use dedicated flag for CPU timer nanosleep [31/45] posix-timers: Add a refcount to struct k_itimer [32/45] signal: Split up __sigqueue_alloc() [33/45] signal: Provide posixtimer_sigqueue_init() [34/45] signal: Add sys_private_ptr to siginfo::_sifields::_timer [35/45] signal: Refactor send_sigqueue() [36/45] posix-timers: Embed sigqueue in struct k_itimer [37/45] signal: Cleanup unused posix-timer leftovers [38/45] signal: Add task argument to flush_sigqueue_mask() [39/45] signal: Provide ignored_posix_timers list [40/45] posix-timers: Handle ignored list on delete and exit [41/45] signal: Handle ignored signals in do_sigaction(action != SIG_IGN) [42/45] signal: Queue ignored posixtimers on ignore list [43/45] posix-timers: Cleanup SIG_IGN workaround leftovers [44/45] alarmtimers: Remove the throttle mechanism from alarm_forward_now() [45/45] alarmtimers: Remove return value from alarm functions

Commit Message

Thomas Gleixner June 6, 2023, 2:38 p.m. UTC

  To prepare for handling posix timer signals on sigaction(SIG_IGN) properly,
add a task argument to flush_sigqueue_mask() and fixup all call sites.

This argument will be used in a later step to enqueue posix timers on an
ignored list, so their signal can be requeued when SIG_IGN is lifted later
on.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/signal.c |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff mbox series

Patch

--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -727,11 +727,10 @@  void signal_wake_up_state(struct task_st
 
 /*
  * Remove signals in mask from the pending set and queue.
- * Returns 1 if any signals were found.
  *
  * All callers must be holding the siglock.
  */
-static void flush_sigqueue_mask(sigset_t *mask, struct sigpending *s)
+static void flush_sigqueue_mask(sigset_t *mask, struct sigpending *s, struct task_struct *ptmr_tsk)
 {
 	struct sigqueue *q, *n;
 	sigset_t m;
@@ -869,18 +868,18 @@  static bool prepare_signal(int sig, stru
 		 * This is a stop signal.  Remove SIGCONT from all queues.
 		 */
 		siginitset(&flush, sigmask(SIGCONT));
-		flush_sigqueue_mask(&flush, &signal->shared_pending);
+		flush_sigqueue_mask(&flush, &signal->shared_pending, NULL);
 		for_each_thread(p, t)
-			flush_sigqueue_mask(&flush, &t->pending);
+			flush_sigqueue_mask(&flush, &t->pending, NULL);
 	} else if (sig == SIGCONT) {
 		unsigned int why;
 		/*
 		 * Remove all stop signals from all queues, wake all threads.
 		 */
 		siginitset(&flush, SIG_KERNEL_STOP_MASK);
-		flush_sigqueue_mask(&flush, &signal->shared_pending);
+		flush_sigqueue_mask(&flush, &signal->shared_pending, NULL);
 		for_each_thread(p, t) {
-			flush_sigqueue_mask(&flush, &t->pending);
+			flush_sigqueue_mask(&flush, &t->pending, NULL);
 			task_clear_jobctl_pending(t, JOBCTL_STOP_PENDING);
 			if (likely(!(t->ptrace & PT_SEIZED))) {
 				t->jobctl &= ~JOBCTL_STOPPED;
@@ -4097,8 +4096,8 @@  void kernel_sigaction(int sig, __sighand
 		sigemptyset(&mask);
 		sigaddset(&mask, sig);
 
-		flush_sigqueue_mask(&mask, &current->signal->shared_pending);
-		flush_sigqueue_mask(&mask, &current->pending);
+		flush_sigqueue_mask(&mask, &current->signal->shared_pending, NULL);
+		flush_sigqueue_mask(&mask, &current->pending, NULL);
 		recalc_sigpending();
 	}
 	spin_unlock_irq(&current->sighand->siglock);
@@ -4165,9 +4164,9 @@  int do_sigaction(int sig, struct k_sigac
 		if (sig_handler_ignored(sig_handler(p, sig), sig)) {
 			sigemptyset(&mask);
 			sigaddset(&mask, sig);
-			flush_sigqueue_mask(&mask, &p->signal->shared_pending);
+			flush_sigqueue_mask(&mask, &p->signal->shared_pending, NULL);
 			for_each_thread(p, t)
-				flush_sigqueue_mask(&mask, &t->pending);
+				flush_sigqueue_mask(&mask, &t->pending, NULL);
 		}
 	}