diff options
| author |   Ray Kinsella <mdr@ashroe.eu> | 2021-11-17 10:03:04 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2021-11-23 12:58:42 +0000 |
| commit | 0a7551bef872363bd3a25129bdc91dbf2a3b1ee2 (patch) | |
| tree | a4e9aecae1e83b3aaf1aa47b5aede70d05848f38 | |
| parent | 2dc942e8735de7e4e6bb7212e2c006190d5dcc52 (diff) | |
vxlan: multiarch optimization of vxlan
Fixing the mutliarch versions of vxlan, geneve and friends. Ensures that
main struct is correctly sized for all multiarch permutations.
Type: fix
Fixes: 290526e3c
Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
Change-Id: I7c4c435763a5dcb0c3b429cd4f361d373d480c03
| -rw-r--r-- | src/plugins/geneve/geneve.h | 2 | ||||
| -rw-r--r-- | src/plugins/gtpu/gtpu.h | 2 | ||||
| -rw-r--r-- | src/vnet/ip/vtep.h | 2 | ||||
| -rw-r--r-- | src/vnet/vxlan-gpe/vxlan_gpe.h | 2 | ||||
| -rw-r--r-- | src/vnet/vxlan/vxlan.h | 2 |
5 files changed, 1 insertions, 9 deletions
diff --git a/src/plugins/geneve/geneve.h b/src/plugins/geneve/geneve.h index 0cc14214b9b..deb51abe126 100644 --- a/src/plugins/geneve/geneve.h +++ b/src/plugins/geneve/geneve.h @@ -187,9 +187,7 @@ typedef struct u16 msg_id_base; /* cache for last 8 geneve tunnel */ -#ifdef CLIB_HAVE_VEC512 vtep4_cache_t vtep4_u512; -#endif } geneve_main_t; diff --git a/src/plugins/gtpu/gtpu.h b/src/plugins/gtpu/gtpu.h index 59e340148fb..72d09232001 100644 --- a/src/plugins/gtpu/gtpu.h +++ b/src/plugins/gtpu/gtpu.h @@ -237,9 +237,7 @@ typedef struct vnet_main_t *vnet_main; u32 flow_id_start; /* cache for last 8 gtpu tunnel */ -#ifdef CLIB_HAVE_VEC512 vtep4_cache_t vtep4_u512; -#endif } gtpu_main_t; diff --git a/src/vnet/ip/vtep.h b/src/vnet/ip/vtep.h index 92e8002e55a..8b2c7fe723f 100644 --- a/src/vnet/ip/vtep.h +++ b/src/vnet/ip/vtep.h @@ -111,13 +111,13 @@ vtep4_check (vtep_table_t * t, vlib_buffer_t * b0, ip4_header_t * ip40, return VTEP_CHECK_PASS; } -#ifdef CLIB_HAVE_VEC512 typedef struct { vtep4_key_t vtep4_cache[8]; int idx; } vtep4_cache_t; +#ifdef CLIB_HAVE_VEC512 always_inline u8 vtep4_check_vector (vtep_table_t * t, vlib_buffer_t * b0, ip4_header_t * ip40, vtep4_key_t * last_k4, vtep4_cache_t * vtep4_u512) diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.h b/src/vnet/vxlan-gpe/vxlan_gpe.h index 5d21ee66d67..2cbbb6c5f36 100644 --- a/src/vnet/vxlan-gpe/vxlan_gpe.h +++ b/src/vnet/vxlan-gpe/vxlan_gpe.h @@ -237,9 +237,7 @@ typedef struct vnet_main_t *vnet_main; /* cache for last 8 vxlan_gpe tunnel */ -#ifdef CLIB_HAVE_VEC512 vtep4_cache_t vtep4_u512; -#endif /** List of next nodes for the decap indexed on protocol */ uword decap_next_node_list[VXLAN_GPE_PROTOCOL_MAX]; diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h index be819ab1069..d6dad7a6fae 100644 --- a/src/vnet/vxlan/vxlan.h +++ b/src/vnet/vxlan/vxlan.h @@ -191,9 +191,7 @@ typedef struct u32 flow_id_start; /* cache for last 8 vxlan tunnel */ -#ifdef CLIB_HAVE_VEC512 vtep4_cache_t vtep4_u512; -#endif } vxlan_main_t; |