Merge pull request #304 from asterfusion/feature/support_cgnat

CGNAT merge to main

Author: jibochen-develop

ET2500/vpp-24.02/src/plugins/acl/sess_mgmt_node.c

@@ -378,6 +378,26 @@ send_one_worker_interrupt (vlib_main_t * vm, acl_main_t * am,
     }
 }
 
+/*
+ * Ensure that an in-progress interface cleanup gets another chance to run.
+ *
+ * Do not rely on interrupt_is_pending here: this is the recovery path for a
+ * cleanup whose software state and VLIB interrupt state may have diverged.
+ * Setting the VLIB interrupt-pending bit again is idempotent.
+ */
+static void
+ensure_worker_cleaner_interrupt (acl_main_t * am, int thread_index)
+{
+  acl_fa_per_worker_data_t *pw = &am->per_worker_data[thread_index];
+
+  /* Publish the cleanup request before notifying the target thread. */
+  CLIB_MEMORY_BARRIER ();
+  pw->interrupt_is_pending = 1;
+  vlib_node_set_interrupt_pending (
+    vlib_get_main_by_index (thread_index),
+    acl_fa_worker_session_cleaner_process_node.index);
+}
+
 void
 aclp_post_session_change_request (acl_main_t * am, u32 target_thread,
 				  u32 target_session, u32 request_type)
@@ -715,12 +735,9 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 					   "ACL_FA_NODE_CLEAN: waiting previous cleaning cycle to finish on %u",
 					   "i4",
 					   (u32) (pw0 - am->per_worker_data));
-		  vlib_process_suspend (vm, 0.0001);
-		  if (pw0->interrupt_is_needed)
-		    {
-		      send_one_worker_interrupt (vm, am,
-						 (pw0 - am->per_worker_data));
-		    }
+		  ensure_worker_cleaner_interrupt (
+		    am, pw0 - am->per_worker_data);
+		  vlib_process_suspend (vm, 0.001);
 		}
 	      if (pw0->clear_in_process)
 		{
@@ -765,12 +782,9 @@ acl_fa_session_cleaner_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
 					   "ACL_FA_NODE_CLEAN: waiting for my cleaning cycle to finish on %u",
 					   "i4",
 					   (u32) (pw0 - am->per_worker_data));
-		  vlib_process_suspend (vm, 0.0001);
-		  if (pw0->interrupt_is_needed)
-		    {
-		      send_one_worker_interrupt (vm, am,
-						 (pw0 - am->per_worker_data));
-		    }
+		  ensure_worker_cleaner_interrupt (
+		    am, pw0 - am->per_worker_data);
+		  vlib_process_suspend (vm, 0.001);
 		}
 	    }
 	    acl_log_info ("ACL_FA_NODE_CLEAN: cleaning done");
@@ -962,3 +976,5 @@ VLIB_REGISTER_NODE (acl_fa_session_cleaner_process_node, static) = {
  * eval: (c-set-style "gnu")
  * End:
  */
+
+

ET2500/vpp-24.02/src/plugins/dns/dns.c

@@ -2524,37 +2524,61 @@ VLIB_CLI_COMMAND (show_dns_cache_command) =
 /* *INDENT-ON* */
 
 static clib_error_t *
-dns_enable_disable_command_fn (vlib_main_t *vm, unformat_input_t *input,
-			       vlib_cli_command_t *cmd)
+dns_enable_disable_common (vlib_main_t *vm, u32 enable_disable)
 {
   dns_main_t *dm = &dns_main;
-  u32 enable_disable;
   int rv;
 
-  enable_disable = 0;
-
-  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (input, "enable"))
-	enable_disable = 1;
-      else if (unformat (input, "disable"))
-	enable_disable = 0;
-      else
-	return clib_error_return (0, "unknown input `%U'",
-				  format_unformat_error, input);
-    }
-
   rv = dns_enable_disable (vm, dm, enable_disable);
   if (rv)
     return clib_error_return (0, "%U", format_vnet_api_errno, rv);
 
   return 0;
 }
 
-VLIB_CLI_COMMAND (dns_enable_disable_command) = {
+static clib_error_t *
+dns_enable_command_fn (vlib_main_t *vm, unformat_input_t *input,
+		       vlib_cli_command_t *cmd)
+{
+  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  return dns_enable_disable_common (vm, 1);
+}
+
+static clib_error_t *
+dns_disable_command_fn (vlib_main_t *vm, unformat_input_t *input,
+			vlib_cli_command_t *cmd)
+{
+  if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    return clib_error_return (0, "unknown input `%U'",
+			      format_unformat_error, input);
+
+  return dns_enable_disable_common (vm, 0);
+}
+
+/*
+ * "dns" deliberately has no function of its own. If it had one, the CLI
+ * dispatcher would fall back to running it whenever a failing sub-command
+ * (e.g. "dns cache") returns an error, silently toggling name resolution
+ * with already-consumed input.
+ */
+VLIB_CLI_COMMAND (dns_command) = {
   .path = "dns",
   .short_help = "dns [enable][disable]",
-  .function = dns_enable_disable_command_fn,
+};
+
+VLIB_CLI_COMMAND (dns_enable_command) = {
+  .path = "dns enable",
+  .short_help = "dns enable",
+  .function = dns_enable_command_fn,
+};
+
+VLIB_CLI_COMMAND (dns_disable_command) = {
+  .path = "dns disable",
+  .short_help = "dns disable",
+  .function = dns_disable_command_fn,
 };
 
 static clib_error_t *
@@ -2684,6 +2708,9 @@ dns_cache_add_del_command_fn (vlib_main_t * vm,
     {
       if (unformat (input, "%v", &name))
 	{
+	  /* The cache hash uses strlen/strcmp, so the key must be
+	   * a NULL-terminated C string */
+	  dns_terminate_c_string (&name);
 	  rv = dns_delete_by_name (dm, name);
 	  switch (rv)
 	    {
@@ -2715,13 +2742,17 @@ dns_cache_add_del_command_fn (vlib_main_t * vm,
   /* Note: dns_add_static_entry consumes the name vector if OK... */
   if (unformat (input, "%U", unformat_dns_reply, &dns_reply_data, &name))
     {
+      /* The cache hash uses strlen/strcmp, so the key must be
+       * a NULL-terminated C string */
+      dns_terminate_c_string (&name);
       rv = dns_add_static_entry (dm, name, dns_reply_data);
       switch (rv)
 	{
 	case VNET_API_ERROR_ENTRY_ALREADY_EXISTS:
+	  error = clib_error_return (0, "%v already in the cache...", name);
 	  vec_free (name);
 	  vec_free (dns_reply_data);
-	  return clib_error_return (0, "%v already in the cache...", name);
+	  return error;
 	case 0:
 	  return 0;
 

ET2500/vpp-24.02/src/plugins/gre/gre.c

@@ -288,6 +288,34 @@ gre_build_rewrite (vnet_main_t *vnm, u32 sw_if_index, vnet_link_t link_type,
   return (rewrite);
 }
 
+/**
+ * Return a pointer to the inner header, i.e. just past the GRE header,
+ * accounting for the optional GRE fields (checksum, key and sequence
+ * number) as indicated by the GRE header flags (RFC 1701 / RFC 2784).
+ * Note: routing information (deprecated by RFC 2784 and never generated
+ * by VPP) is variable length and not accounted for here.
+ */
+static_always_inline void *
+gre_fixup_inner (const gre_header_t *gre)
+{
+  /* work in network byte order: the flags masks are compile-time
+   * constants, so no byte-order conversion is emitted at runtime */
+  const u16 flags = gre->flags_and_version;
+  uword offset = sizeof (gre_header_t);
+
+  /* the checksum and reserved/offset fields are present if either the
+   * checksum or the routing flag is set */
+  if (PREDICT_FALSE (flags & clib_host_to_net_u16 (GRE_FLAGS_CHECKSUM |
+						   GRE_FLAGS_ROUTING)))
+    offset += 4;
+  if (PREDICT_FALSE (flags & clib_host_to_net_u16 (GRE_FLAGS_KEY)))
+    offset += sizeof (gre_key_t);
+  if (PREDICT_FALSE (flags & clib_host_to_net_u16 (GRE_FLAGS_SEQUENCE)))
+    offset += 4;
+
+  return ((void *) ((const u8 *) gre + offset));
+}
+
 static void
 gre44_fixup (vlib_main_t *vm, const ip_adjacency_t *adj, vlib_buffer_t *b0,
 	     const void *data)
@@ -302,7 +330,7 @@ gre44_fixup (vlib_main_t *vm, const ip_adjacency_t *adj, vlib_buffer_t *b0,
    * that was applied at the midchain node */
   ip0->ip4.length =
     clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-  tunnel_encap_fixup_4o4 (flags, (ip4_header_t *) (ip0 + 1), &ip0->ip4);
+  tunnel_encap_fixup_4o4 (flags, gre_fixup_inner (&ip0->gre), &ip0->ip4);
   ip0->ip4.checksum = ip4_header_checksum (&ip0->ip4);
 }
 
@@ -320,7 +348,7 @@ gre64_fixup (vlib_main_t *vm, const ip_adjacency_t *adj, vlib_buffer_t *b0,
    * that was applied at the midchain node */
   ip0->ip4.length =
     clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0));
-  tunnel_encap_fixup_6o4 (flags, (ip6_header_t *) (ip0 + 1), &ip0->ip4);
+  tunnel_encap_fixup_6o4 (flags, gre_fixup_inner (&ip0->gre), &ip0->ip4);
   ip0->ip4.checksum = ip4_header_checksum (&ip0->ip4);
 }
 
@@ -352,7 +380,7 @@ gre46_fixup (vlib_main_t *vm, const ip_adjacency_t *adj, vlib_buffer_t *b0,
    * at the midchain node */
   ip0->ip6.payload_length = clib_host_to_net_u16 (
     vlib_buffer_length_in_chain (vm, b0) - sizeof (ip0->ip6));
-  tunnel_encap_fixup_4o6 (flags, b0, (ip4_header_t *) (ip0 + 1), &ip0->ip6);
+  tunnel_encap_fixup_4o6 (flags, b0, gre_fixup_inner (&ip0->gre), &ip0->ip6);
 }
 
 static void
@@ -369,7 +397,7 @@ gre66_fixup (vlib_main_t *vm, const ip_adjacency_t *adj, vlib_buffer_t *b0,
    * at the midchain node */
   ip0->ip6.payload_length = clib_host_to_net_u16 (
     vlib_buffer_length_in_chain (vm, b0) - sizeof (ip0->ip6));
-  tunnel_encap_fixup_6o6 (flags, (ip6_header_t *) (ip0 + 1), &ip0->ip6);
+  tunnel_encap_fixup_6o6 (flags, gre_fixup_inner (&ip0->gre), &ip0->ip6);
 }
 
 static void