summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Clad <fclad@cisco.com>2018-04-09 12:12:50 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2018-04-10 10:31:44 +0000
commit380e3daaaffd309febfc4764731982af08aa2dce (patch)
tree6b44d35944690ba4192a7494f47a9d68a7bf72f2
parent537eeeca36dcc08a3c337a7cfd1c1c426d43f563 (diff)
srv6-ad: fixing cache size issue
Change-Id: Iaadfbc75832e37ae52511b25448da14116214fc1 Signed-off-by: Francois Clad <fclad@cisco.com>
-rw-r--r--src/plugins/srv6-ad/ad.c2
-rw-r--r--src/plugins/srv6-ad/ad.h1
-rw-r--r--src/plugins/srv6-ad/node.c26
3 files changed, 18 insertions, 11 deletions
diff --git a/src/plugins/srv6-ad/ad.c b/src/plugins/srv6-ad/ad.c
index b6f872d4d25..58dd9907d89 100644
--- a/src/plugins/srv6-ad/ad.c
+++ b/src/plugins/srv6-ad/ad.c
@@ -112,6 +112,8 @@ srv6_ad_localsid_creation_fn (ip6_sr_localsid_t * localsid)
}
}
+ ls_mem->rw_len = 0;
+
return 0;
}
diff --git a/src/plugins/srv6-ad/ad.h b/src/plugins/srv6-ad/ad.h
index 851d3ed398f..950085f2e13 100644
--- a/src/plugins/srv6-ad/ad.h
+++ b/src/plugins/srv6-ad/ad.h
@@ -53,6 +53,7 @@ typedef struct
u8 ip_version;
u32 sw_if_index_in; /**< Incoming iface from proxied dev. */
+ u32 rw_len; /**< Number of bits to be rewritten */
u8 *rewrite; /**< Headers to be rewritten */
} srv6_ad_localsid_t;
diff --git a/src/plugins/srv6-ad/node.c b/src/plugins/srv6-ad/node.c
index 4bc110d8a1c..e2111d65431 100644
--- a/src/plugins/srv6-ad/node.c
+++ b/src/plugins/srv6-ad/node.c
@@ -160,8 +160,12 @@ end_ad_processing (vlib_buffer_t * b0,
ls0_mem = ls0->plugin_mem;
/* Cache IP header and extensions */
- vec_validate (ls0_mem->rewrite, total_size - 1);
+ if (PREDICT_FALSE (total_size > ls0_mem->rw_len))
+ {
+ vec_validate (ls0_mem->rewrite, total_size - 1);
+ }
clib_memcpy (ls0_mem->rewrite, ip0, total_size);
+ ls0_mem->rw_len = total_size;
/* Remove IP header and extensions */
vlib_buffer_advance (b0, total_size);
@@ -332,11 +336,11 @@ srv6_ad4_rewrite_fn (vlib_main_t * vm,
else
{
ASSERT (VLIB_BUFFER_PRE_DATA_SIZE >=
- (vec_len (ls0_mem->rewrite) + b0->current_data));
+ (ls0_mem->rw_len + b0->current_data));
- clib_memcpy (((u8 *) ip0_encap) - vec_len (ls0_mem->rewrite),
- ls0_mem->rewrite, vec_len (ls0_mem->rewrite));
- vlib_buffer_advance (b0, -(word) vec_len (ls0_mem->rewrite));
+ clib_memcpy (((u8 *) ip0_encap) - ls0_mem->rw_len,
+ ls0_mem->rewrite, ls0_mem->rw_len);
+ vlib_buffer_advance (b0, -(word) ls0_mem->rw_len);
ip0 = vlib_buffer_get_current (b0);
@@ -348,7 +352,7 @@ srv6_ad4_rewrite_fn (vlib_main_t * vm,
ip0_encap->checksum = checksum0;
/* Update outer IPv6 length (in case it has changed) */
- new_l0 = vec_len (ls0_mem->rewrite) - sizeof (ip6_header_t) +
+ new_l0 = ls0_mem->rw_len - sizeof (ip6_header_t) +
clib_net_to_host_u16 (ip0_encap->length);
ip0->payload_length = clib_host_to_net_u16 (new_l0);
}
@@ -465,11 +469,11 @@ srv6_ad6_rewrite_fn (vlib_main_t * vm,
else
{
ASSERT (VLIB_BUFFER_PRE_DATA_SIZE >=
- (vec_len (ls0_mem->rewrite) + b0->current_data));
+ (ls0_mem->rw_len + b0->current_data));
- clib_memcpy (((u8 *) ip0_encap) - vec_len (ls0_mem->rewrite),
- ls0_mem->rewrite, vec_len (ls0_mem->rewrite));
- vlib_buffer_advance (b0, -(word) vec_len (ls0_mem->rewrite));
+ clib_memcpy (((u8 *) ip0_encap) - ls0_mem->rw_len,
+ ls0_mem->rewrite, ls0_mem->rw_len);
+ vlib_buffer_advance (b0, -(word) ls0_mem->rw_len);
ip0 = vlib_buffer_get_current (b0);
@@ -477,7 +481,7 @@ srv6_ad6_rewrite_fn (vlib_main_t * vm,
ip0_encap->hop_limit -= 1;
/* Update outer IPv6 length (in case it has changed) */
- new_l0 = vec_len (ls0_mem->rewrite) +
+ new_l0 = ls0_mem->rw_len +
clib_net_to_host_u16 (ip0_encap->payload_length);
ip0->payload_length = clib_host_to_net_u16 (new_l0);
}