From a9374df5f351d25e968f5f90a827796203cbafdd Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Thu, 2 Feb 2017 02:18:18 -0800 Subject: Fix SR multicast post mfib commit 1 - use the SR policy to construct the replicate DPO. Each bucket therein is a SR tunnel. 2 - install a special mfib entry that links via this replicate 3 - forwarding is now mfib-lookup -> replicate -> sr_rewrite (per-tunnel) no need for a separate sr_replicate node. 4 - Stack the sr tunnel on the forwarding DPO of the first-hop FIB entry. no need for a second lookup post SR encap. 5 - fix some path-list lock leaks in the MFIB entry. Change-Id: I20de96ea4c4be4fae252625bde159d9c435c8315 Signed-off-by: Neale Ranns --- src/vnet/dpo/replicate_dpo.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/vnet/dpo') diff --git a/src/vnet/dpo/replicate_dpo.c b/src/vnet/dpo/replicate_dpo.c index a2d5fdb68bd..8bad75ee5ed 100644 --- a/src/vnet/dpo/replicate_dpo.c +++ b/src/vnet/dpo/replicate_dpo.c @@ -601,8 +601,7 @@ VLIB_CLI_COMMAND (replicate_show_command, static) = { typedef struct replicate_trace_t_ { index_t rep_index; - index_t dpo_index; - dpo_type_t dpo_type; + dpo_id_t dpo; } replicate_trace_t; static uword @@ -656,8 +655,7 @@ replicate_inline (vlib_main_t * vm, { replicate_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t)); t->rep_index = repi0; - t->dpo_index = dpo0->dpoi_index; - t->dpo_type = dpo0->dpoi_type; + t->dpo = *dpo0; } vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, @@ -682,8 +680,7 @@ replicate_inline (vlib_main_t * vm, { replicate_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t)); t->rep_index = repi0; - t->dpo_index = dpo0->dpoi_index; - t->dpo_type = dpo0->dpoi_type; + t->dpo = *dpo0; } vlib_validate_buffer_enqueue_x1 (vm, node, next_index, @@ -705,10 +702,9 @@ format_replicate_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); replicate_trace_t *t = va_arg (*args, replicate_trace_t *); - s = format (s, "replicate: %d via %U:%d", + s = format (s, "replicate: %d via %U", t->rep_index, - format_dpo_type, t->dpo_type, - t->dpo_index); + format_dpo_id, &t->dpo); return s; } -- cgit 1.2.3-korg