session: fix workers race to allocate lookup table

[vpp.git] / src / vnet / ip-neighbor / ip4_neighbor.h

diff --git a/src/vnet/ip-neighbor/ip4_neighbor.h b/src/vnet/ip-neighbor/ip4_neighbor.h
index 8805bea..7941ebd 100644 (file)
--- a/src/vnet/ip-neighbor/ip4_neighbor.h
+++ b/src/vnet/ip-neighbor/ip4_neighbor.h
@@ -18,25 +18,29 @@
 
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/arp_packet.h>
+#include <vnet/ip-neighbor/ip_neighbor_types.h>
 
-extern void ip4_neighbor_probe_dst (u32 sw_if_index,
-                                   const ip4_address_t * dst);
-extern void ip4_neighbor_advertise (vlib_main_t * vm,
-                                   vnet_main_t * vnm,
-                                   u32 sw_if_index,
-                                   const ip4_address_t * addr);
+extern void ip4_neighbor_probe_dst (u32 sw_if_index, u32 thread_index,
+                                   const ip4_address_t *dst);
+extern void ip4_neighbor_advertise (vlib_main_t *vm, vnet_main_t *vnm,
+                                   u32 sw_if_index, u32 thread_index,
+                                   const ip4_address_t *addr);
 
 always_inline vlib_buffer_t *
-ip4_neighbor_probe (vlib_main_t * vm,
-                   vnet_main_t * vnm,
-                   const ip_adjacency_t * adj0,
-                   const ip4_address_t * src, const ip4_address_t * dst)
+ip4_neighbor_probe (vlib_main_t *vm, vnet_main_t *vnm,
+                   const ip_adjacency_t *adj0, const ip4_address_t *src,
+                   const ip4_address_t *dst)
 {
   vnet_hw_interface_t *hw_if0;
   ethernet_arp_header_t *h0;
   vlib_buffer_t *b0;
   u32 bi0;
 
+  hw_if0 = vnet_get_sup_hw_interface (vnm, adj0->rewrite_header.sw_if_index);
+
+  /* if (NULL == hw_if0->hw_address) */
+  /*   return (NULL); */
+
   /* Send ARP request. */
   h0 = vlib_packet_template_get_packet (vm,
                                        &ip4_main.ip4_arp_request_packet_template,
@@ -50,16 +54,14 @@ ip4_neighbor_probe (vlib_main_t * vm,
   /* Add rewrite/encap string for ARP packet. */
   vnet_rewrite_one_header (adj0[0], h0, sizeof (ethernet_header_t));
 
-  hw_if0 = vnet_get_sup_hw_interface (vnm, adj0->rewrite_header.sw_if_index);
-
   /* Src ethernet address in ARP header. */
   mac_address_from_bytes (&h0->ip4_over_ethernet[0].mac, hw_if0->hw_address);
 
   h0->ip4_over_ethernet[0].ip4 = *src;
   h0->ip4_over_ethernet[1].ip4 = *dst;
 
-  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
   vnet_buffer (b0)->sw_if_index[VLIB_TX] = adj0->rewrite_header.sw_if_index;
+  b0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
 
   vlib_buffer_advance (b0, -adj0->rewrite_header.data_bytes);
 
@@ -71,6 +73,10 @@ ip4_neighbor_probe (vlib_main_t * vm,
     vlib_put_frame_to_node (vm, hw_if0->output_node_index, f);
   }
 
+  vlib_increment_simple_counter (
+    &ip_neighbor_counters[AF_IP4].ipnc[VLIB_TX][IP_NEIGHBOR_CTR_REQUEST],
+    vm->thread_index, adj0->rewrite_header.sw_if_index, 1);
+
   return b0;
 }