Only set VF L2 address once

Author: PlagueCZ

include/dp_iface.h

@@ -4,6 +4,8 @@
 #ifndef __INCLUDE_DP_IFACE_H__
 #define __INCLUDE_DP_IFACE_H__
 
+#include <rte_ether.h>
+#include <stdint.h>
 #include "dp_port.h"
 
 #ifdef __cplusplus
@@ -23,12 +25,6 @@ int dp_setup_iface(struct dp_port *port, uint32_t vni);
 void dp_delete_iface(struct dp_port *port);
 
 
-static __rte_always_inline
-bool dp_arp_cycle_needed(const struct dp_port *port)
-{
-	return port->iface.ready && !port->iface.arp_done;
-}
-
 static __rte_always_inline
 void dp_fill_ether_hdr(struct rte_ether_hdr *ether_hdr, const struct dp_port *port, uint16_t ether_type)
 {

include/dp_port.h

@@ -7,6 +7,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <net/if.h>
+#include <rte_ether.h>
 #include <rte_meter.h>
 #include <rte_pci.h>
 #include <rte_timer.h>
@@ -45,7 +46,7 @@ struct dp_port_iface {
 	uint32_t				nat_ip;
 	uint16_t				nat_port_range[2];
 	bool					ready;
-	bool					arp_done;
+	bool					l2_addr_received;
 	uint64_t				total_flow_rate_cap;
 	uint64_t				public_flow_rate_cap;
 	uint32_t				hostname_len;
@@ -134,6 +135,14 @@ int dp_set_pf_neigh_mac(uint16_t port_id, const struct rte_ether_addr *mac);
 
 int dp_port_meter_config(struct dp_port *port, uint64_t total_flow_rate_cap, uint64_t public_flow_rate_cap);
 
+static __rte_always_inline
+bool dp_l2_addr_needed(const struct dp_port *port)
+{
+	return port->iface.ready && !port->iface.l2_addr_received;
+}
+
+void dp_l2_addr_set(struct dp_port *port, const struct rte_ether_addr *l2_addr);
+
 static __rte_always_inline
 int dp_load_mac(struct dp_port *port)
 {

src/dp_periodic_msg.c

@@ -57,7 +57,7 @@ void send_to_all_vfs(const struct rte_mbuf *pkt, uint16_t eth_type)
 		if (eth_type == RTE_ETHER_TYPE_ARP) {
 			arp_hdr = (struct rte_arp_hdr *)(eth_hdr + 1);
 			rte_ether_addr_copy(&port->own_mac, &arp_hdr->arp_data.arp_sha);
-			if (dp_arp_cycle_needed(port))
+			if (dp_l2_addr_needed(port))
 				arp_hdr->arp_data.arp_tip = htonl(port->iface.cfg.own_ip);
 		}
 

src/dp_port.c

@@ -164,7 +164,7 @@ static int dp_port_init_ethdev(struct dp_port *port, struct rte_eth_dev_info *de
 	// guess the inital VM MAC until ARP arrives
 	if (!port->is_pf) {
 		rte_ether_addr_copy(&port->own_mac, &port->neigh_mac);
-		port->iface.arp_done = false;
+		port->iface.l2_addr_received = false;
 	}
 
 	static_assert(sizeof(port->dev_name) == RTE_ETH_NAME_MAX_LEN, "Incompatible port dev_name size");
@@ -729,3 +729,10 @@ int dp_port_meter_config(struct dp_port *port, uint64_t total_flow_rate_cap, uin
 
 	return DP_OK;
 }
+
+
+void dp_l2_addr_set(struct dp_port *port, const struct rte_ether_addr *l2_addr)
+{
+	rte_ether_addr_copy(l2_addr, &port->neigh_mac);
+	port->iface.l2_addr_received = true;
+}

src/nodes/arp_node.c

@@ -42,9 +42,8 @@ static __rte_always_inline bool arp_handled(struct rte_mbuf *m)
 	uint32_t temp_ip;
 
 	// ARP reply from VM
-	if (dp_arp_cycle_needed(port) && sender_ip == htonl(port->iface.cfg.own_ip)) {
-		rte_ether_addr_copy(&incoming_eth_hdr->src_addr, &port->neigh_mac);
-		port->iface.arp_done = true;
+	if (unlikely(dp_l2_addr_needed(port) && sender_ip == htonl(port->iface.cfg.own_ip))) {
+		dp_l2_addr_set(port, &incoming_eth_hdr->src_addr);
 		return true;
 	}
 

src/nodes/dhcp_node.c

@@ -229,8 +229,8 @@ static __rte_always_inline rte_edge_t get_next_index(struct rte_node *node, stru
 
 	rte_ether_addr_copy(&incoming_eth_hdr->src_addr, &incoming_eth_hdr->dst_addr);
 	rte_ether_addr_copy(&port->own_mac, &incoming_eth_hdr->src_addr);
-	if (response_type == DHCPACK)
-		rte_ether_addr_copy(&incoming_eth_hdr->dst_addr, &port->neigh_mac);
+	if (unlikely(response_type == DHCPACK && dp_l2_addr_needed(port)))
+		dp_l2_addr_set(port, &incoming_eth_hdr->dst_addr);
 
 	incoming_ipv4_hdr->src_addr = server_ip;
 

src/nodes/ipv6_nd_node.c

@@ -76,7 +76,8 @@ static __rte_always_inline rte_edge_t get_next_index(__rte_unused struct rte_nod
 		static_assert(sizeof(nd_msg->target) == sizeof(*gw_ip), "Incompatible IPv6 format in ND message structure");
 		if (!dp_ipv6_match((const union dp_ipv6 *)nd_msg->target, gw_ip))
 			return IPV6_ND_NEXT_DROP;
-		rte_ether_addr_copy(&req_eth_hdr->dst_addr, &port->neigh_mac);
+		if (unlikely(dp_l2_addr_needed(port)))
+			dp_l2_addr_set(port, &req_eth_hdr->dst_addr);
 		dp_copy_ipv6(&port->iface.cfg.own_ipv6, dp_get_dst_ipv6(req_ipv6_hdr));
 		req_icmp6_hdr->icmp6_type = NDISC_NEIGHBOUR_ADVERTISEMENT;
 		req_icmp6_hdr->icmp6_solicited = 1;