zebra: mac sync update/del/expiry in extern_learn mode

Dataplane Sync MAC Update:
- Install sync local MAC only if it's inactive

On hold timer expiry:
- Flush the MAC, and no reprogram, as no dynamic learn during static

Sync Del:
- Explicit MAC flush if MAC is inactive, if it has no PEER flags

Sync MAC update:
- In Peer Proxy, no additional BGP update computation

Netlink MAC Update processing:
- Ignore VXLAN Info message in extern mode
- Ignore MAC netlink update if interface is down.
  Presently done only for extern mode

Signed-off-by: Patrice Brissette <pbrisset@cisco.com>
Signed-off-by: Tamer Ahmed <tamerahmed@microsoft.com>

Author: pbrisset

zebra/zebra_evpn_mac.c

@@ -1480,20 +1480,21 @@ int zebra_evpn_sync_mac_dp_install(struct zebra_mac *mac, bool set_inactive,
 		return 0;
 	}
 
-	if (IS_ZEBRA_DEBUG_EVPN_MH_MAC) {
-		char mac_buf[MAC_BUF_SIZE];
+	if (!zebra_mac_ext_learn_mode() || CHECK_FLAG(mac->flags, ZEBRA_MAC_LOCAL_INACTIVE)) {
+		/* For Extern Only mode:
+		 *  Update the dataplane only when the MAC is inactive
+		 */
+		if (IS_ZEBRA_DEBUG_EVPN_MH_MAC) {
+			char mac_buf[MAC_BUF_SIZE];
 
-		zlog_debug("dp-install sync-mac vni %u mac %pEA es %s %s%s%s",
-			   zevpn->vni, &mac->macaddr,
-			   mac->es ? mac->es->esi_str : "-",
-			   zebra_evpn_zebra_mac_flag_dump(mac, mac_buf,
-							  sizeof(mac_buf)),
-			   set_static ? "static " : "",
-			   set_inactive ? "inactive " : "");
+			zlog_debug("dp-install sync-mac vni %u mac %pEA es %s %s%s%s", zevpn->vni,
+				   &mac->macaddr, mac->es ? mac->es->esi_str : "-",
+				   zebra_evpn_zebra_mac_flag_dump(mac, mac_buf, sizeof(mac_buf)),
+				   set_static ? "static " : "", set_inactive ? "inactive " : "");
+		}
+		dplane_local_mac_add(ifp, br_ifp, vid, &mac->macaddr, sticky, set_static,
+				     set_inactive);
 	}
-
-	dplane_local_mac_add(ifp, br_ifp, vid, &mac->macaddr, sticky,
-			     set_static, set_inactive);
 	return 0;
 }
 
@@ -1545,16 +1546,23 @@ static void zebra_evpn_mac_hold_exp_cb(struct event *t)
 			   zebra_evpn_zebra_mac_flag_dump(mac, mac_buf, sizeof(mac_buf)));
 	}
 
-	/* re-program the local mac in the dataplane if the mac is no
-	 * longer static
-	 */
-	if (old_static != new_static)
-		zebra_evpn_sync_mac_dp_install(mac, false, false, __func__);
+	if (zebra_mac_ext_learn_mode()) {
+		vlanid_t vid;
+		struct interface *ifp;
+		/* Upon expiry, MAC is deleted from DP. */
+		zebra_evpn_mac_get_access_info(mac, &ifp, &vid);
+		zebra_evpn_flush_local_mac(mac, ifp);
+	} else {
+		/* re-program the local mac in the dataplane if the mac is no
+		 * longer static
+		 */
+		if (old_static != new_static)
+			zebra_evpn_sync_mac_dp_install(mac, false, false, __func__);
 
-	/* inform bgp if needed */
-	if (old_bgp_ready != new_bgp_ready)
-		zebra_evpn_mac_send_add_del_to_client(mac, old_bgp_ready,
-						      new_bgp_ready);
+		/* inform bgp if needed */
+		if (old_bgp_ready != new_bgp_ready)
+			zebra_evpn_mac_send_add_del_to_client(mac, old_bgp_ready, new_bgp_ready);
+	}
 }
 
 static inline void zebra_evpn_mac_start_hold_timer(struct zebra_mac *mac)
@@ -1610,7 +1618,15 @@ void zebra_evpn_sync_mac_del(struct zebra_mac *mac)
 		zebra_evpn_mac_start_hold_timer(mac);
 	new_static = zebra_evpn_mac_is_static(mac);
 
-	if (old_static != new_static)
+	if (zebra_mac_ext_learn_mode() && !new_static &&
+	    CHECK_FLAG(mac->flags, ZEBRA_MAC_LOCAL_INACTIVE)) {
+		/* Clear the MAC from Peer Proxy, as no age out will happen for extern mode */
+		struct interface *ifp;
+		vlanid_t vid;
+
+		zebra_evpn_mac_get_access_info(mac, &ifp, &vid);
+		zebra_evpn_flush_local_mac(mac, ifp);
+	} else if (old_static != new_static)
 		/* program the local mac in the kernel */
 		zebra_evpn_sync_mac_dp_install(mac, false, false, __func__);
 }
@@ -1823,8 +1839,16 @@ struct zebra_mac *zebra_evpn_proc_sync_mac_update(struct zebra_evpn *zevpn,
 		if (old_static != new_static)
 			inform_dataplane = true;
 
-		old_bgp_ready = zebra_evpn_mac_is_ready_for_bgp(old_flags);
-		new_bgp_ready = zebra_evpn_mac_is_ready_for_bgp(mac->flags);
+		/* when going from peer-active to peer-proxy, nothing should be happening
+		 * Route is maintain in BGP
+		 */
+		if (zebra_mac_ext_learn_mode() && CHECK_FLAG(new_flags, ZEBRA_MAC_ES_PEER_PROXY)) {
+			old_bgp_ready = false;
+			new_bgp_ready = false;
+		} else {
+			old_bgp_ready = zebra_evpn_mac_is_ready_for_bgp(old_flags);
+			new_bgp_ready = zebra_evpn_mac_is_ready_for_bgp(mac->flags);
+		}
 		if (old_bgp_ready != new_bgp_ready)
 			inform_bgp = true;
 	}
@@ -2411,7 +2435,9 @@ int zebra_evpn_del_local_mac(struct zebra_evpn *zevpn, struct zebra_mac *mac,
 							      new_bgp_ready);
 		}
 
-		/* re-install the inactive entry in the kernel */
+		/* In EXT-LEARN mode as well, the MAC will be reprogrammed as static,
+		 * post age out, until proxy is withdrawn
+		 */
 		zebra_evpn_sync_mac_dp_install(mac, true, false, __func__);
 
 		return 0;

zebra/zebra_evpn_mh.c

@@ -60,6 +60,8 @@ static void zebra_evpn_mh_update_protodown_es(struct zebra_evpn_es *es,
 					      bool resync_dplane);
 static void zebra_evpn_mh_clear_protodown_es(struct zebra_evpn_es *es);
 static void zebra_evpn_mh_startup_delay_timer_start(const char *rc);
+static void zebra_evpn_es_bypass_update_macs(struct zebra_evpn_es *es, struct interface *ifp,
+					     bool bypass);
 static void zebra_evpn_es_vtep_local_set(struct zebra_evpn_es_vtep *es_vtep);
 static void zebra_evpn_es_vtep_local_clear(struct zebra_evpn_es_vtep *es_vtep);
 
@@ -2232,7 +2234,7 @@ static void zebra_evpn_es_setup_evis(struct zebra_evpn_es *es)
 	}
 }
 
-static void zebra_evpn_flush_local_mac(struct zebra_mac *mac,
+void zebra_evpn_flush_local_mac(struct zebra_mac *mac,
 				       struct interface *ifp)
 {
 	vlanid_t vid;

zebra/zebra_evpn_mh.h

@@ -425,6 +425,8 @@ void zebra_evpn_es_type0_esi_update(struct zebra_if *zif, esi_t *esi);
 void zebra_evpn_es_df_pref_update(struct zebra_if *zif, uint16_t df_pref);
 void zebra_evpn_es_bypass_cfg_update(struct zebra_if *zif, bool bypass);
 void zebra_evpn_mh_uplink_cfg_update(struct zebra_if *zif, bool set);
+void zebra_evpn_flush_local_mac(struct zebra_mac *mac,
+				struct interface *ifp);
 
 void zebra_evpn_mh_if_init(struct zebra_if *zif);
 

zebra/zebra_neigh.c

@@ -682,6 +682,12 @@ static void zebra_neigh_macfdb_update(struct zebra_dplane_ctx *ctx)
 
 
 		if (IS_ZEBRA_IF_VXLAN(ifp)) {
+			/* In mac-extern-learn mode the Linux kernel should never give us an entry
+			 * with VxLAN info
+			 */
+			if (zebra_mac_ext_learn_mode())
+				return;
+
 			if (!dst_present)
 				return;
 
@@ -702,6 +708,14 @@ static void zebra_neigh_macfdb_update(struct zebra_dplane_ctx *ctx)
 						       !!(ndm_flags & ZEBRA_NTF_EXT_LEARNED));
 			return;
 		}
+		if (zebra_mac_ext_learn_mode()) {
+			if (!if_is_operative(ifp)) {
+				if (IS_ZEBRA_DEBUG_KERNEL)
+					zlog_debug("Interface %s(%u) not operative:Ignore Mac update",
+						   ifp->name, ifp->ifindex);
+				return;
+			}
+		}
 
 		zebra_vxlan_local_mac_add_update(ifp, br_if, &mac, vid, sticky, local_inactive,
 						 dp_static);