Fix LB memory leak and remove useless code

[vpp.git] / src / plugins / lb / lb.c

diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c
index 041c65c..601b297 100644 (file)
--- a/src/plugins/lb/lb.c
+++ b/src/plugins/lb/lb.c
@@ -383,7 +383,6 @@ static void lb_vip_update_new_flow_table(lb_vip_t *vip)
   lb_new_flow_entry_t *new_flow_table = 0;
   lb_as_t *as;
   lb_pseudorand_t *pr, *sort_arr = 0;
-  u32 count;
 
   ASSERT (lbm->writer_lock[0]); //We must have the lock
 
@@ -408,7 +407,6 @@ out:
   }
 
   //First, let's sort the ASs
-  sort_arr = 0;
   vec_alloc(sort_arr, pool_elts(vip->as_indexes));
 
   i = 0;
@@ -463,16 +461,8 @@ out:
     }
   }
 
-  vec_free(sort_arr);
-
 finished:
-
-//Count number of changed entries
-  count = 0;
-  for (i=0; i<vec_len(new_flow_table); i++)
-    if (vip->new_flow_table == 0 ||
-        new_flow_table[i].as_index != vip->new_flow_table[i].as_index)
-      count++;
+  vec_free(sort_arr);
 
   old_table = vip->new_flow_table;
   vip->new_flow_table = new_flow_table;
@@ -762,12 +752,41 @@ next:
   return 0;
 }
 
-int lb_vip_del_ass_withlock(u32 vip_index, ip46_address_t *addresses, u32 n)
+int
+lb_flush_vip_as (u32 vip_index, u32 as_index)
+{
+  u32 thread_index;
+  vlib_thread_main_t *tm = vlib_get_thread_main();
+  lb_main_t *lbm = &lb_main;
+
+  for(thread_index = 0; thread_index < tm->n_vlib_mains; thread_index++ ) {
+    lb_hash_t *h = lbm->per_cpu[thread_index].sticky_ht;
+    if (h != NULL) {
+        u32 i;
+        lb_hash_bucket_t *b;
+
+        lb_hash_foreach_entry(h, b, i) {
+          if ((b->vip[i] == vip_index)
+              || (b->value[i] == as_index))
+            {
+              vlib_refcount_add(&lbm->as_refcount, thread_index, b->value[i], -1);
+              vlib_refcount_add(&lbm->as_refcount, thread_index, 0, 1);
+              b->vip[i] = ~0;
+              b->value[i] = ~0;
+            }
+        }
+    }
+  }
+
+  return 0;
+}
+
+int lb_vip_del_ass_withlock(u32 vip_index, ip46_address_t *addresses, u32 n,
+                            u32 *as_index)
 {
   lb_main_t *lbm = &lb_main;
   u32 now = (u32) vlib_time_now(vlib_get_main());
   u32 *ip = 0;
-  u32 as_index = 0;
 
   lb_vip_t *vip;
   if (!(vip = lb_vip_get_by_index(vip_index))) {
@@ -776,7 +795,7 @@ int lb_vip_del_ass_withlock(u32 vip_index, ip46_address_t *addresses, u32 n)
 
   u32 *indexes = NULL;
   while (n--) {
-    if (lb_as_find_index_vip(vip, &addresses[n], &as_index)) {
+    if (lb_as_find_index_vip(vip, &addresses[n], as_index)) {
       vec_free(indexes);
       return VNET_API_ERROR_NO_SUCH_ENTRY;
     }
@@ -790,7 +809,7 @@ int lb_vip_del_ass_withlock(u32 vip_index, ip46_address_t *addresses, u32 n)
       }
     }
 
-    vec_add1(indexes, as_index);
+    vec_add1(indexes, *as_index);
 next:
   continue;
   }
@@ -812,12 +831,19 @@ next:
   return 0;
 }
 
-int lb_vip_del_ass(u32 vip_index, ip46_address_t *addresses, u32 n)
+int lb_vip_del_ass(u32 vip_index, ip46_address_t *addresses, u32 n, u8 flush)
 {
+  u32 as_index = 0;
   lb_get_writer_lock();
-  int ret = lb_vip_del_ass_withlock(vip_index, addresses, n);
+  int ret = lb_vip_del_ass_withlock(vip_index, addresses, n, &as_index);
   lb_put_writer_lock();
 
+  if(flush)
+    {
+      /* flush flow table per as of per-port-vip */
+      ret = lb_flush_vip_as(vip_index, as_index);
+    }
+
   return ret;
 }
 
@@ -1182,7 +1208,7 @@ int lb_vip_del(u32 vip_index)
         vec_add1(ass, as->address);
     });
     if (vec_len(ass))
-      lb_vip_del_ass_withlock(vip_index, ass, vec_len(ass));
+      lb_vip_del_ass_withlock(vip_index, ass, vec_len(ass), as_index);
     vec_free(ass);
   }