From: Florin Coras <fcoras@cisco.com>
Date: Fri, 27 Nov 2020 17:49:10 +0000 (-0800)
Subject: svm: make svm queue mutex robust
X-Git-Tag: v21.06-rc0~96
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F30185%2F4;p=vpp.git

svm: make svm queue mutex robust

Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I256774c25b3c4105139a4728724a1a0c775e740f
---

diff --git a/src/svm/message_queue.h b/src/svm/message_queue.h
index 37293fc29d1..13f4d80d215 100644
--- a/src/svm/message_queue.h
+++ b/src/svm/message_queue.h
@@ -311,7 +311,10 @@ svm_msg_q_try_lock (svm_msg_q_t * mq)
 static inline int
 svm_msg_q_lock (svm_msg_q_t * mq)
 {
-  return pthread_mutex_lock (&mq->q->mutex);
+  int rv = pthread_mutex_lock (&mq->q->mutex);
+  if (PREDICT_FALSE (rv == EOWNERDEAD))
+    rv = pthread_mutex_consistent (&mq->q->mutex);
+  return rv;
 }
 
 /**
diff --git a/src/svm/queue.c b/src/svm/queue.c
index 8d70dda61a3..96383d44f3d 100644
--- a/src/svm/queue.c
+++ b/src/svm/queue.c
@@ -51,6 +51,8 @@ svm_queue_init (void *base, int nels, int elsize)
     clib_unix_warning ("mutexattr_init");
   if (pthread_mutexattr_setpshared (&attr, PTHREAD_PROCESS_SHARED))
     clib_unix_warning ("pthread_mutexattr_setpshared");
+  if (pthread_mutexattr_setrobust (&attr, PTHREAD_MUTEX_ROBUST))
+    clib_unix_warning ("setrobust");
   if (pthread_mutex_init (&q->mutex, &attr))
     clib_unix_warning ("mutex_init");
   if (pthread_mutexattr_destroy (&attr))
@@ -96,7 +98,9 @@ svm_queue_free (svm_queue_t * q)
 void
 svm_queue_lock (svm_queue_t * q)
 {
-  pthread_mutex_lock (&q->mutex);
+  int rv = pthread_mutex_lock (&q->mutex);
+  if (PREDICT_FALSE (rv == EOWNERDEAD))
+    pthread_mutex_consistent (&q->mutex);
 }
 
 void