ip_vs_conn: fix dest::dfc.master.timer deadlock problem when rs in pe…

…rsistent service is deleted

The deadlock problem is triggered when persistent templated session timed out and the realserver
was deleted previously. All timer functions called in timer's session expiration should use the
-nolock version.

Signed-off-by: ywc689 <[email protected]>

include/ipvs/dest.h

@@ -151,7 +151,7 @@ int dp_vs_dest_edit_health(struct dp_vs_service *svc, struct dp_vs_dest_conf *ud
 void dp_vs_dest_unlink(struct dp_vs_service *svc,
                         struct dp_vs_dest *dest, int svcupd);
 
-void dp_vs_dest_put(struct dp_vs_dest *dest);
+void dp_vs_dest_put(struct dp_vs_dest *dest, bool timerlock);
 
 int dp_vs_dest_del(struct dp_vs_service *svc, struct dp_vs_dest_conf *udest);
 

src/ipvs/ip_vs_conhash.c

@@ -141,7 +141,7 @@ static void node_fini(struct node_s *node)
         return;
 
     if (node->data) {
-        dp_vs_dest_put((struct dp_vs_dest *)node->data);
+        dp_vs_dest_put((struct dp_vs_dest *)node->data, true);
         node->data = NULL;
     }
 

src/ipvs/ip_vs_conn.c

@@ -388,7 +388,7 @@ static int dp_vs_conn_bind_dest(struct dp_vs_conn *conn,
     return EDPVS_OK;
 }
 
-static int dp_vs_conn_unbind_dest(struct dp_vs_conn *conn)
+static int dp_vs_conn_unbind_dest(struct dp_vs_conn *conn, bool timerlock)
 {
     struct dp_vs_dest *dest = conn->dest;
 
@@ -407,7 +407,7 @@ static int dp_vs_conn_unbind_dest(struct dp_vs_conn *conn)
         dest->flags &= ~DPVS_DEST_F_OVERLOAD;
     }
 
-    dp_vs_dest_put(dest);
+    dp_vs_dest_put(dest, timerlock);
 
     conn->dest = NULL;
     return EDPVS_OK;
@@ -680,7 +680,7 @@ static int dp_vs_conn_expire(void *priv)
             pp->conn_expire(pp, conn);
 
         dp_vs_conn_sa_release(conn);
-        dp_vs_conn_unbind_dest(conn);
+        dp_vs_conn_unbind_dest(conn, false);
         dp_vs_laddr_unbind(conn);
         dp_vs_conn_free_packets(conn);
 
@@ -784,7 +784,7 @@ static void conn_flush(void)
                               (struct sockaddr_storage *)&saddr);
                 }
 
-                dp_vs_conn_unbind_dest(conn);
+                dp_vs_conn_unbind_dest(conn, true);
                 dp_vs_laddr_unbind(conn);
                 rte_atomic32_dec(&conn->refcnt);
 
@@ -987,7 +987,7 @@ struct dp_vs_conn *dp_vs_conn_new(struct rte_mbuf *mbuf,
 unbind_laddr:
     dp_vs_laddr_unbind(new);
 unbind_dest:
-    dp_vs_conn_unbind_dest(new);
+    dp_vs_conn_unbind_dest(new, true);
 errout:
     dp_vs_conn_free(new);
     return NULL;

src/ipvs/ip_vs_dest.c

@@ -268,14 +268,18 @@ int dp_vs_dest_edit_health(struct dp_vs_service *svc, struct dp_vs_dest_conf *ud
     return EDPVS_OK;
 }
 
-void dp_vs_dest_put(struct dp_vs_dest *dest)
+void dp_vs_dest_put(struct dp_vs_dest *dest, bool timerlock)
 {
     if (!dest)
         return;
 
     if (rte_atomic32_dec_and_test(&dest->refcnt)) {
-        if (rte_lcore_id() == g_master_lcore_id)
-            dpvs_timer_cancel(&dest->dfc.master.timer, true);
+        if (rte_lcore_id() == g_master_lcore_id) {
+            if (timerlock)
+                dpvs_timer_cancel(&dest->dfc.master.timer, true);
+            else
+                dpvs_timer_cancel_nolock(&dest->dfc.master.timer, true);
+        }
         dp_vs_service_unbind(dest);
         rte_free(dest);
     }
@@ -333,7 +337,7 @@ dp_vs_dest_del(struct dp_vs_service *svc, struct dp_vs_dest_conf *udest)
     /*
      *      Delete the destination
      */
-    dp_vs_dest_put(dest);
+    dp_vs_dest_put(dest, true);
 
     return EDPVS_OK;
 }

src/ipvs/ip_vs_mh.c

@@ -97,7 +97,7 @@ static void dp_vs_mh_reset(struct dp_vs_mh_state *s)
     l = &s->lookup[0];
     for (i = 0; i < DP_VS_MH_TAB_SIZE; i++) {
         if (l->dest) {
-            dp_vs_dest_put(l->dest);
+            dp_vs_dest_put(l->dest, true);
             l->dest = NULL;
         }
         l++;
@@ -195,7 +195,7 @@ static int dp_vs_mh_populate(struct dp_vs_mh_state *s,
             new_dest = list_entry(p, struct dp_vs_dest, n_list);
             if (dest != new_dest) {
                 if (dest)
-                    dp_vs_dest_put(dest);
+                    dp_vs_dest_put(dest, true);
                 rte_atomic32_inc(&new_dest->refcnt);
                 s->lookup[c].dest = new_dest;
             }

src/ipvs/ip_vs_service.c

@@ -614,7 +614,7 @@ static void __dp_vs_service_del(struct dp_vs_service *svc)
      */
     list_for_each_entry_safe(dest, nxt, &svc->dests, n_list) {
         dp_vs_dest_unlink(svc, dest, 0);
-        dp_vs_dest_put(dest);
+        dp_vs_dest_put(dest, true);
     }
 
     /*