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_bridge_domain.h | |
| 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_bridge_domain.h')
| -rw-r--r-- | src/plugins/gbp/gbp_bridge_domain.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/gbp/gbp_bridge_domain.h b/src/plugins/gbp/gbp_bridge_domain.h index 67043685ea3..0449240083c 100644 --- a/src/plugins/gbp/gbp_bridge_domain.h +++ b/src/plugins/gbp/gbp_bridge_domain.h @@ -17,6 +17,7 @@ #define __GBP_BRIDGE_DOMAIN_H__ #include <plugins/gbp/gbp_types.h> +#include <plugins/gbp/gbp_itf.h> #include <vnet/fib/fib_types.h> #include <vnet/l2/l2_bd.h> @@ -70,7 +71,7 @@ typedef struct gbp_bridge_domain_t_ /** * The BD's interface to sned Broadcast and multicast packets */ - u32 gb_bm_flood_sw_if_index; + gbp_itf_hdl_t gb_bm_flood_itf; /** * The index of the BD's VNI interface on which packets from @@ -85,9 +86,11 @@ typedef struct gbp_bridge_domain_t_ u32 gb_locks; } gbp_bridge_domain_t; -extern void gbp_bridge_domain_itf_add (u32 sw_if_index, u32 bd_index, +extern void gbp_bridge_domain_itf_add (index_t gbdi, + u32 sw_if_index, l2_bd_port_type_t type); -extern void gbp_bridge_domain_itf_del (u32 sw_if_index, u32 bd_index, +extern void gbp_bridge_domain_itf_del (index_t gbdi, + u32 sw_if_index, l2_bd_port_type_t type); extern int gbp_bridge_domain_add_and_lock (u32 bd_id, |