b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
162 lines
4.6 KiB
Diff
162 lines
4.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 23 Sep 2020 11:18:44 +0200
|
|
Subject: [PATCH] multipathd: move threads destruction into separate function
|
|
|
|
Also, introduce booleans that indicate a certain thread has
|
|
been started successfully. Using these booleans, we can avoid
|
|
crashing by cancelling threads that have never been started.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 76 +++++++++++++++++++++++++++++++----------------
|
|
1 file changed, 51 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index eb760a71..9eb658d4 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -129,6 +129,9 @@ static volatile enum daemon_status running_state = DAEMON_INIT;
|
|
pid_t daemon_pid;
|
|
static pthread_mutex_t config_lock = PTHREAD_MUTEX_INITIALIZER;
|
|
static pthread_cond_t config_cond;
|
|
+static pthread_t check_thr, uevent_thr, uxlsnr_thr, uevq_thr, dmevent_thr;
|
|
+static bool check_thr_started, uevent_thr_started, uxlsnr_thr_started,
|
|
+ uevq_thr_started, dmevent_thr_started;
|
|
|
|
static inline enum daemon_status get_running_state(void)
|
|
{
|
|
@@ -2927,6 +2930,39 @@ static void cleanup_vecs(void)
|
|
FREE(gvecs);
|
|
}
|
|
|
|
+static void cleanup_threads(void)
|
|
+{
|
|
+ stop_io_err_stat_thread();
|
|
+
|
|
+ if (check_thr_started)
|
|
+ pthread_cancel(check_thr);
|
|
+ if (uevent_thr_started)
|
|
+ pthread_cancel(uevent_thr);
|
|
+ if (uxlsnr_thr_started)
|
|
+ pthread_cancel(uxlsnr_thr);
|
|
+ if (uevq_thr_started)
|
|
+ pthread_cancel(uevq_thr);
|
|
+ if (dmevent_thr_started)
|
|
+ pthread_cancel(dmevent_thr);
|
|
+
|
|
+ if (check_thr_started)
|
|
+ pthread_join(check_thr, NULL);
|
|
+ if (uevent_thr_started)
|
|
+ pthread_join(uevent_thr, NULL);
|
|
+ if (uxlsnr_thr_started)
|
|
+ pthread_join(uxlsnr_thr, NULL);
|
|
+ if (uevq_thr_started)
|
|
+ pthread_join(uevq_thr, NULL);
|
|
+ if (dmevent_thr_started)
|
|
+ pthread_join(dmevent_thr, NULL);
|
|
+
|
|
+ /*
|
|
+ * As all threads are joined now, and we're in DAEMON_SHUTDOWN
|
|
+ * state, no new waiter threads will be created any more.
|
|
+ */
|
|
+ pthread_attr_destroy(&waiter_attr);
|
|
+}
|
|
+
|
|
/*
|
|
* Use a non-default call_rcu_data for child().
|
|
*
|
|
@@ -2972,7 +3008,6 @@ static void cleanup_rcu(void)
|
|
static int
|
|
child (__attribute__((unused)) void *param)
|
|
{
|
|
- pthread_t check_thr, uevent_thr, uxlsnr_thr, uevq_thr, dmevent_thr;
|
|
pthread_attr_t log_attr, misc_attr, uevent_attr;
|
|
struct vectors * vecs;
|
|
int rc;
|
|
@@ -3070,9 +3105,12 @@ child (__attribute__((unused)) void *param)
|
|
condlog(0, "failed to create cli listener: %d", rc);
|
|
goto failed;
|
|
}
|
|
- else if (state != DAEMON_CONFIGURE) {
|
|
- condlog(0, "cli listener failed to start");
|
|
- goto failed;
|
|
+ else {
|
|
+ uxlsnr_thr_started = true;
|
|
+ if (state != DAEMON_CONFIGURE) {
|
|
+ condlog(0, "cli listener failed to start");
|
|
+ goto failed;
|
|
+ }
|
|
}
|
|
|
|
if (poll_dmevents) {
|
|
@@ -3085,7 +3123,8 @@ child (__attribute__((unused)) void *param)
|
|
condlog(0, "failed to create dmevent waiter thread: %d",
|
|
rc);
|
|
goto failed;
|
|
- }
|
|
+ } else
|
|
+ dmevent_thr_started = true;
|
|
}
|
|
|
|
/*
|
|
@@ -3094,7 +3133,8 @@ child (__attribute__((unused)) void *param)
|
|
if ((rc = pthread_create(&uevent_thr, &uevent_attr, ueventloop, udev))) {
|
|
condlog(0, "failed to create uevent thread: %d", rc);
|
|
goto failed;
|
|
- }
|
|
+ } else
|
|
+ uevent_thr_started = true;
|
|
pthread_attr_destroy(&uevent_attr);
|
|
|
|
/*
|
|
@@ -3103,11 +3143,13 @@ child (__attribute__((unused)) void *param)
|
|
if ((rc = pthread_create(&check_thr, &misc_attr, checkerloop, vecs))) {
|
|
condlog(0,"failed to create checker loop thread: %d", rc);
|
|
goto failed;
|
|
- }
|
|
+ } else
|
|
+ check_thr_started = true;
|
|
if ((rc = pthread_create(&uevq_thr, &misc_attr, uevqloop, vecs))) {
|
|
condlog(0, "failed to create uevent dispatcher: %d", rc);
|
|
goto failed;
|
|
- }
|
|
+ } else
|
|
+ uevq_thr_started = true;
|
|
pthread_attr_destroy(&misc_attr);
|
|
|
|
while (1) {
|
|
@@ -3136,22 +3178,7 @@ child (__attribute__((unused)) void *param)
|
|
}
|
|
}
|
|
|
|
- pthread_cancel(check_thr);
|
|
- pthread_cancel(uevent_thr);
|
|
- pthread_cancel(uxlsnr_thr);
|
|
- pthread_cancel(uevq_thr);
|
|
- if (poll_dmevents)
|
|
- pthread_cancel(dmevent_thr);
|
|
-
|
|
- pthread_join(check_thr, NULL);
|
|
- pthread_join(uevent_thr, NULL);
|
|
- pthread_join(uxlsnr_thr, NULL);
|
|
- pthread_join(uevq_thr, NULL);
|
|
- if (poll_dmevents)
|
|
- pthread_join(dmevent_thr, NULL);
|
|
-
|
|
- stop_io_err_stat_thread();
|
|
-
|
|
+ cleanup_threads();
|
|
cleanup_vecs();
|
|
cleanup_foreign();
|
|
cleanup_checkers();
|
|
@@ -3178,7 +3205,6 @@ child (__attribute__((unused)) void *param)
|
|
conf = rcu_dereference(multipath_conf);
|
|
rcu_assign_pointer(multipath_conf, NULL);
|
|
call_rcu(&conf->rcu, rcu_free_config);
|
|
- pthread_attr_destroy(&waiter_attr);
|
|
#ifdef _DEBUG_
|
|
dbg_free_final(NULL);
|
|
#endif
|