vlib: enqueue_to_next_with_aux implementation

Change-Id: I0e1bb39d765ec3efa7b28ca02fb7beeb23607e51
Type: improvement
Signed-off-by: Mohammed Hawari <mohammed@hawari.fr>
This commit is contained in:
Mohammed Hawari
2022-05-31 18:11:05 +02:00
committed by Damjan Marion
parent b03eec969f
commit cd758e6af5
4 changed files with 232 additions and 36 deletions

View File

@ -372,16 +372,34 @@ vlib_frame_t *vlib_get_next_frame_internal (vlib_main_t * vm,
u32 next_index,
u32 alloc_new_frame);
#define vlib_get_next_frame_macro(vm,node,next_index,vectors,n_vectors_left,alloc_new_frame) \
do { \
vlib_frame_t * _f \
= vlib_get_next_frame_internal ((vm), (node), (next_index), \
(alloc_new_frame)); \
u32 _n = _f->n_vectors; \
(vectors) = vlib_frame_vector_args (_f) + _n * sizeof ((vectors)[0]); \
(n_vectors_left) = VLIB_FRAME_SIZE - _n; \
} while (0)
#define vlib_get_next_frame_macro(vm, node, next_index, vectors, \
n_vectors_left, alloc_new_frame) \
do \
{ \
vlib_frame_t *_f = vlib_get_next_frame_internal ( \
(vm), (node), (next_index), (alloc_new_frame)); \
u32 _n = _f->n_vectors; \
(vectors) = vlib_frame_vector_args (_f) + _n * sizeof ((vectors)[0]); \
(n_vectors_left) = VLIB_FRAME_SIZE - _n; \
} \
while (0)
#define vlib_get_next_frame_macro_with_aux(vm, node, next_index, vectors, \
n_vectors_left, alloc_new_frame, \
aux_data, maybe_no_aux) \
do \
{ \
vlib_frame_t *_f = vlib_get_next_frame_internal ( \
(vm), (node), (next_index), (alloc_new_frame)); \
u32 _n = _f->n_vectors; \
(vectors) = vlib_frame_vector_args (_f) + _n * sizeof ((vectors)[0]); \
if ((maybe_no_aux) && (_f)->aux_offset == 0) \
(aux_data) = NULL; \
else \
(aux_data) = vlib_frame_aux_args (_f) + _n * sizeof ((aux_data)[0]); \
(n_vectors_left) = VLIB_FRAME_SIZE - _n; \
} \
while (0)
/** \brief Get pointer to next frame vector data by
(@c vlib_node_runtime_t, @c next_index).
@ -395,16 +413,69 @@ do { \
@return @c vectors -- pointer to next available vector slot
@return @c n_vectors_left -- number of vector slots available
*/
#define vlib_get_next_frame(vm,node,next_index,vectors,n_vectors_left) \
vlib_get_next_frame_macro (vm, node, next_index, \
vectors, n_vectors_left, \
#define vlib_get_next_frame(vm, node, next_index, vectors, n_vectors_left) \
vlib_get_next_frame_macro (vm, node, next_index, vectors, n_vectors_left, \
/* alloc new frame */ 0)
#define vlib_get_new_next_frame(vm,node,next_index,vectors,n_vectors_left) \
vlib_get_next_frame_macro (vm, node, next_index, \
vectors, n_vectors_left, \
#define vlib_get_new_next_frame(vm, node, next_index, vectors, \
n_vectors_left) \
vlib_get_next_frame_macro (vm, node, next_index, vectors, n_vectors_left, \
/* alloc new frame */ 1)
/** \brief Get pointer to next frame vector data and next frame aux data by
(@c vlib_node_runtime_t, @c next_index).
Standard single/dual loop boilerplate element.
@attention This is a MACRO, with SIDE EFFECTS.
@attention This MACRO is unsafe in case the next node does not support
aux_data
@param vm vlib_main_t pointer, varies by thread
@param node current node vlib_node_runtime_t pointer
@param next_index requested graph arc index
@return @c vectors -- pointer to next available vector slot
@return @c aux_data -- pointer to next available aux data slot
@return @c n_vectors_left -- number of vector slots available
*/
#define vlib_get_next_frame_with_aux(vm, node, next_index, vectors, aux_data, \
n_vectors_left) \
vlib_get_next_frame_macro_with_aux ( \
vm, node, next_index, vectors, n_vectors_left, /* alloc new frame */ 0, \
aux_data, /* maybe_no_aux */ 0)
#define vlib_get_new_next_frame_with_aux(vm, node, next_index, vectors, \
aux_data, n_vectors_left) \
vlib_get_next_frame_macro_with_aux ( \
vm, node, next_index, vectors, n_vectors_left, /* alloc new frame */ 1, \
aux_data, /* maybe_no_aux */ 0)
/** \brief Get pointer to next frame vector data and next frame aux data by
(@c vlib_node_runtime_t, @c next_index).
Standard single/dual loop boilerplate element.
@attention This is a MACRO, with SIDE EFFECTS.
@attention This MACRO is safe in case the next node does not support aux_data.
In that case aux_data is set to NULL.
@param vm vlib_main_t pointer, varies by thread
@param node current node vlib_node_runtime_t pointer
@param next_index requested graph arc index
@return @c vectors -- pointer to next available vector slot
@return @c aux_data -- pointer to next available aux data slot
@return @c n_vectors_left -- number of vector slots available
*/
#define vlib_get_next_frame_with_aux_safe(vm, node, next_index, vectors, \
aux_data, n_vectors_left) \
vlib_get_next_frame_macro_with_aux ( \
vm, node, next_index, vectors, n_vectors_left, /* alloc new frame */ 0, \
aux_data, /* maybe_no_aux */ 1)
#define vlib_get_new_next_frame_with_aux_safe(vm, node, next_index, vectors, \
aux_data, n_vectors_left) \
vlib_get_next_frame_macro_with_aux ( \
vm, node, next_index, vectors, n_vectors_left, /* alloc new frame */ 1, \
aux_data, /* maybe_no_aux */ 1)
/** \brief Release pointer to next frame vector data.
Standard single/dual loop boilerplate element.
@param vm vlib_main_t pointer, varies by thread