diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-11-01 01:26:01 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2016-11-01 01:28:00 +0100 |
| commit | eb90b7fbc1a64b7eeec0466f52a43dd8e6d8c8c5 (patch) | |
| tree | 46a7e49769ca604f6a9cc3df86f619946968d313 /vlib/vlib/node_funcs.h | |
| parent | d5c9d6f30aa37ea8d7fdf8a79d3ab4c2e67d3249 (diff) | |
node: ensure that vlib_node_runtime_t is cacheline sized
Change-Id: Ib14ba63d09212a172fe52b01131404bf50cc494d
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vlib/vlib/node_funcs.h')
| -rw-r--r-- | vlib/vlib/node_funcs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vlib/vlib/node_funcs.h b/vlib/vlib/node_funcs.h index bd199fa52f4..2116739602e 100644 --- a/vlib/vlib/node_funcs.h +++ b/vlib/vlib/node_funcs.h @@ -130,7 +130,9 @@ vlib_node_set_runtime_data (vlib_main_t * vm, u32 node_index, vec_free (n->runtime_data); vec_add (n->runtime_data, runtime_data, n_runtime_data_bytes); - ASSERT (vec_len (n->runtime_data) <= sizeof (r->runtime_data)); + ASSERT (vec_len (n->runtime_data) <= sizeof (vlib_node_runtime_t) - + STRUCT_OFFSET_OF (vlib_node_runtime_t, runtime_data)); + if (vec_len (n->runtime_data) > 0) clib_memcpy (r->runtime_data, n->runtime_data, vec_len (n->runtime_data)); } |