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_endpoint.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/gbp/gbp_endpoint.h') diff --git a/src/plugins/gbp/gbp_endpoint.h b/src/plugins/gbp/gbp_endpoint.h index 27df6447e20..3155e7be4e0 100644 --- a/src/plugins/gbp/gbp_endpoint.h +++ b/src/plugins/gbp/gbp_endpoint.h @@ -17,6 +17,7 @@ #define __GBP_ENDPOINT_H__ #include +#include #include #include @@ -122,7 +123,7 @@ typedef struct gbp_endpoint_loc_t_ /** * The interface on which the EP is connected */ - u32 gel_sw_if_index; + gbp_itf_hdl_t gel_itf; /** * Endpoint flags @@ -158,7 +159,7 @@ typedef struct gbp_endpoint_fwd_t_ /** * The interface on which the EP is connected */ - index_t gef_itf; + gbp_itf_hdl_t gef_itf; /** * The L3 adj, if created -- cgit 1.2.3-korg