public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Anna-Maria Behnsen <anna-maria@linutronix.de>,
	Frederic Weisbecker <frederic@kernel.org>,
	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 V3 02/51] selftests/timers/posix_timers: Add SIG_IGN test
Date: Mon, 10 Jun 2024 18:42:07 +0200 (CEST)	[thread overview]
Message-ID: <20240610164025.579598461@linutronix.de> (raw)
In-Reply-To: 20240610163452.591699700@linutronix.de

Add a test case to validate correct behaviour vs. SIG_IGN.

The posix specification states:

  "Setting a signal action to SIG_IGN for a signal that is pending shall
   cause the pending signal to be discarded, whether or not it is blocked."

The kernel implements this in the signal handling code, but due to the way
how posix timers are handling SIG_IGN for periodic timers, the behaviour
after installing a real handler again is inconsistent and suprising.

The following sequence is expected to deliver a signal:

  install_handler(SIG);
  block_signal(SIG);
  timer_create(...);	 <- Should send SIG
  timer_settime(value=100ms, interval=100ms);
  sleep(1);		 <- Timer expires and queues signal, timer is not rearmed
  			    as that should happen in the signal delivery path
  ignore_signal(SIG);	 <- Discards queued signal
  install_handler(SIG);  <- Restore handler, should rearm but does not
  sleep(1);
  unblock_signal(SIG);	 <- Should deliver one signal with overrun count
  			    set in siginfo

This fails because nothing rearms the timer when the signal handler is
restored. Add a test for this case which fails until the signal and posix
timer code is fixed.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 tools/testing/selftests/timers/posix_timers.c |  127 +++++++++++++++++++++++++-
 1 file changed, 125 insertions(+), 2 deletions(-)

--- a/tools/testing/selftests/timers/posix_timers.c
+++ b/tools/testing/selftests/timers/posix_timers.c
@@ -6,8 +6,9 @@
  *
  * Kernel loop code stolen from Steven Rostedt <srostedt@redhat.com>
  */
-
+#define _GNU_SOURCE
 #include <sys/time.h>
+#include <sys/types.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -214,10 +215,129 @@ static void check_timer_distribution(voi
 		ksft_test_result_skip("check signal distribution (old kernel)\n");
 }
 
+struct tmrsig {
+	int	signals;
+	int	overruns;
+};
+
+static void siginfo_handler(int sig, siginfo_t *si, void *uc)
+{
+	struct tmrsig *tsig = si ? si->si_ptr : NULL;
+
+	if (tsig) {
+		tsig->signals++;
+		tsig->overruns += si->si_overrun;
+	}
+}
+
+static void *ignore_thread(void *arg)
+{
+	unsigned int *tid = arg;
+	sigset_t set;
+
+	sigemptyset(&set);
+	sigaddset(&set, SIGUSR1);
+	if (sigprocmask(SIG_BLOCK, &set, NULL))
+		fatal_error(NULL, "sigprocmask(SIG_BLOCK)");
+
+	*tid = gettid();
+	sleep(100);
+
+	if (sigprocmask(SIG_UNBLOCK, &set, NULL))
+		fatal_error(NULL, "sigprocmask(SIG_UNBLOCK)");
+	return NULL;
+}
+
+static void check_sig_ign(int thread)
+{
+	struct tmrsig tsig = { };
+	struct itimerspec its;
+	unsigned int tid = 0;
+	struct sigaction sa;
+	struct sigevent sev;
+	pthread_t pthread;
+	timer_t timerid;
+	sigset_t set;
+
+	if (thread) {
+		if (pthread_create(&pthread, NULL, ignore_thread, &tid))
+			fatal_error(NULL, "pthread_create()");
+		sleep(1);
+	}
+
+	sa.sa_flags = SA_SIGINFO;
+	sa.sa_sigaction = siginfo_handler;
+	sigemptyset(&sa.sa_mask);
+	if (sigaction(SIGUSR1, &sa, NULL))
+		fatal_error(NULL, "sigaction()");
+
+	/* Block the signal */
+	sigemptyset(&set);
+	sigaddset(&set, SIGUSR1);
+	if (sigprocmask(SIG_BLOCK, &set, NULL))
+		fatal_error(NULL, "sigprocmask(SIG_BLOCK)");
+
+	memset(&sev, 0, sizeof(sev));
+	sev.sigev_notify = SIGEV_SIGNAL;
+	sev.sigev_signo = SIGUSR1;
+	sev.sigev_value.sival_ptr = &tsig;
+	if (thread) {
+		sev.sigev_notify = SIGEV_THREAD_ID;
+		sev._sigev_un._tid = tid;
+	}
+
+	if (timer_create(CLOCK_MONOTONIC, &sev, &timerid))
+		fatal_error(NULL, "timer_create()");
+
+	/* Start the timer to expire in 100ms and 100ms intervals */
+	its.it_value.tv_sec = 0;
+	its.it_value.tv_nsec = 100000000;
+	its.it_interval.tv_sec = 0;
+	its.it_interval.tv_nsec = 100000000;
+	timer_settime(timerid, 0, &its, NULL);
+
+	sleep(1);
+
+	/* Set the signal to be ignored */
+	if (signal(SIGUSR1, SIG_IGN) == SIG_ERR)
+		fatal_error(NULL, "signal(SIG_IGN)");
+
+	sleep(1);
+
+	if (thread) {
+		/* Stop the thread first. No signal should be delivered to it */
+		if (pthread_cancel(pthread))
+			fatal_error(NULL, "pthread_cancel()");
+		if (pthread_join(pthread, NULL))
+			fatal_error(NULL, "pthread_join()");
+	}
+
+	/* Restore the handler */
+	if (sigaction(SIGUSR1, &sa, NULL))
+		fatal_error(NULL, "sigaction()");
+
+	sleep(1);
+
+	/* Unblock it, which should deliver the signal in the !thread case*/
+	if (sigprocmask(SIG_UNBLOCK, &set, NULL))
+		fatal_error(NULL, "sigprocmask(SIG_UNBLOCK)");
+
+	if (timer_delete(timerid))
+		fatal_error(NULL, "timer_delete()");
+
+	if (!thread) {
+		ksft_test_result(tsig.signals == 1 && tsig.overruns == 29,
+				 "check_sig_ign SIGEV_SIGNAL\n");
+	} else {
+		ksft_test_result(tsig.signals == 0 && tsig.overruns == 0,
+				 "check_sig_ign SIGEV_THREAD_ID\n");
+	}
+}
+
 int main(int argc, char **argv)
 {
 	ksft_print_header();
-	ksft_set_plan(6);
+	ksft_set_plan(8);
 
 	ksft_print_msg("Testing posix timers. False negative may happen on CPU execution \n");
 	ksft_print_msg("based timers if other threads run on the CPU...\n");
@@ -239,5 +359,8 @@ int main(int argc, char **argv)
 	check_timer_create(CLOCK_PROCESS_CPUTIME_ID, "CLOCK_PROCESS_CPUTIME_ID");
 	check_timer_distribution();
 
+	check_sig_ign(0);
+	check_sig_ign(1);
+
 	ksft_finished();
 }


  parent reply	other threads:[~2024-06-10 16:42 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-10 16:42 [patch V3 00/51] posix-timers: Cure inconsistencies and the SIG_IGN mess Thomas Gleixner
2024-06-10 16:42 ` [patch V3 01/51] selftests/timers/posix_timers: Simplify error handling Thomas Gleixner
2024-06-10 16:42 ` Thomas Gleixner [this message]
2024-06-10 16:42 ` [patch V3 03/51] selftests/timers/posix_timers: Validate signal rules Thomas Gleixner
2024-06-10 16:42 ` [patch V3 04/51] selftests/timers/posix-timers: Validate SIGEV_NONE Thomas Gleixner
2024-06-10 16:42 ` [patch V3 05/51] selftests/timers/posix-timers: Validate timer_gettime() Thomas Gleixner
2024-06-10 16:42 ` [patch V3 06/51] selftests/timers/posix-timers: Validate overrun after unblock Thomas Gleixner
2024-06-10 16:42 ` [patch V3 07/51] posix-cpu-timers: Split up posix_cpu_timer_get() Thomas Gleixner
2024-06-21 15:28   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 08/51] posix-cpu-timers: Save interval only for armed timers Thomas Gleixner
2024-06-21 15:33   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 09/51] posix-cpu-timers: Handle interval timers correctly in timer_get() Thomas Gleixner
2024-06-22  9:04   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 10/51] posix-cpu-timers: Handle SIGEV_NONE " Thomas Gleixner
2024-06-22 14:28   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 11/51] posix-cpu-timers: Handle SIGEV_NONE timers correctly in timer_set() Thomas Gleixner
2024-06-22 14:35   ` Frederic Weisbecker
2024-06-22 21:56     ` Thomas Gleixner
2024-06-23 11:16   ` [patch V3-2 " Thomas Gleixner
2024-06-23 19:12     ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 12/51] posix-cpu-timers: Replace old expiry retrieval in posix_cpu_timer_set() Thomas Gleixner
2024-06-23 11:17   ` [patch V3-2 " Thomas Gleixner
2024-06-23 20:23     ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 13/51] posix-cpu-timers: Do not arm SIGEV_NONE timers Thomas Gleixner
2024-06-23 21:04   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 14/51] posix-cpu-timers: Use @now instead of @val for clarity Thomas Gleixner
2024-06-10 16:42 ` [patch V3 15/51] posix-cpu-timers: Remove incorrect comment in posix_cpu_timer_set() Thomas Gleixner
2024-06-10 16:42 ` [patch V3 16/51] posix-cpu-timers: Simplify posix_cpu_timer_set() Thomas Gleixner
2024-06-23 22:41   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 17/51] posix-timers: Retrieve interval in common timer_settime() code Thomas Gleixner
2024-06-25 15:13   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 18/51] posix-timers: Clear overrun in common_timer_set() Thomas Gleixner
2024-06-10 16:42 ` [patch V3 19/51] posix-timers: Convert timer list to hlist Thomas Gleixner
2024-06-10 16:42 ` [patch V3 20/51] posix-timers: Consolidate timer setup Thomas Gleixner
2024-06-25 22:19   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 21/51] posix-cpu-timers: Make k_itimer::it_active consistent Thomas Gleixner
2024-06-25 22:36   ` Frederic Weisbecker
2024-06-10 16:42 ` [patch V3 22/51] posix-timers: Consolidate signal queueing Thomas Gleixner
2024-06-10 16:42 ` [patch V3 23/51] signal: Remove task argument from dequeue_signal() Thomas Gleixner
2024-06-10 16:42 ` [patch V3 24/51] signal: Replace BUG_ON()s Thomas Gleixner
2024-06-10 16:42 ` [patch V3 25/51] signal: Confine POSIX_TIMERS properly Thomas Gleixner
2024-06-10 16:42 ` [patch V3 26/51] signal: Prevent user space from setting si_sys_private Thomas Gleixner
2024-06-10 16:42 ` [patch V3 27/51] signal: Get rid of resched_timer logic Thomas Gleixner
2024-06-10 16:42 ` [patch V3 28/51] posix-timers: Cure si_sys_private race Thomas Gleixner
2024-06-10 16:42 ` [patch V3 29/51] signal: Allow POSIX timer signals to be dropped Thomas Gleixner
2024-06-10 16:42 ` [patch V3 30/51] posix-timers: Drop signal if timer has been deleted or reprogrammed Thomas Gleixner
2024-06-10 16:42 ` [patch V3 31/51] posix-timers: Rename k_itimer::it_requeue_pending Thomas Gleixner
2024-06-10 16:42 ` [patch V3 32/51] posix-timers: Add proper state tracking Thomas Gleixner
2024-06-10 16:42 ` [patch V3 33/51] posix-timers: Make signal delivery consistent Thomas Gleixner
2024-06-10 16:42 ` [patch V3 34/51] posix-timers: Make signal overrun accounting sensible Thomas Gleixner
2024-06-10 16:42 ` [patch V3 35/51] posix-cpu-timers: Use dedicated flag for CPU timer nanosleep Thomas Gleixner
2024-06-10 16:42 ` [patch V3 36/51] posix-timers: Add a refcount to struct k_itimer Thomas Gleixner
2024-06-10 16:42 ` [patch V3 37/51] signal: Split up __sigqueue_alloc() Thomas Gleixner
2024-06-10 16:42 ` [patch V3 38/51] signal: Provide posixtimer_sigqueue_init() Thomas Gleixner
2024-06-10 16:42 ` [patch V3 39/51] signal: Add sys_private_ptr to siginfo::_sifields::_timer Thomas Gleixner
2024-06-23 11:17   ` Thomas Gleixner
2024-06-10 16:42 ` [patch V3 40/51] posix-timers: Store PID type in the timer Thomas Gleixner
2024-06-10 16:42 ` [patch V3 41/51] signal: Refactor send_sigqueue() Thomas Gleixner
2024-06-10 16:42 ` [patch V3 42/51] posix-timers: Embed sigqueue in struct k_itimer Thomas Gleixner
2024-06-10 16:42 ` [patch V3 43/51] signal: Cleanup unused posix-timer leftovers Thomas Gleixner
2024-06-10 16:42 ` [patch V3 44/51] signal: Add task argument to flush_sigqueue_mask() Thomas Gleixner
2024-06-10 16:43 ` [patch V3 45/51] signal: Provide ignored_posix_timers list Thomas Gleixner
2024-06-10 16:43 ` [patch V3 46/51] posix-timers: Handle ignored list on delete and exit Thomas Gleixner
2024-06-10 16:43 ` [patch V3 47/51] signal: Handle ignored signals in do_sigaction(action != SIG_IGN) Thomas Gleixner
2024-06-10 16:43 ` [patch V3 48/51] signal: Queue ignored posixtimers on ignore list Thomas Gleixner
2024-06-10 16:43 ` [patch V3 49/51] posix-timers: Cleanup SIG_IGN workaround leftovers Thomas Gleixner
2024-06-10 16:43 ` [patch V3 50/51] alarmtimers: Remove the throttle mechanism from alarm_forward_now() Thomas Gleixner
2024-06-10 16:43 ` [patch V3 51/51] alarmtimers: Remove return value from alarm functions Thomas Gleixner
2024-06-10 19:49 ` [patch V3 00/51] posix-timers: Cure inconsistencies and the SIG_IGN mess Peter Zijlstra
2024-06-11  6:58 ` Thomas Gleixner
2024-06-23 11:24   ` Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240610164025.579598461@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=anna-maria@linutronix.de \
    --cc=ebiederm@xmission.com \
    --cc=frederic@kernel.org \
    --cc=jstultz@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=oleg@redhat.com \
    --cc=peterz@infradead.org \
    --cc=sboyd@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox