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, 28 insertions, 24 deletions

diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h
index 472ce888b4e..77b133fa9db 100644
--- a/src/vnet/fib/fib_types.h
+++ b/src/vnet/fib/fib_types.h
@@ -379,6 +379,10 @@ typedef enum fib_route_path_flags_t_
      * A path that resolves via a DVR DPO
      */
     FIB_ROUTE_PATH_DVR = (1 << 14),
+
+    FIB_ROUTE_PATH_ICMP_UNREACH = (1 << 15),
+    FIB_ROUTE_PATH_ICMP_PROHIBIT = (1 << 16),
+    FIB_ROUTE_PATH_CLASSIFY = (1 << 17),
 } fib_route_path_flags_t;
 
 /**
@@ -496,18 +500,24 @@ typedef struct fib_route_path_t_ {
                      */
                     mpls_eos_bit_t frp_eos;
                 };
-            };
-            union {
                 /**
-                 * The interface.
-                 * Will be invalid for recursive paths.
+                 * A path via a BIER imposition object.
+                 * Present in an mfib path list
                  */
-                u32 frp_sw_if_index;
-                /**
-                 * The RPF-ID
-                 */
-                fib_rpf_id_t frp_rpf_id;
+                index_t frp_bier_imp;
             };
+
+            /**
+             * The interface.
+             * Will be invalid for recursive paths.
+             */
+            u32 frp_sw_if_index;
+
+            /**
+             * The RPF-ID
+             */
+            fib_rpf_id_t frp_rpf_id;
+
             union {
                 /**
                  * The FIB index to lookup the nexthop
@@ -523,7 +533,6 @@ typedef struct fib_route_path_t_ {
              * The outgoing MPLS label Stack. NULL implies no label.
              */
             fib_mpls_label_t *frp_label_stack;
-
             /**
 	     * Exclusive DPO
 	     */
@@ -540,20 +549,24 @@ typedef struct fib_route_path_t_ {
         bier_table_id_t frp_bier_tbl;
 
         /**
-         * A path via a BIER imposition object.
-         * Present in an mfib path list
+         * UDP encap ID
          */
-        index_t frp_bier_imp;
+        u32 frp_udp_encap_id;
 
         /**
-         * UDP encap ID
+         * Classify table ID
          */
-        u32 frp_udp_encap_id;
+        u32 frp_classify_table_id;
 
         /**
          * Resolving via a BIER Fmask
          */
         index_t frp_bier_fmask;
+
+        /**
+         * The DPO for use with exclusive paths
+         */
+        dpo_id_t frp_dpo;
     };
     /**
      * [un]equal cost path weight
@@ -582,15 +595,6 @@ extern uword unformat_fib_route_path(unformat_input_t * input, va_list * args);
 #define FIB_ROUTE_PATH_HELP "[next-hop-address] [next-hop-interface] [next-hop-table <value>] [weight <value>] [preference <value>] [udp-encap-id <value>] [ip4-lookup-in-table <value>] [ip6-lookup-in-table <value>] [mpls-lookup-in-table <value>] [resolve-via-host] [resolve-via-connected] [rx-ip4 <interface>] [out-labels <value value value>]"
 
 /**
- * @brief 
- * A representation of a fib path for fib_path_encode to convey the information to the caller
- */
-typedef struct fib_route_path_encode_t_ {
-    fib_route_path_t rpath;
-    dpo_id_t dpo;
-} fib_route_path_encode_t;
-
-/**
  * return code to control pat-hlist walk
  */
 typedef enum fib_path_list_walk_rc_t_