X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fplugins%2Fgbp%2Fgbp_recirc.c;h=59588eafacd23bd954382362e27463d08ad02b88;hp=1debbe406f390e99bd6dd9b3d6930a74acb14e76;hb=13a08cc;hpb=25b049484fcf9161edb2c19250066b893c38c264

diff --git a/src/plugins/gbp/gbp_recirc.c b/src/plugins/gbp/gbp_recirc.c
index 1debbe406f3..59588eafacd 100644
--- a/src/plugins/gbp/gbp_recirc.c
+++ b/src/plugins/gbp/gbp_recirc.c
@@ -16,6 +16,7 @@
 #include <plugins/gbp/gbp_recirc.h>
 #include <plugins/gbp/gbp_endpoint_group.h>
 #include <plugins/gbp/gbp_endpoint.h>
+#include <plugins/gbp/gbp_itf.h>
 
 #include <vnet/dpo/dvr_dpo.h>
 #include <vnet/fib/fib_table.h>
@@ -30,6 +31,25 @@ gbp_recirc_t *gbp_recirc_pool;
  */
 index_t *gbp_recirc_db;
 
+/**
+ * logger
+ */
+vlib_log_class_t gr_logger;
+
+#define GBP_RECIRC_DBG(...)                           \
+    vlib_log_debug (gr_logger, __VA_ARGS__);
+
+u8 *
+format_gbp_recirc (u8 * s, va_list * args)
+{
+  gbp_recirc_t *gr = va_arg (*args, gbp_recirc_t *);
+  vnet_main_t *vnm = vnet_get_main ();
+
+  return format (s, "  %U, epg:%d, ext:%d",
+		 format_vnet_sw_if_index_name, vnm,
+		 gr->gr_sw_if_index, gr->gr_epg, gr->gr_is_ext);
+}
+
 int
 gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
 {
@@ -42,11 +62,18 @@ gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
 
   if (INDEX_INVALID == gri)
     {
-      gbp_endpoint_group_t *gepg;
+      gbp_endpoint_group_t *gg;
       fib_protocol_t fproto;
+      index_t ggi;
+
+      ggi = gbp_endpoint_group_find (epg_id);
+
+      if (INDEX_INVALID == ggi)
+	return (VNET_API_ERROR_NO_SUCH_ENTRY);
 
+      gbp_endpoint_group_lock (ggi);
       pool_get (gbp_recirc_pool, gr);
-      memset (gr, 0, sizeof (*gr));
+      clib_memset (gr, 0, sizeof (*gr));
       gri = gr - gbp_recirc_pool;
 
       gr->gr_epg = epg_id;
@@ -62,30 +89,43 @@ gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
       /*
        * cache the FIB indicies of the EPG
        */
-      gepg = gbp_endpoint_group_find (gr->gr_epg);
-
-      if (NULL == gepg)
-	return (VNET_API_ERROR_NO_SUCH_ENTRY);
+      gr->gr_epgi = ggi;
 
+      gg = gbp_endpoint_group_get (gr->gr_epgi);
       FOR_EACH_FIB_IP_PROTOCOL (fproto)
       {
-	gr->gr_fib_index[fproto] = gepg->gepg_fib_index[fproto];
+	gr->gr_fib_index[fproto] =
+	  gbp_endpoint_group_get_fib_index (gg, fproto);
       }
 
       /*
-       * Packets on the recirculation interface are subjet to src-EPG
+       * bind to the bridge-domain of the EPG
+       */
+      gr->gr_itf = gbp_itf_add_and_lock (gr->gr_sw_if_index, gg->gg_bd_index);
+
+      /*
+       * Packets on the recirculation interface are subject to src-EPG
        * classification. Recirc interfaces are L2-emulation mode.
        *   for internal EPGs this is via an LPM on all external subnets.
        *   for external EPGs this is via a port mapping.
        */
       if (gr->gr_is_ext)
 	{
+	  mac_address_t mac;
 	  /*
 	   * recirc is for post-NAT translation packets going into
 	   * the external EPG, these are classified to the NAT EPG
 	   * based on its port
 	   */
-	  gbp_itf_epg_update (gr->gr_sw_if_index, gr->gr_epg, 0);
+	  mac_address_from_bytes (&mac,
+				  vnet_sw_interface_get_hw_address
+				  (vnet_get_main (), gr->gr_sw_if_index));
+	  gbp_endpoint_update_and_lock (GBP_ENDPOINT_SRC_CP,
+					gr->gr_sw_if_index,
+					NULL, &mac, INDEX_INVALID,
+					INDEX_INVALID, gr->gr_epg,
+					GBP_ENDPOINT_FLAG_NONE,
+					NULL, NULL, &gr->gr_ep);
 	  vnet_feature_enable_disable ("ip4-unicast",
 				       "ip4-gbp-src-classify",
 				       gr->gr_sw_if_index, 1, 0, 0);
@@ -110,7 +150,12 @@ gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
 
       gbp_recirc_db[sw_if_index] = gri;
     }
+  else
+    {
+      gr = gbp_recirc_get (gri);
+    }
 
+  GBP_RECIRC_DBG ("add: %U", format_gbp_recirc, gr);
   return (0);
 }
 
@@ -126,9 +171,11 @@ gbp_recirc_delete (u32 sw_if_index)
     {
       gr = pool_elt_at_index (gbp_recirc_pool, gri);
 
+      GBP_RECIRC_DBG ("del: %U", format_gbp_recirc, gr);
+
       if (gr->gr_is_ext)
 	{
-	  gbp_itf_epg_delete (gr->gr_sw_if_index);
+	  gbp_endpoint_unlock (GBP_ENDPOINT_SRC_CP, gr->gr_ep);
 	  vnet_feature_enable_disable ("ip4-unicast",
 				       "ip4-gbp-src-classify",
 				       gr->gr_sw_if_index, 0, 0, 0);
@@ -149,6 +196,9 @@ gbp_recirc_delete (u32 sw_if_index)
       ip4_sw_interface_enable_disable (gr->gr_sw_if_index, 0);
       ip6_sw_interface_enable_disable (gr->gr_sw_if_index, 0);
 
+      gbp_itf_unlock (gr->gr_itf);
+
+      gbp_endpoint_group_unlock (gr->gr_epgi);
       gbp_recirc_db[sw_if_index] = INDEX_INVALID;
       pool_put (gbp_recirc_pool, gr);
     }
@@ -157,12 +207,12 @@ gbp_recirc_delete (u32 sw_if_index)
 void
 gbp_recirc_walk (gbp_recirc_cb_t cb, void *ctx)
 {
-  gbp_recirc_t *gbpe;
+  gbp_recirc_t *ge;
 
   /* *INDENT-OFF* */
-  pool_foreach(gbpe, gbp_recirc_pool,
+  pool_foreach(ge, gbp_recirc_pool,
   {
-    if (!cb(gbpe, ctx))
+    if (!cb(ge, ctx))
       break;
   });
   /* *INDENT-ON* */
@@ -171,13 +221,7 @@ gbp_recirc_walk (gbp_recirc_cb_t cb, void *ctx)
 static int
 gbp_recirc_show_one (gbp_recirc_t * gr, void *ctx)
 {
-  vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm;
-
-  vm = ctx;
-  vlib_cli_output (vm, "  %U, epg:%d, ext:%d",
-		   format_vnet_sw_if_index_name, vnm,
-		   gr->gr_sw_if_index, gr->gr_epg, gr->gr_is_ext);
+  vlib_cli_output (ctx, "  %U", format_gbp_recirc, gr);
 
   return (1);
 }
@@ -192,7 +236,6 @@ gbp_recirc_show (vlib_main_t * vm,
   return (NULL);
 }
 
-
 /*?
  * Show Group Based Policy Recircs and derived information
  *
@@ -208,6 +251,16 @@ VLIB_CLI_COMMAND (gbp_recirc_show_node, static) = {
 };
 /* *INDENT-ON* */
 
+static clib_error_t *
+gbp_recirc_init (vlib_main_t * vm)
+{
+  gr_logger = vlib_log_register_class ("gbp", "recirc");
+
+  return (NULL);
+}
+
+VLIB_INIT_FUNCTION (gbp_recirc_init);
+
 /*
  * fd.io coding-style-patch-verification: ON
  *