X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fmfib%2Fmfib_forward.c;h=3befce041bbbb21dcf1346da53b4fea6929965b3;hb=5f22f7d11cc5af47c3d1188f0c890532fc1ed98d;hp=634b675999ef64c9058f3b8a1ec7278a06f4f519;hpb=ae8098350cb7b96f7495fa4d4180238064256e14;p=vpp.git diff --git a/src/vnet/mfib/mfib_forward.c b/src/vnet/mfib/mfib_forward.c index 634b675999e..3befce041bb 100644 --- a/src/vnet/mfib/mfib_forward.c +++ b/src/vnet/mfib/mfib_forward.c @@ -42,7 +42,7 @@ format_mfib_forward_lookup_trace (u8 * s, va_list * args) } /* 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) @@ -74,7 +74,7 @@ mfib_forward_lookup_trace (vlib_main_t * vm, 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) { @@ -150,32 +150,34 @@ mfib_forward_lookup (vlib_main_t * vm, { 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_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); + 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) @@ -184,16 +186,14 @@ mfib_forward_lookup (vlib_main_t * vm, 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), @@ -205,19 +205,14 @@ VLIB_REGISTER_NODE (ip4_mfib_forward_lookup_node, static) = { }, }; -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), @@ -229,9 +224,6 @@ VLIB_REGISTER_NODE (ip6_mfib_forward_lookup_node, static) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (ip6_mfib_forward_lookup_node, - ip6_mfib_forward_lookup) - typedef struct mfib_forward_rpf_trace_t_ { u32 entry_index; @@ -451,40 +443,39 @@ mfib_forward_rpf (vlib_main_t * vm, else { next0 = MFIB_FORWARD_RPF_NEXT_DROP; - error0 = IP4_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); + 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) { @@ -492,8 +483,7 @@ ip4_mfib_forward_rpf (vlib_main_t * vm, } -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), @@ -505,20 +495,15 @@ VLIB_REGISTER_NODE (ip4_mfib_forward_rpf_node, static) = { }, }; -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), @@ -530,6 +515,3 @@ VLIB_REGISTER_NODE (ip6_mfib_forward_rpf_node, static) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (ip6_mfib_forward_rpf_node, - ip6_mfib_forward_rpf) -