All of lore.kernel.org
 help / color / mirror / Atom feed
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 03/45] selftests/timers/posix_timers: Add SIG_IGN test
Date: Tue,  6 Jun 2023 16:37:22 +0200 (CEST)	[thread overview]
Message-ID: <20230606142031.189748136@linutronix.de> (raw)
In-Reply-To: 20230606132949.068951363@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 |  128 +++++++++++++++++++++++++-
 1 file changed, 126 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>
@@ -241,10 +242,131 @@ static void check_timer_distribution(voi
 		ksft_test_result_fail("check_signal_distribution\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 */
+		pthread_cancel(pthread);
+		pthread_join(pthread, NULL);
+	}
+
+	/* 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) {
+		if (tsig.signals == 1 && tsig.overruns == 29)
+			ksft_test_result_pass("check_sig_ign SIGEV_SIGNAL\n");
+		else
+			ksft_test_result_fail("check_sig_ign SIGEV_SIGNAL\n");
+	} else {
+		if (tsig.signals == 0 && tsig.overruns == 0)
+			ksft_test_result_pass("check_sig_ign SIGEV_THREAD_ID\n");
+		else
+			ksft_test_result_fail("check_sig_ign SIGEV_THREAD_ID\n");
+	}
+}
+
 int main(int argc, char **argv)
 {
 	ksft_print_header();
-	ksft_set_plan(6);
+	ksft_set_plan(8);
 
 	check_itimer(ITIMER_VIRTUAL, "ITIMER_VIRTUAL");
 	check_itimer(ITIMER_PROF, "ITIMER_PROF");
@@ -262,6 +384,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:[~2023-06-06 14:37 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-06 14:37 [patch 00/45] posix-timers: Cure inconsistencies and the SIG_IGN mess Thomas Gleixner
2023-06-06 14:37 ` [patch 01/45] selftests/timers/posix_timers: Make signal distribution test less fragile Thomas Gleixner
2023-06-06 14:37 ` [patch 02/45] selftests/timers/posix_timers: Use TAP reporting format Thomas Gleixner
2023-06-06 14:37 ` Thomas Gleixner [this message]
2023-06-06 14:37 ` [patch 04/45] selftests/timers/posix_timers: Validate signal rules Thomas Gleixner
2023-06-06 14:37 ` [patch 05/45] selftests/timers/posix-timers: Validate SIGEV_NONE Thomas Gleixner
2023-06-06 14:37 ` [patch 06/45] selftests/timers/posix-timers: Validate timer_gettime() Thomas Gleixner
2023-06-06 14:37 ` [patch 07/45] selftests/timers/posix-timers: Validate overrun after unblock Thomas Gleixner
2023-06-06 14:37 ` [patch 08/45] posix-timers: Convert timer list to hlist Thomas Gleixner
2023-06-22 21:18   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 09/45] posix-cpu-timers: Fix posix_cpu_timer_get() behaviour Thomas Gleixner
2023-06-26 22:46   ` Frederic Weisbecker
2023-06-29 18:14     ` Thomas Gleixner
2023-06-06 14:37 ` [patch 10/45] posix-cpu-timers: Use @now instead of @val for clarity Thomas Gleixner
2023-06-27  9:53   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 11/45] posix-cpu-timers: Remove incorrect comment in posix_cpu_timer_set() Thomas Gleixner
2023-06-27 10:30   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 12/45] posix-cpu-timers: Simplify posix_cpu_timer_set() Thomas Gleixner
2023-06-27 10:51   ` Frederic Weisbecker
2023-06-29 18:43     ` Thomas Gleixner
2023-06-06 14:37 ` [patch 13/45] posix-cpu-timers: Replace old expiry retrieval in posix_cpu_timer_set() Thomas Gleixner
2023-06-27 11:32   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 14/45] posix-timers: Consolidate interval retrieval Thomas Gleixner
2023-06-28 13:08   ` Frederic Weisbecker
2023-06-29 18:47     ` Thomas Gleixner
2023-06-30 11:25       ` Frederic Weisbecker
2023-06-30 13:07         ` Thomas Gleixner
2023-06-30 14:04           ` Frederic Weisbecker
2023-07-01 18:01             ` Thomas Gleixner
2023-06-06 14:37 ` [patch 15/45] posix-timers: Clear overrun in common_timer_set() Thomas Gleixner
2023-06-30 21:40   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 16/45] posix-timers: Consolidate timer setup Thomas Gleixner
2023-07-03 21:12   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 17/45] posix-cpu-timers: Make k_itimer::it_active consistent Thomas Gleixner
2023-07-03 22:30   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 18/45] posix-timers: Consolidate signal queueing Thomas Gleixner
2023-07-03 22:51   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 19/45] signal: Remove task argument from dequeue_signal() Thomas Gleixner
2023-07-04 10:02   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 20/45] signal: Replace BUG_ON()s Thomas Gleixner
2023-07-04 10:24   ` Frederic Weisbecker
2023-06-06 14:37 ` [patch 21/45] signal: Confine POSIX_TIMERS properly Thomas Gleixner
2023-06-06 14:37 ` [patch 22/45] signal: Get rid of resched_timer logic Thomas Gleixner
2023-06-06 14:37 ` [patch 23/45] posix-timers: Cure si_sys_private race Thomas Gleixner
2023-06-06 14:37 ` [patch 24/45] signal: Allow POSIX timer signals to be dropped Thomas Gleixner
2023-06-06 14:37 ` [patch 25/45] posix-timers: Drop signal if timer has been deleted or reprogrammed Thomas Gleixner
2023-06-06 14:38 ` [patch 26/45] posix-timers: Rename k_itimer::it_requeue_pending Thomas Gleixner
2023-06-06 14:38 ` [patch 27/45] posix-timers: Add proper state tracking Thomas Gleixner
2023-06-06 14:38 ` [patch 28/45] posix-timers: Make signal delivery consistent Thomas Gleixner
2023-06-06 14:38 ` [patch 29/45] posix-timers: Make signal overrun accounting sensible Thomas Gleixner
2023-06-06 14:38 ` [patch 30/45] posix-cpu-timers: Use dedicated flag for CPU timer nanosleep Thomas Gleixner
2023-06-06 14:38 ` [patch 31/45] posix-timers: Add a refcount to struct k_itimer Thomas Gleixner
2023-06-06 14:38 ` [patch 32/45] signal: Split up __sigqueue_alloc() Thomas Gleixner
2023-06-06 14:38 ` [patch 33/45] signal: Provide posixtimer_sigqueue_init() Thomas Gleixner
2023-06-06 14:38 ` [patch 34/45] signal: Add sys_private_ptr to siginfo::_sifields::_timer Thomas Gleixner
2023-06-06 14:38 ` [patch 35/45] signal: Refactor send_sigqueue() Thomas Gleixner
2023-06-06 14:38 ` [patch 36/45] posix-timers: Embed sigqueue in struct k_itimer Thomas Gleixner
2023-06-06 14:38 ` [patch 37/45] signal: Cleanup unused posix-timer leftovers Thomas Gleixner
2023-06-06 14:38 ` [patch 38/45] signal: Add task argument to flush_sigqueue_mask() Thomas Gleixner
2023-06-06 14:38 ` [patch 39/45] signal: Provide ignored_posix_timers list Thomas Gleixner
2023-06-06 14:38 ` [patch 40/45] posix-timers: Handle ignored list on delete and exit Thomas Gleixner
2023-06-06 14:38 ` [patch 41/45] signal: Handle ignored signals in do_sigaction(action != SIG_IGN) Thomas Gleixner
2023-06-06 14:38 ` [patch 42/45] signal: Queue ignored posixtimers on ignore list Thomas Gleixner
2023-06-06 14:38 ` [patch 43/45] posix-timers: Cleanup SIG_IGN workaround leftovers Thomas Gleixner
2023-06-06 14:38 ` [patch 44/45] alarmtimers: Remove the throttle mechanism from alarm_forward_now() Thomas Gleixner
2023-06-06 14:38 ` [patch 45/45] alarmtimers: Remove return value from alarm functions 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=20230606142031.189748136@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.