diff options
author | Neale Ranns <nranns@cisco.com> | 2019-07-05 00:53:45 -0700 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2019-07-09 15:45:52 +0000 |
commit | e28c87cd00644205e9bebca054029a8e655ed015 (patch) | |
tree | 8e6e0bac3b6d269c00b569a3ebf60338237c8a29 /src/plugins/gbp/gbp_recirc.c | |
parent | 777d2aee8054e77e6f265879e1dfe3776d90d758 (diff) |
gbp: Ownership of dynamically created vxlan-gbp tunnels managed via gbp_itf
Type: fix
This solves the ownership of vxlan-gbp tunnels. When the last reference of these goes away they need to be deleted. Currently there are two owners; gbp_itf via gef_itf and the lock held by the gbp_endpoint_location_t. The problem is that the
loc removes its reference whilst the fwd still holds the gbp_itf, and things go wrong.
This change moves the lifecycle management of the vxlan-gbp tunnel to the gbp_itf. When the last lock of the gbp_itf goes, so does the tunnel. now both the EP's loc and fwd can hold a lock on the gbp_itf and it's only removed when required.
The other change is the management of the 'user' of the gbp_itf. Since each user can enable and disable different features, it's the job of the gbp_itf to apply the combined set. determining a unique 'uesr' from the caller was near impossible, so I moved that to the gbp_itf, and return the allocated user, hence the 'handle' that encodes both user and interface.
The hash table maps from sw_if_index to pool index.
Change-Id: I4c7bf4c0e5dcf33d1c545f262365e69151febcf4
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/plugins/gbp/gbp_recirc.c')
-rw-r--r-- | src/plugins/gbp/gbp_recirc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gbp/gbp_recirc.c b/src/plugins/gbp/gbp_recirc.c index 87d0d0564ad..2b45d484289 100644 --- a/src/plugins/gbp/gbp_recirc.c +++ b/src/plugins/gbp/gbp_recirc.c @@ -108,7 +108,7 @@ gbp_recirc_add (u32 sw_if_index, sclass_t sclass, u8 is_ext) /* * bind to the bridge-domain of the EPG */ - gr->gr_itf = gbp_itf_add_and_lock (gr->gr_sw_if_index, gg->gg_bd_index); + gr->gr_itf = gbp_itf_l2_add_and_lock (gr->gr_sw_if_index, gg->gg_gbd); /* * set the interface into L2 emulation mode @@ -211,7 +211,7 @@ gbp_recirc_delete (u32 sw_if_index) ip6_sw_interface_enable_disable (gr->gr_sw_if_index, 0); l2e_disable (gr->gr_sw_if_index); - gbp_itf_unlock (gr->gr_itf); + gbp_itf_unlock (&gr->gr_itf); gbp_endpoint_group_unlock (gr->gr_epgi); gbp_recirc_db[sw_if_index] = INDEX_INVALID; |