fib: fib api updates

Enhance the route add/del APIs to take a set of paths rather than just one.
Most unicast routing protocols calcualte all the available paths in one
run of the algorithm so updating all the paths at once is beneficial for the client.
two knobs control the behaviour:
  is_multipath - if set the the set of paths passed will be added to those
                 that already exist, otherwise the set will replace them.
  is_add - add or remove the set

is_add=0, is_multipath=1 and an empty set, results in deleting the route.

It is also considerably faster to add multiple paths at once, than one at a time:

vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.11
100000 routes in .572240 secs, 174751.80 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.12
100000 routes in .528383 secs, 189256.54 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.13
100000 routes in .757131 secs, 132077.52 routes/sec
vat# ip_add_del_route 1.1.1.1/32 count 100000 multipath via 10.10.10.14
100000 routes in .878317 secs, 113854.12 routes/sec

vat# ip_route_add_del 1.1.1.1/32 count 100000 multipath via 10.10.10.11 via 10.10.10.12 via 10.10.10.13 via 10.10.10.14
100000 routes in .900212 secs, 111084.93 routes/sec

Change-Id: I416b93f7684745099c1adb0b33edac58c9339c1a
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Signed-off-by: Ole Troan <ot@cisco.com>
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

1 files changed, 23 insertions, 7 deletions

diff --git a/src/vnet/dpo/mpls_disposition.c b/src/vnet/dpo/mpls_disposition.c
index cf0b5fcf1ef..7bc2cb65f87 100644
--- a/src/vnet/dpo/mpls_disposition.c
+++ b/src/vnet/dpo/mpls_disposition.c
@@ -88,8 +88,12 @@ format_mpls_disp_dpo (u8 *s, va_list *args)
 
     mdd = mpls_disp_dpo_get(index);
 
-    s = format(s, "mpls-disposition:[%d]:[%U, %U]",
-               index,
+    s = format(s, "mpls-disposition:[%d]:[", index);
+
+    if (0 != mdd->mdd_rpf_id)
+        s = format(s, "rpf-id:%d ", mdd->mdd_rpf_id);
+
+    s = format(s, "%U, %U]",
                format_dpo_proto, mdd->mdd_payload_proto,
                format_fib_mpls_lsp_mode, mdd->mdd_mode);
 
@@ -132,7 +136,9 @@ mpls_disp_dpo_unlock (dpo_id_t *dpo)
  */
 typedef struct mpls_label_disposition_trace_t_
 {
-    index_t mdd;
+    dpo_proto_t mddt_payload_proto;
+    fib_rpf_id_t mddt_rpf_id;
+    fib_mpls_lsp_mode_t mddt_mode;
 } mpls_label_disposition_trace_t;
 
 extern vlib_node_registration_t ip4_mpls_label_disposition_pipe_node;
@@ -293,13 +299,17 @@ mpls_label_disposition_inline (vlib_main_t * vm,
                 mpls_label_disposition_trace_t *tr =
                     vlib_add_trace(vm, node, b0, sizeof(*tr));
 
-                tr->mdd = mddi0;
+                tr->mddt_payload_proto = mdd0->mdd_payload_proto;
+                tr->mddt_rpf_id = mdd0->mdd_rpf_id;
+                tr->mddt_mode = mdd0->mdd_mode;
             }
             if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
             {
                 mpls_label_disposition_trace_t *tr =
                     vlib_add_trace(vm, node, b1, sizeof(*tr));
-                tr->mdd = mddi1;
+                tr->mddt_payload_proto = mdd1->mdd_payload_proto;
+                tr->mddt_rpf_id = mdd1->mdd_rpf_id;
+                tr->mddt_mode = mdd1->mdd_mode;
             }
 
             vlib_validate_buffer_enqueue_x2(vm, node, next_index, to_next,
@@ -383,7 +393,9 @@ mpls_label_disposition_inline (vlib_main_t * vm,
             {
                 mpls_label_disposition_trace_t *tr =
                     vlib_add_trace(vm, node, b0, sizeof(*tr));
-                tr->mdd = mddi0;
+                tr->mddt_payload_proto = mdd0->mdd_payload_proto;
+                tr->mddt_rpf_id = mdd0->mdd_rpf_id;
+                tr->mddt_mode = mdd0->mdd_mode;
             }
 
             vlib_validate_buffer_enqueue_x1(vm, node, next_index, to_next,
@@ -403,7 +415,11 @@ format_mpls_label_disposition_trace (u8 * s, va_list * args)
 
     t = va_arg(*args, mpls_label_disposition_trace_t *);
 
-    s = format(s, "disp:%d", t->mdd);
+    s = format(s, "rpf-id:%d %U, %U",
+               t->mddt_rpf_id,
+               format_dpo_proto, t->mddt_payload_proto,
+               format_fib_mpls_lsp_mode, t->mddt_mode);
+
     return (s);
 }