Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IP6-MFIB: replace the radix tree with bihash (VPP-1526)
[vpp.git]
/
src
/
vnet
/
mfib
/
mfib_forward.c
diff --git
a/src/vnet/mfib/mfib_forward.c
b/src/vnet/mfib/mfib_forward.c
index
5fe0a57
..
634b675
100644
(file)
--- a/
src/vnet/mfib/mfib_forward.c
+++ b/
src/vnet/mfib/mfib_forward.c
@@
-165,9
+165,9
@@
mfib_forward_lookup (vlib_main_t * vm,
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);
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);
+ 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;
}
vnet_buffer (p0)->ip.adj_index[VLIB_TX] = mfei0;
@@
-252,8
+252,8
@@
format_mfib_forward_rpf_trace (u8 * s, va_list * args)
mfib_forward_rpf_trace_t * t = va_arg (*args, mfib_forward_rpf_trace_t *);
s = format (s, "entry %d", t->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;
}
return s;
}
@@
-300,8
+300,8
@@
mfib_forward_itf_signal (vlib_main_t *vm,
{
mfib_itf_flags_t old_flags;
{
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))
{
if (!(old_flags & MFIB_ITF_FLAG_SIGNAL_PRESENT))
{
@@
-342,7
+342,12
@@
mfib_forward_rpf (vlib_main_t * vm,
{
u32 n_left_from, n_left_to_next, * from, * to_next;
mfib_forward_rpf_next_t next;
{
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;
from = vlib_frame_vector_args (frame);
n_left_from = frame->n_vectors;
next = MFIB_FORWARD_RPF_NEXT_DROP;
@@
-361,6
+366,7
@@
mfib_forward_rpf (vlib_main_t * vm,
u32 pi0, next0;
mfib_itf_flags_t iflags0;
mfib_entry_flags_t eflags0;
u32 pi0, next0;
mfib_itf_flags_t iflags0;
mfib_entry_flags_t eflags0;
+ u8 error0;
pi0 = from[0];
to_next[0] = pi0;
pi0 = from[0];
to_next[0] = pi0;
@@
-369,6
+375,7
@@
mfib_forward_rpf (vlib_main_t * vm,
n_left_to_next -= 1;
n_left_from -= 1;
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);
b0 = vlib_get_buffer (vm, pi0);
mfei0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
mfe0 = mfib_entry_get(mfei0);
@@
-380,13
+387,27
@@
mfib_forward_rpf (vlib_main_t * vm,
* for the case of throughput traffic that is not replicated
* to the host stack nor sets local flags
*/
* for the case of throughput traffic that is not replicated
* to the host stack nor sets local flags
*/
- if (PREDICT_TRUE(NULL != mfi0))
+
+ /*
+ * If the mfib entry has a configured RPF-ID check that
+ * in preference to an interface based RPF
+ */
+ if (MFIB_RPF_ID_NONE != mfe0->mfe_rpf_id)
{
{
- iflags0 = mfi0->mfi_flags;
+ iflags0 = (mfe0->mfe_rpf_id == vnet_buffer(b0)->ip.rpf_id ?
+ MFIB_ITF_FLAG_ACCEPT :
+ MFIB_ITF_FLAG_NONE);
}
else
{
}
else
{
- iflags0 = MFIB_ITF_FLAG_NONE;
+ if (PREDICT_TRUE(NULL != mfi0))
+ {
+ iflags0 = mfi0->mfi_flags;
+ }
+ else
+ {
+ iflags0 = MFIB_ITF_FLAG_NONE;
+ }
}
eflags0 = mfe0->mfe_flags;
}
eflags0 = mfe0->mfe_flags;
@@
-430,23
+451,25
@@
mfib_forward_rpf (vlib_main_t * vm,
else
{
next0 = MFIB_FORWARD_RPF_NEXT_DROP;
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;
if (b0->flags & VLIB_BUFFER_IS_TRACED)
{
mfib_forward_rpf_trace_t *t0;
- t0 = vlib_add_trace (vm, node, b0, sizeof (
t0[0]
));
+ t0 = vlib_add_trace (vm, node, b0, sizeof (
*t0
));
t0->entry_index = mfei0;
t0->entry_index = mfei0;
+ t0->itf_flags = iflags0;
if (NULL == mfi0)
{
t0->sw_if_index = ~0;
if (NULL == mfi0)
{
t0->sw_if_index = ~0;
- t0->itf_flags = MFIB_ITF_FLAG_NONE;
}
else
{
t0->sw_if_index = mfi0->mfi_sw_if_index;
}
else
{
t0->sw_if_index = mfi0->mfi_sw_if_index;
- t0->itf_flags = mfi0->mfi_flags;
}
}
vlib_validate_buffer_enqueue_x1 (vm, node, next,
}
}
vlib_validate_buffer_enqueue_x1 (vm, node, next,
@@
-478,7
+501,7
@@
VLIB_REGISTER_NODE (ip4_mfib_forward_rpf_node, static) = {
.n_next_nodes = MFIB_FORWARD_RPF_N_NEXT,
.next_nodes = {
.n_next_nodes = MFIB_FORWARD_RPF_N_NEXT,
.next_nodes = {
- [MFIB_FORWARD_RPF_NEXT_DROP] = "
error
-drop",
+ [MFIB_FORWARD_RPF_NEXT_DROP] = "
ip4
-drop",
},
};
},
};
@@
-503,7
+526,7
@@
VLIB_REGISTER_NODE (ip6_mfib_forward_rpf_node, static) = {
.n_next_nodes = MFIB_FORWARD_RPF_N_NEXT,
.next_nodes = {
.n_next_nodes = MFIB_FORWARD_RPF_N_NEXT,
.next_nodes = {
- [MFIB_FORWARD_RPF_NEXT_DROP] = "
error
-drop",
+ [MFIB_FORWARD_RPF_NEXT_DROP] = "
ip6
-drop",
},
};
},
};