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, 72 insertions, 23 deletions

diff --git a/src/vnet/mfib/mfib_table.c b/src/vnet/mfib/mfib_table.c
index 68154b37ff8..504333a2474 100644
--- a/src/vnet/mfib/mfib_table.c
+++ b/src/vnet/mfib/mfib_table.c
@@ -286,12 +286,11 @@ mfib_table_entry_update (u32 fib_index,
     return (mfib_entry_index);
 }
 
-fib_node_index_t
-mfib_table_entry_path_update (u32 fib_index,
-                              const mfib_prefix_t *prefix,
-                              mfib_source_t source,
-                              const fib_route_path_t *rpath,
-                              mfib_itf_flags_t itf_flags)
+static fib_node_index_t
+mfib_table_entry_paths_update_i (u32 fib_index,
+                                 const mfib_prefix_t *prefix,
+                                 mfib_source_t source,
+                                 const fib_route_path_t *rpaths)
 {
     fib_node_index_t mfib_entry_index;
     mfib_table_t *mfib_table;
@@ -308,30 +307,53 @@ mfib_table_entry_path_update (u32 fib_index,
                                              MFIB_ENTRY_FLAG_NONE,
                                              INDEX_INVALID);
 
-        mfib_entry_path_update(mfib_entry_index,
-                               source,
-                               rpath,
-                               itf_flags);
+        mfib_entry_path_update(mfib_entry_index, source, rpaths);
 
         mfib_table_entry_insert(mfib_table, prefix, mfib_entry_index);
     }
     else
     {
-        mfib_entry_path_update(mfib_entry_index,
-                               source,
-                               rpath,
-                               itf_flags);
+        mfib_entry_path_update(mfib_entry_index, source, rpaths);
     }
     return (mfib_entry_index);
 }
 
-void
-mfib_table_entry_path_remove (u32 fib_index,
+
+fib_node_index_t
+mfib_table_entry_path_update (u32 fib_index,
                               const mfib_prefix_t *prefix,
                               mfib_source_t source,
                               const fib_route_path_t *rpath)
 {
     fib_node_index_t mfib_entry_index;
+    fib_route_path_t *rpaths = NULL;
+
+    vec_add1(rpaths, *rpath);
+
+    mfib_entry_index = mfib_table_entry_paths_update_i(fib_index, prefix,
+                                                       source, rpaths);
+
+    vec_free(rpaths);
+    return (mfib_entry_index);
+}
+
+fib_node_index_t
+mfib_table_entry_paths_update (u32 fib_index,
+                              const mfib_prefix_t *prefix,
+                              mfib_source_t source,
+                              const fib_route_path_t *rpaths)
+{
+    return (mfib_table_entry_paths_update_i(fib_index, prefix,
+                                            source, rpaths));
+}
+
+static void
+mfib_table_entry_paths_remove_i (u32 fib_index,
+                                 const mfib_prefix_t *prefix,
+                                 mfib_source_t source,
+                                 const fib_route_path_t *rpaths)
+{
+    fib_node_index_t mfib_entry_index;
     mfib_table_t *mfib_table;
 
     mfib_table = mfib_table_get(fib_index, prefix->fp_proto);
@@ -340,7 +362,7 @@ mfib_table_entry_path_remove (u32 fib_index,
     if (FIB_NODE_INDEX_INVALID == mfib_entry_index)
     {
         /*
-         * removing an etry that does not exist. i'll allow it.
+         * removing an entry that does not exist. i'll allow it.
          */
     }
     else
@@ -354,7 +376,7 @@ mfib_table_entry_path_remove (u32 fib_index,
 
         no_more_sources = mfib_entry_path_remove(mfib_entry_index,
                                                  source,
-                                                 rpath);
+                                                 rpaths);
 
         if (no_more_sources)
         {
@@ -367,6 +389,35 @@ mfib_table_entry_path_remove (u32 fib_index,
         mfib_entry_unlock(mfib_entry_index);
     }
 }
+void
+mfib_table_entry_paths_remove (u32 fib_index,
+                              const mfib_prefix_t *prefix,
+                              mfib_source_t source,
+                              const fib_route_path_t *rpaths)
+{
+    mfib_table_entry_paths_remove_i(fib_index,
+                                    prefix,
+                                    source,
+                                    rpaths);
+}
+
+void
+mfib_table_entry_path_remove (u32 fib_index,
+                              const mfib_prefix_t *prefix,
+                              mfib_source_t source,
+                              const fib_route_path_t *rpath)
+{
+    fib_route_path_t *rpaths = NULL;
+
+    vec_add1(rpaths, *rpath);
+
+    mfib_table_entry_paths_remove_i(fib_index,
+                                    prefix,
+                                    source,
+                                    rpaths);
+
+    vec_free(rpaths);
+}
 
 fib_node_index_t
 mfib_table_entry_special_add (u32 fib_index,
@@ -464,12 +515,10 @@ void
 mfib_table_entry_delete_index (fib_node_index_t mfib_entry_index,
                                mfib_source_t source)
 {
-    const mfib_prefix_t *prefix;
-
-    prefix = mfib_entry_get_prefix(mfib_entry_index);
-
     mfib_table_entry_delete_i(mfib_entry_get_fib_index(mfib_entry_index),
-                              mfib_entry_index, prefix, source);
+                              mfib_entry_index,
+                              mfib_entry_get_prefix(mfib_entry_index),
+                              source);
 }
 
 u32