From e28c87cd00644205e9bebca054029a8e655ed015 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Fri, 5 Jul 2019 00:53:45 -0700 Subject: 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 --- src/plugins/gbp/gbp_vxlan.h | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'src/plugins/gbp/gbp_vxlan.h') diff --git a/src/plugins/gbp/gbp_vxlan.h b/src/plugins/gbp/gbp_vxlan.h index 908abc2990e..6e01dc14d38 100644 --- a/src/plugins/gbp/gbp_vxlan.h +++ b/src/plugins/gbp/gbp_vxlan.h @@ -17,6 +17,7 @@ #define __GBP_VXLAN_H__ #include +#include #define forecah_gbp_vxlan_tunnel_layer \ _(L2, "l2") \ @@ -51,10 +52,6 @@ typedef struct gbp_vxlan_tunnel_t_ { struct { - /** - * BD index (if L2) - */ - u32 gt_bd_index; /** * Reference to the GPB-BD */ @@ -62,10 +59,6 @@ typedef struct gbp_vxlan_tunnel_t_ }; struct { - /** - * FIB inidices (if L3) - */ - u32 gt_fib_index[FIB_PROTOCOL_IP_MAX]; /** * References to the GBP-RD */ @@ -76,7 +69,7 @@ typedef struct gbp_vxlan_tunnel_t_ /** * gbp-itf config for this interface */ - index_t gt_itf; + gbp_itf_hdl_t gt_itf; /** * list of child vxlan-gbp tunnels built from this template @@ -115,13 +108,14 @@ extern int gbp_vxlan_tunnel_del (u32 vni); extern gbp_vxlan_tunnel_type_t gbp_vxlan_tunnel_get_type (u32 sw_if_index); -extern u32 gbp_vxlan_tunnel_clone_and_lock (u32 parent_tunnel, - const ip46_address_t * src, - const ip46_address_t * dst); +extern gbp_itf_hdl_t gbp_vxlan_tunnel_clone_and_lock (u32 parent_tunnel, + const ip46_address_t * + src, + const ip46_address_t * + dst); -extern void vxlan_gbp_tunnel_lock (u32 sw_if_index); -extern void vxlan_gbp_tunnel_unlock (u32 sw_if_index); extern u32 vxlan_gbp_tunnel_get_parent (u32 sw_if_index); +extern gbp_itf_hdl_t vxlan_gbp_tunnel_lock_itf (u32 sw_if_index); typedef walk_rc_t (*gbp_vxlan_cb_t) (gbp_vxlan_tunnel_t * gt, void *ctx); extern void gbp_vxlan_walk (gbp_vxlan_cb_t cb, void *ctx); -- cgit 1.2.3-korg