summaryrefslogtreecommitdiffstats
path: root/src/plugins/lb/lb.c
diff options
context:
space:
mode:
authorHongjun Ni <hongjun.ni@intel.com>2018-08-22 20:21:19 +0800
committerMarco Varlese <marco.varlese@suse.de>2018-09-07 07:33:31 +0000
commit49ca2601114a8a29520cba5f0ab3ea1dc1968f7f (patch)
tree48a3b52839e5ea475e4e794eab3d2efbea6eb4d0 /src/plugins/lb/lb.c
parente4b202a4148e534927e7f6662f1de3be9d1a5583 (diff)
Add flush flag on del as command
This patch depends on https://gerrit.fd.io/r/#/c/13260 Change-Id: If94968342935ebd24cf4ebed238e6a27d94959b7 Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
Diffstat (limited to 'src/plugins/lb/lb.c')
-rw-r--r--src/plugins/lb/lb.c50
1 files changed, 43 insertions, 7 deletions
diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c
index 041c65c1326..42103eeef2a 100644
--- a/src/plugins/lb/lb.c
+++ b/src/plugins/lb/lb.c
@@ -762,12 +762,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 +805,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 +819,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 +841,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 +1218,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);
}