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, 100 insertions, 38 deletions

diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c
index 67a4bc1d4de..eebba1b1548 100644
--- a/src/vnet/fib/fib_path.c
+++ b/src/vnet/fib/fib_path.c
@@ -24,7 +24,8 @@
 #include <vnet/dpo/interface_rx_dpo.h>
 #include <vnet/dpo/mpls_disposition.h>
 #include <vnet/dpo/dvr_dpo.h>
-#include <vnet/dpo/drop_dpo.h>
+#include <vnet/dpo/ip_null_dpo.h>
+#include <vnet/dpo/classify_dpo.h>
 
 #include <vnet/adj/adj.h>
 #include <vnet/adj/adj_mcast.h>
@@ -353,6 +354,12 @@ typedef struct fib_path_t_ {
 	} udp_encap;
 	struct {
 	    /**
+	     * The UDP Encap object this path resolves through
+	     */
+	    u32 fp_classify_table_id;
+	} classify;
+	struct {
+	    /**
 	     * The interface
 	     */
 	    u32 fp_interface;
@@ -882,8 +889,8 @@ fib_path_unresolve (fib_path_t *path)
 	{
 	    fib_entry_child_remove(path->fp_via_fib,
 				   path->fp_sibling);
-	    fib_table_entry_special_remove(path->recursive.fp_tbl_id,
-					   fib_entry_get_prefix(path->fp_via_fib),
+            fib_table_entry_special_remove(path->recursive.fp_tbl_id,
+                                           fib_entry_get_prefix(path->fp_via_fib),
 					   FIB_SOURCE_RR);
             fib_table_unlock(path->recursive.fp_tbl_id,
                              dpo_proto_to_fib(path->fp_nh_proto),
@@ -1244,6 +1251,10 @@ fib_path_route_flags_to_cfg_flags (const fib_route_path_t *rpath)
 	cfg_flags |= FIB_PATH_CFG_FLAG_DROP;
     if (rpath->frp_flags & FIB_ROUTE_PATH_SOURCE_LOOKUP)
 	cfg_flags |= FIB_PATH_CFG_FLAG_DEAG_SRC;
+    if (rpath->frp_flags & FIB_ROUTE_PATH_ICMP_UNREACH)
+	cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_UNREACH;
+    if (rpath->frp_flags & FIB_ROUTE_PATH_ICMP_PROHIBIT)
+	cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_PROHIBIT;
 
     return (cfg_flags);
 }
@@ -1337,6 +1348,16 @@ fib_path_create (fib_node_index_t pl_index,
 	path->fp_type = FIB_PATH_TYPE_EXCLUSIVE;
 	dpo_copy(&path->exclusive.fp_ex_dpo, &rpath->dpo);
     }
+    else if ((path->fp_cfg_flags & FIB_PATH_CFG_FLAG_ICMP_PROHIBIT) ||
+        (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_ICMP_UNREACH))
+    {
+        path->fp_type = FIB_PATH_TYPE_SPECIAL;
+    }
+    else if ((path->fp_cfg_flags & FIB_PATH_CFG_FLAG_CLASSIFY))
+    {
+        path->fp_type = FIB_PATH_TYPE_SPECIAL;
+        path->classify.fp_classify_table_id = rpath->frp_classify_table_id;
+    }
     else if (~0 != rpath->frp_sw_if_index)
     {
         if (ip46_address_is_zero(&rpath->frp_addr))
@@ -1730,8 +1751,17 @@ fib_path_cmp_w_route_path (fib_node_index_t path_index,
 	case FIB_PATH_TYPE_EXCLUSIVE:
 	    res = dpo_cmp(&path->exclusive.fp_ex_dpo, &rpath->dpo);
 	    break;
-	case FIB_PATH_TYPE_SPECIAL:
 	case FIB_PATH_TYPE_RECEIVE:
+            if (rpath->frp_flags & FIB_ROUTE_PATH_LOCAL)
+            {
+                res = 0;
+            }
+            else
+            {
+                res = 1;
+            }
+            break;
+	case FIB_PATH_TYPE_SPECIAL:
 	    res = 0;
 	    break;
 	}
@@ -2006,11 +2036,33 @@ fib_path_resolve (fib_node_index_t path_index)
         break;
     }
     case FIB_PATH_TYPE_SPECIAL:
-	/*
-	 * Resolve via the drop
-	 */
-	dpo_copy(&path->fp_dpo, drop_dpo_get(path->fp_nh_proto));
-	break;
+        if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_ICMP_PROHIBIT)
+        {
+            ip_null_dpo_add_and_lock (path->fp_nh_proto,
+                                      IP_NULL_ACTION_SEND_ICMP_PROHIBIT,
+                                      &path->fp_dpo);
+        }
+        else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_ICMP_UNREACH)
+        {
+            ip_null_dpo_add_and_lock (path->fp_nh_proto,
+                                      IP_NULL_ACTION_SEND_ICMP_UNREACH,
+                                      &path->fp_dpo);
+        }
+        else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_CLASSIFY)
+        {
+            dpo_set (&path->fp_dpo, DPO_CLASSIFY,
+                     path->fp_nh_proto,
+                     classify_dpo_create (path->fp_nh_proto,
+                                          path->classify.fp_classify_table_id));
+        }
+        else
+        {
+            /*
+             * Resolve via the drop
+             */
+            dpo_copy(&path->fp_dpo, drop_dpo_get(path->fp_nh_proto));
+        }
+        break;
     case FIB_PATH_TYPE_DEAG:
     {
         if (DPO_PROTO_BIER == path->fp_nh_proto)
@@ -2459,10 +2511,10 @@ fib_path_contribute_forwarding (fib_node_index_t path_index,
 	    case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
 	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
 	    case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
-		dpo_copy(dpo, &path->fp_dpo);
-		break;
 	    case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
 	    case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
+		dpo_copy(dpo, &path->fp_dpo);
+		break;
 	    case FIB_FORW_CHAIN_TYPE_BIER:
 		break;
 	    case FIB_FORW_CHAIN_TYPE_ETHERNET:
@@ -2627,73 +2679,83 @@ fib_path_list_walk_rc_t
 fib_path_encode (fib_node_index_t path_list_index,
                  fib_node_index_t path_index,
                  const fib_path_ext_t *path_ext,
-                 void *ctx)
+                 void *args)
 {
-    fib_route_path_encode_t **api_rpaths = ctx;
-    fib_route_path_encode_t *api_rpath;
+    fib_path_encode_ctx_t *ctx = args;
+    fib_route_path_t *rpath;
     fib_path_t *path;
 
     path = fib_path_get(path_index);
     if (!path)
       return (FIB_PATH_LIST_WALK_CONTINUE);
-    vec_add2(*api_rpaths, api_rpath, 1);
-    api_rpath->rpath.frp_weight = path->fp_weight;
-    api_rpath->rpath.frp_preference = path->fp_preference;
-    api_rpath->rpath.frp_proto = path->fp_nh_proto;
-    api_rpath->rpath.frp_sw_if_index = ~0;
-    api_rpath->rpath.frp_fib_index = 0;
-    api_rpath->dpo = path->fp_dpo;
+
+    vec_add2(ctx->rpaths, rpath, 1);
+    rpath->frp_weight = path->fp_weight;
+    rpath->frp_preference = path->fp_preference;
+    rpath->frp_proto = path->fp_nh_proto;
+    rpath->frp_sw_if_index = ~0;
+    rpath->frp_fib_index = 0;
 
     switch (path->fp_type)
     {
       case FIB_PATH_TYPE_RECEIVE:
-        api_rpath->rpath.frp_addr = path->receive.fp_addr;
-        api_rpath->rpath.frp_sw_if_index = path->receive.fp_interface;
+        rpath->frp_addr = path->receive.fp_addr;
+        rpath->frp_sw_if_index = path->receive.fp_interface;
+        rpath->frp_flags |= FIB_ROUTE_PATH_LOCAL;
         break;
       case FIB_PATH_TYPE_ATTACHED:
-        api_rpath->rpath.frp_sw_if_index = path->attached.fp_interface;
+        rpath->frp_sw_if_index = path->attached.fp_interface;
         break;
       case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
-        api_rpath->rpath.frp_sw_if_index = path->attached_next_hop.fp_interface;
-        api_rpath->rpath.frp_addr = path->attached_next_hop.fp_nh;
+        rpath->frp_sw_if_index = path->attached_next_hop.fp_interface;
+        rpath->frp_addr = path->attached_next_hop.fp_nh;
         break;
       case FIB_PATH_TYPE_BIER_FMASK:
-        api_rpath->rpath.frp_bier_fmask = path->bier_fmask.fp_bier_fmask;
+        rpath->frp_bier_fmask = path->bier_fmask.fp_bier_fmask;
         break;
       case FIB_PATH_TYPE_SPECIAL:
         break;
       case FIB_PATH_TYPE_DEAG:
-        api_rpath->rpath.frp_fib_index = path->deag.fp_tbl_id;
+        rpath->frp_fib_index = path->deag.fp_tbl_id;
         if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RPF_ID)
         {
-            api_rpath->rpath.frp_flags |= FIB_ROUTE_PATH_RPF_ID;
+            rpath->frp_flags |= FIB_ROUTE_PATH_RPF_ID;
         }
         break;
       case FIB_PATH_TYPE_RECURSIVE:
-        api_rpath->rpath.frp_addr = path->recursive.fp_nh.fp_ip;
-        api_rpath->rpath.frp_fib_index = path->recursive.fp_tbl_id;
+        rpath->frp_addr = path->recursive.fp_nh.fp_ip;
+        rpath->frp_fib_index = path->recursive.fp_tbl_id;
         break;
       case FIB_PATH_TYPE_DVR:
-          api_rpath->rpath.frp_sw_if_index = path->dvr.fp_interface;
-          api_rpath->rpath.frp_flags |= FIB_ROUTE_PATH_DVR;
+          rpath->frp_sw_if_index = path->dvr.fp_interface;
+          rpath->frp_flags |= FIB_ROUTE_PATH_DVR;
           break;
       case FIB_PATH_TYPE_UDP_ENCAP:
-          api_rpath->rpath.frp_udp_encap_id = path->udp_encap.fp_udp_encap_id;
-          api_rpath->rpath.frp_flags |= FIB_ROUTE_PATH_UDP_ENCAP;
+          rpath->frp_udp_encap_id = path->udp_encap.fp_udp_encap_id;
+          rpath->frp_flags |= FIB_ROUTE_PATH_UDP_ENCAP;
           break;
       case FIB_PATH_TYPE_INTF_RX:
-	  api_rpath->rpath.frp_sw_if_index = path->receive.fp_interface;
-	  api_rpath->rpath.frp_flags |= FIB_ROUTE_PATH_INTF_RX;
+	  rpath->frp_sw_if_index = path->receive.fp_interface;
+	  rpath->frp_flags |= FIB_ROUTE_PATH_INTF_RX;
 	  break;
+      case FIB_PATH_TYPE_EXCLUSIVE:
+        rpath->frp_flags |= FIB_ROUTE_PATH_EXCLUSIVE;
       default:
         break;
     }
 
     if (path_ext && path_ext->fpe_type == FIB_PATH_EXT_MPLS) 
     {
-        api_rpath->rpath.frp_label_stack = path_ext->fpe_path.frp_label_stack;
+        rpath->frp_label_stack = path_ext->fpe_path.frp_label_stack;
     }
 
+    if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_DROP)
+        rpath->frp_flags |= FIB_ROUTE_PATH_DROP;
+    if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_ICMP_UNREACH)
+        rpath->frp_flags |= FIB_ROUTE_PATH_ICMP_UNREACH;
+    if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_ICMP_PROHIBIT)
+        rpath->frp_flags |= FIB_ROUTE_PATH_ICMP_PROHIBIT;
+
     return (FIB_PATH_LIST_WALK_CONTINUE);
 }