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, 31 insertions, 77 deletions

diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
index 5c6fec1810b..8c89ed4f490 100644
--- a/src/vnet/ip/lookup.c
+++ b/src/vnet/ip/lookup.c
@@ -441,7 +441,7 @@ vnet_ip_route_cmd (vlib_main_t * vm,
 	}
       else if (0 < vec_len (rpaths))
 	{
-	  u32 k, j, n, incr;
+	  u32 k, n, incr;
 	  ip46_address_t dst = prefixs[i].fp_addr;
 	  f64 t[2];
 	  n = count;
@@ -451,25 +451,20 @@ vnet_ip_route_cmd (vlib_main_t * vm,
 
 	  for (k = 0; k < n; k++)
 	    {
-	      for (j = 0; j < vec_len (rpaths); j++)
-		{
-		  fib_prefix_t rpfx = {
-		    .fp_len = prefixs[i].fp_len,
-		    .fp_proto = prefixs[i].fp_proto,
-		    .fp_addr = dst,
-		  };
-
-		  if (is_del)
-		    fib_table_entry_path_remove2 (fib_index,
-						  &rpfx,
-						  FIB_SOURCE_CLI, &rpaths[j]);
-		  else
-		    fib_table_entry_path_add2 (fib_index,
-					       &rpfx,
-					       FIB_SOURCE_CLI,
-					       FIB_ENTRY_FLAG_NONE,
-					       &rpaths[j]);
-		}
+	      fib_prefix_t rpfx = {
+		.fp_len = prefixs[i].fp_len,
+		.fp_proto = prefixs[i].fp_proto,
+		.fp_addr = dst,
+	      };
+
+	      if (is_del)
+		fib_table_entry_path_remove2 (fib_index,
+					      &rpfx, FIB_SOURCE_CLI, rpaths);
+	      else
+		fib_table_entry_path_add2 (fib_index,
+					   &rpfx,
+					   FIB_SOURCE_CLI,
+					   FIB_ENTRY_FLAG_NONE, rpaths);
 
 	      if (FIB_PROTOCOL_IP4 == prefixs[0].fp_proto)
 		{
@@ -485,9 +480,9 @@ vnet_ip_route_cmd (vlib_main_t * vm,
 		    clib_host_to_net_u64 (incr +
 					  clib_net_to_host_u64 (dst.ip6.as_u64
 								[bucket]));
-
 		}
 	    }
+
 	  t[1] = vlib_time_now (vm);
 	  if (count > 1)
 	    vlib_cli_output (vm, "%.6e routes/sec", count / (t[1] - t[0]));
@@ -499,7 +494,6 @@ vnet_ip_route_cmd (vlib_main_t * vm,
 	}
     }
 
-
 done:
   vec_free (dpos);
   vec_free (prefixs);
@@ -805,20 +799,17 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
 		    unformat_input_t * main_input, vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
+  fib_route_path_t rpath, *rpaths = NULL;
   clib_error_t *error = NULL;
-  fib_route_path_t rpath;
-  u32 table_id, is_del;
-  vnet_main_t *vnm;
+  u32 table_id, is_del, payload_proto;
   mfib_prefix_t pfx;
   u32 fib_index;
-  mfib_itf_flags_t iflags = 0;
   mfib_entry_flags_t eflags = 0;
   u32 gcount, scount, ss, gg, incr;
   f64 timet[2];
   u32 rpf_id = MFIB_RPF_ID_NONE;
 
   gcount = scount = 1;
-  vnm = vnet_get_main ();
   is_del = 0;
   table_id = 0;
   clib_memset (&pfx, 0, sizeof (pfx));
@@ -887,51 +878,6 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
 	  pfx.fp_proto = FIB_PROTOCOL_IP6;
 	  pfx.fp_len = 128;
 	}
-      else if (unformat (line_input, "via %U %U %U",
-			 unformat_ip4_address, &rpath.frp_addr.ip4,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index,
-			 unformat_mfib_itf_flags, &iflags))
-	{
-	  rpath.frp_weight = 1;
-	}
-      else if (unformat (line_input, "via %U %U %U",
-			 unformat_ip6_address, &rpath.frp_addr.ip6,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index,
-			 unformat_mfib_itf_flags, &iflags))
-	{
-	  rpath.frp_weight = 1;
-	}
-      else if (unformat (line_input, "via %U %U",
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index,
-			 unformat_mfib_itf_flags, &iflags))
-	{
-	  clib_memset (&rpath.frp_addr, 0, sizeof (rpath.frp_addr));
-	  rpath.frp_weight = 1;
-	}
-      else if (unformat (line_input, "via %U %U",
-			 unformat_ip4_address, &rpath.frp_addr.ip4,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index))
-	{
-	  rpath.frp_weight = 1;
-	}
-      else if (unformat (line_input, "via %U %U",
-			 unformat_ip6_address, &rpath.frp_addr.ip6,
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index))
-	{
-	  rpath.frp_weight = 1;
-	}
-      else if (unformat (line_input, "via %U",
-			 unformat_vnet_sw_interface, vnm,
-			 &rpath.frp_sw_if_index))
-	{
-	  clib_memset (&rpath.frp_addr, 0, sizeof (rpath.frp_addr));
-	  rpath.frp_weight = 1;
-	}
       else if (unformat (line_input, "via local Forward"))
 	{
 	  clib_memset (&rpath.frp_addr, 0, sizeof (rpath.frp_addr));
@@ -942,9 +888,17 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
 	   * set the path proto appropriately for the prefix
 	   */
 	  rpath.frp_proto = fib_proto_to_dpo (pfx.fp_proto);
-	  iflags = MFIB_ITF_FLAG_FORWARD;
+	  rpath.frp_mitf_flags = MFIB_ITF_FLAG_FORWARD;
+	}
+      else if (unformat (line_input, "via %U",
+			 unformat_fib_route_path, &rpath, &payload_proto))
+	{
+	  vec_add1 (rpaths, rpath);
 	}
       else if (unformat (line_input, "%U",
+			 unformat_mfib_itf_flags, &rpath.frp_mitf_flags))
+	;
+      else if (unformat (line_input, "%U",
 			 unformat_mfib_entry_flags, &eflags))
 	;
       else
@@ -987,7 +941,7 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
     {
       for (gg = 0; gg < gcount; gg++)
 	{
-	  if (is_del && 0 == rpath.frp_weight)
+	  if (is_del && 0 == vec_len (rpaths))
 	    {
 	      /* no path provided => route delete */
 	      mfib_table_entry_delete (fib_index, &pfx, MFIB_SOURCE_CLI);
@@ -1001,11 +955,10 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
 	    {
 	      if (is_del)
 		mfib_table_entry_path_remove (fib_index,
-					      &pfx, MFIB_SOURCE_CLI, &rpath);
+					      &pfx, MFIB_SOURCE_CLI, rpaths);
 	      else
 		mfib_table_entry_path_update (fib_index,
-					      &pfx, MFIB_SOURCE_CLI, &rpath,
-					      iflags);
+					      &pfx, MFIB_SOURCE_CLI, rpaths);
 	    }
 
 	  if (FIB_PROTOCOL_IP4 == pfx.fp_proto)
@@ -1050,6 +1003,7 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
 		     (scount * gcount) / (timet[1] - timet[0]));
 
 done:
+  vec_free (rpaths);
   unformat_free (line_input);
 
   return error;