}
/* Common trace function for all ip4-forward next nodes. */
-void
+static void
mfib_forward_lookup_trace (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
t0 = vlib_add_trace (vm, node, b0, sizeof (t0[0]));
t0->entry_index = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
t0->fib_index = vec_elt (im->mfib_index_by_sw_if_index,
- vnet_buffer(b1)->sw_if_index[VLIB_RX]);
+ vnet_buffer(b0)->sw_if_index[VLIB_RX]);
}
if (b1->flags & VLIB_BUFFER_IS_TRACED)
{
{
ip4_header_t * ip0;
- fib_index0 = vec_elt (ip4_main.mfib_index_by_sw_if_index,
- vnet_buffer(p0)->sw_if_index[VLIB_RX]);
- ip0 = vlib_buffer_get_current (p0);
- mfei0 = ip4_mfib_table_lookup(ip4_mfib_get(fib_index0),
- &ip0->src_address,
- &ip0->dst_address,
- 64);
- }
- else
- {
- ip6_header_t * ip0;
-
- fib_index0 = vec_elt (ip6_main.mfib_index_by_sw_if_index,
- vnet_buffer(p0)->sw_if_index[VLIB_RX]);
- ip0 = vlib_buffer_get_current (p0);
- mfei0 = ip6_mfib_table_lookup2(ip6_mfib_get(fib_index0),
- &ip0->src_address,
- &ip0->dst_address);
- }
-
- vnet_buffer (p0)->ip.adj_index[VLIB_TX] = mfei0;
- }
-
- vlib_put_next_frame(vm, node,
- MFIB_FORWARD_LOOKUP_NEXT_RPF,
- n_left_to_next);
+ ip_lookup_set_buffer_fib_index (
+ ip4_main.fib_index_by_sw_if_index, p0);
+ fib_index0 = vec_elt (ip4_main.mfib_index_by_sw_if_index,
+ vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+ ip0 = vlib_buffer_get_current (p0);
+ mfei0 = ip4_mfib_table_lookup (ip4_mfib_get (fib_index0),
+ &ip0->src_address,
+ &ip0->dst_address, 64);
+ }
+ else
+ {
+ ip6_header_t *ip0;
+
+ ip_lookup_set_buffer_fib_index (
+ ip6_main.fib_index_by_sw_if_index, p0);
+ fib_index0 = vec_elt (ip6_main.mfib_index_by_sw_if_index,
+ vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+ ip0 = vlib_buffer_get_current (p0);
+ mfei0 = ip6_mfib_table_fwd_lookup (ip6_mfib_get (fib_index0),
+ &ip0->src_address,
+ &ip0->dst_address);
+ }
+
+ vnet_buffer (p0)->ip.adj_index[VLIB_TX] = mfei0;
+ }
+
+ vlib_put_next_frame (vm, node, MFIB_FORWARD_LOOKUP_NEXT_RPF,
+ n_left_to_next);
}
if (node->flags & VLIB_NODE_FLAG_TRACE)
return frame->n_vectors;
}
-static uword
-ip4_mfib_forward_lookup (vlib_main_t * vm,
+VLIB_NODE_FN (ip4_mfib_forward_lookup_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
return (mfib_forward_lookup (vm, node, frame, 1));
}
-VLIB_REGISTER_NODE (ip4_mfib_forward_lookup_node, static) = {
- .function = ip4_mfib_forward_lookup,
+VLIB_REGISTER_NODE (ip4_mfib_forward_lookup_node) = {
.name = "ip4-mfib-forward-lookup",
.vector_size = sizeof (u32),
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_mfib_forward_lookup_node,
- ip4_mfib_forward_lookup)
-
-static uword
-ip6_mfib_forward_lookup (vlib_main_t * vm,
+VLIB_NODE_FN (ip6_mfib_forward_lookup_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
return (mfib_forward_lookup (vm, node, frame, 0));
}
-VLIB_REGISTER_NODE (ip6_mfib_forward_lookup_node, static) = {
- .function = ip6_mfib_forward_lookup,
+VLIB_REGISTER_NODE (ip6_mfib_forward_lookup_node) = {
.name = "ip6-mfib-forward-lookup",
.vector_size = sizeof (u32),
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_mfib_forward_lookup_node,
- ip6_mfib_forward_lookup)
-
typedef struct mfib_forward_rpf_trace_t_ {
u32 entry_index;
mfib_forward_rpf_trace_t * t = va_arg (*args, mfib_forward_rpf_trace_t *);
s = format (s, "entry %d", t->entry_index);
- s = format (s, " %d", t->sw_if_index);
- s = format (s, " %U", format_mfib_itf_flags, t->itf_flags);
+ s = format (s, " itf %d", t->sw_if_index);
+ s = format (s, " flags %U", format_mfib_itf_flags, t->itf_flags);
return s;
}
{
mfib_itf_flags_t old_flags;
- old_flags = __sync_fetch_and_or(&mfi->mfi_flags,
- MFIB_ITF_FLAG_SIGNAL_PRESENT);
+ old_flags = clib_atomic_fetch_or(&mfi->mfi_flags,
+ MFIB_ITF_FLAG_SIGNAL_PRESENT);
if (!(old_flags & MFIB_ITF_FLAG_SIGNAL_PRESENT))
{
{
u32 n_left_from, n_left_to_next, * from, * to_next;
mfib_forward_rpf_next_t next;
+ vlib_node_runtime_t *error_node;
+ if (is_v4)
+ error_node = vlib_node_get_runtime (vm, ip4_input_node.index);
+ else
+ error_node = vlib_node_get_runtime (vm, ip6_input_node.index);
from = vlib_frame_vector_args (frame);
n_left_from = frame->n_vectors;
next = MFIB_FORWARD_RPF_NEXT_DROP;
u32 pi0, next0;
mfib_itf_flags_t iflags0;
mfib_entry_flags_t eflags0;
+ u8 error0;
pi0 = from[0];
to_next[0] = pi0;
n_left_to_next -= 1;
n_left_from -= 1;
+ error0 = IP4_ERROR_NONE;
b0 = vlib_get_buffer (vm, pi0);
mfei0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
mfe0 = mfib_entry_get(mfei0);
else
{
next0 = MFIB_FORWARD_RPF_NEXT_DROP;
- }
-
- if (b0->flags & VLIB_BUFFER_IS_TRACED)
- {
- mfib_forward_rpf_trace_t *t0;
-
- t0 = vlib_add_trace (vm, node, b0, sizeof (*t0));
- t0->entry_index = mfei0;
- t0->itf_flags = iflags0;
- if (NULL == mfi0)
- {
- t0->sw_if_index = ~0;
- }
- else
- {
- t0->sw_if_index = mfi0->mfi_sw_if_index;
- }
- }
- vlib_validate_buffer_enqueue_x1 (vm, node, next,
- to_next, n_left_to_next,
- pi0, next0);
- }
-
- vlib_put_next_frame(vm, node, next, n_left_to_next);
+ error0 =
+ (is_v4 ? IP4_ERROR_RPF_FAILURE : IP6_ERROR_RPF_FAILURE);
+ }
+
+ b0->error = error0 ? error_node->errors[error0] : 0;
+
+ if (b0->flags & VLIB_BUFFER_IS_TRACED)
+ {
+ mfib_forward_rpf_trace_t *t0;
+
+ t0 = vlib_add_trace (vm, node, b0, sizeof (*t0));
+ t0->entry_index = mfei0;
+ t0->itf_flags = iflags0;
+ if (NULL == mfi0)
+ {
+ t0->sw_if_index = ~0;
+ }
+ else
+ {
+ t0->sw_if_index = mfi0->mfi_sw_if_index;
+ }
+ }
+ vlib_validate_buffer_enqueue_x1 (vm, node, next, to_next,
+ n_left_to_next, pi0, next0);
+ }
+
+ vlib_put_next_frame (vm, node, next, n_left_to_next);
}
return frame->n_vectors;
}
-static uword
-ip4_mfib_forward_rpf (vlib_main_t * vm,
+VLIB_NODE_FN (ip4_mfib_forward_rpf_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
}
-VLIB_REGISTER_NODE (ip4_mfib_forward_rpf_node, static) = {
- .function = ip4_mfib_forward_rpf,
+VLIB_REGISTER_NODE (ip4_mfib_forward_rpf_node) = {
.name = "ip4-mfib-forward-rpf",
.vector_size = sizeof (u32),
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_mfib_forward_rpf_node,
- ip4_mfib_forward_rpf)
-
-static uword
-ip6_mfib_forward_rpf (vlib_main_t * vm,
+VLIB_NODE_FN (ip6_mfib_forward_rpf_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
- return (mfib_forward_rpf(vm, node, frame, 1));
+ return (mfib_forward_rpf(vm, node, frame, 0));
}
-VLIB_REGISTER_NODE (ip6_mfib_forward_rpf_node, static) = {
- .function = ip6_mfib_forward_rpf,
+VLIB_REGISTER_NODE (ip6_mfib_forward_rpf_node) = {
.name = "ip6-mfib-forward-rpf",
.vector_size = sizeof (u32),
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_mfib_forward_rpf_node,
- ip6_mfib_forward_rpf)
-
Code Review / vpp.git / blobdiff