In order to safely use SIGALRM in a multi-threaded program, only one
thread can schedule and wait on SIGALRM at a time. All other threads
must have SIGALRM blocked, and be unable to schedule an alarm. The
strict_timing code in checkerloop was unblocking SIGALRM, and calling
setitimer(), without any locking. Instead, it should use nanosleep()
to sleep for the correct length of time, since that doesn't depend or
interfere with signals. io_err_stat_loop() was calling usleep() without
any locking. According to the POSIX standards, the result of a SIGARLM
occuring during a usleep call is undefined, even if the calling thread
blocks the signal. While this is unlikely to cause a problem on a
modern linux system, nanosleep is guaranteed to not interact with
SIGALRM, as long as the signal is blocked by the calling thread.
Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
---
libmultipath/io_err_stat.c | 3 ++-
multipathd/main.c | 27 +++++++++------------------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/libmultipath/io_err_stat.c b/libmultipath/io_err_stat.c
index 5b10f03..555af5d 100644
--- a/libmultipath/io_err_stat.c
+++ b/libmultipath/io_err_stat.c
@@ -697,8 +697,9 @@ static void *io_err_stat_loop(void *data)
mlockall(MCL_CURRENT | MCL_FUTURE);
while (1) {
+ struct timespec delay = {0, 100000000}; /* .1 sec */
service_paths();
- usleep(100000);
+ nanosleep(&delay, NULL);
}
pthread_cleanup_pop(1);
diff --git a/multipathd/main.c b/multipathd/main.c
index 889670c..55b92be 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1834,7 +1834,6 @@ checkerloop (void *ap)
struct path *pp;
int count = 0;
unsigned int i;
- struct itimerval timer_tick_it;
struct timespec last_time;
struct config *conf;
@@ -1852,8 +1851,7 @@ checkerloop (void *ap)
while (1) {
struct timespec diff_time, start_time, end_time;
- int num_paths = 0, ticks = 0, signo, strict_timing, rc = 0;
- sigset_t mask;
+ int num_paths = 0, ticks = 0, strict_timing, rc = 0;
if (clock_gettime(CLOCK_MONOTONIC, &start_time) != 0)
start_time.tv_sec = 0;
@@ -1941,25 +1939,18 @@ checkerloop (void *ap)
if (!strict_timing)
sleep(1);
else {
- timer_tick_it.it_interval.tv_sec = 0;
- timer_tick_it.it_interval.tv_usec = 0;
if (diff_time.tv_nsec) {
- timer_tick_it.it_value.tv_sec = 0;
- timer_tick_it.it_value.tv_usec =
+ diff_time.tv_sec = 0;
+ diff_time.tv_nsec =
1000UL * 1000 * 1000 - diff_time.tv_nsec;
- } else {
- timer_tick_it.it_value.tv_sec = 1;
- timer_tick_it.it_value.tv_usec = 0;
- }
- setitimer(ITIMER_REAL, &timer_tick_it, NULL);
+ } else
+ diff_time.tv_sec = 1;
- sigemptyset(&mask);
- sigaddset(&mask, SIGALRM);
condlog(3, "waiting for %lu.%06lu secs",
- timer_tick_it.it_value.tv_sec,
- timer_tick_it.it_value.tv_usec);
- if (sigwait(&mask, &signo) != 0) {
- condlog(3, "sigwait failed with error %d",
+ diff_time.tv_sec,
+ diff_time.tv_nsec / 1000);
+ if (nanosleep(&diff_time, NULL) != 0) {
+ condlog(3, "nanosleep failed with error %d",
errno);
conf = get_multipath_config();
conf->strict_timing = 0;
--
2.7.4
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
