From: sharathr <sharathr@cumulusnetworks.com>
Date: Tue, 19 Oct 2021 11:01:50 +0000 (-0700)
Subject: zebra: Fix for mcast-group update and delete per vni for svd
X-Git-Tag: base_9.0~402^2~5
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e41db2405612b197714c67f83aea650efa88d53e;p=matthieu%2Ffrr.git

zebra: Fix for mcast-group update and delete per vni for svd

Ticket: 2698649
Testing Done: precommit and evpn-min

Problem:
When the mcast-group is updated, the changes were being read from the netlink
and populated by zebra, but when kernel sends the delete of fdb delete for the
group, we are deleting the mcast-group that we newly updated. This is because,
currently we blindly reset the mcast-group during fdb delete without checking
for mcast-group associated to the vni.

Fix is to separate add/update and delete mcast-group functions and to check
for mcast-group before resetting during delete.

Signed-off-by: sramamurthy <sramamurthy@nvidia.com>
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 7895c3226e..8bf59e02c7 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -3715,7 +3715,7 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 				return 0;
 
 			if (vni_mcast_grp)
-				return zebra_vxlan_if_vni_mcast_group_update(
+				return zebra_vxlan_if_vni_mcast_group_add_update(
 					ifp, vni, &vtep_ip);
 
 			return zebra_vxlan_dp_network_mac_add(
@@ -3742,8 +3742,8 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 
 	if (dst_present) {
 		if (vni_mcast_grp)
-			return zebra_vxlan_if_vni_mcast_group_update(ifp, vni,
-								     NULL);
+			return zebra_vxlan_if_vni_mcast_group_del(ifp, vni,
+								  &vtep_ip);
 
 		if (is_zero_mac(&mac) && vni)
 			return zebra_vxlan_check_readd_vtep(ifp, vni, vtep_ip);
diff --git a/zebra/zebra_vxlan_if.c b/zebra/zebra_vxlan_if.c
index 31cef767de..08e07b60a2 100644
--- a/zebra/zebra_vxlan_if.c
+++ b/zebra/zebra_vxlan_if.c
@@ -806,8 +806,9 @@ int zebra_vxlan_if_vni_table_add_update(struct interface *ifp,
 	return 0;
 }
 
-int zebra_vxlan_if_vni_mcast_group_update(struct interface *ifp, vni_t vni_id,
-					  struct in_addr *mcast_group)
+int zebra_vxlan_if_vni_mcast_group_add_update(struct interface *ifp,
+					      vni_t vni_id,
+					      struct in_addr *mcast_group)
 {
 	struct zebra_if *zif;
 	struct zebra_vxlan_vni *vni;
@@ -826,10 +827,35 @@ int zebra_vxlan_if_vni_mcast_group_update(struct interface *ifp, vni_t vni_id,
 	ctx.old_vni.mcast_grp = vni->mcast_grp;
 	ctx.chgflags = ZEBRA_VXLIF_MCAST_GRP_CHANGE;
 
-	if (mcast_group)
-		vni->mcast_grp = *mcast_group;
-	else
-		memset(&vni->mcast_grp, 0, sizeof(vni->mcast_grp));
+	vni->mcast_grp = *mcast_group;
+
+	return zebra_vxlan_if_update_vni(ifp, vni, &ctx);
+}
+
+int zebra_vxlan_if_vni_mcast_group_del(struct interface *ifp, vni_t vni_id,
+				       struct in_addr *mcast_group)
+{
+	struct zebra_if *zif = NULL;
+	struct zebra_vxlan_vni *vni;
+	struct zebra_vxlan_if_update_ctx ctx;
+
+	zif = (struct zebra_if *)ifp->info;
+
+	if (!IS_ZEBRA_VXLAN_IF_SVD(zif))
+		return 0;
+
+	vni = zebra_vxlan_if_vni_find(zif, vni_id);
+	if (!vni)
+		return 0;
+
+	if (memcmp(mcast_group, &vni->mcast_grp, sizeof(*mcast_group)))
+		return 0;
+
+	memset(&ctx, 0, sizeof(ctx));
+	ctx.old_vni.mcast_grp = vni->mcast_grp;
+	ctx.chgflags = ZEBRA_VXLIF_MCAST_GRP_CHANGE;
+
+	memset(&vni->mcast_grp, 0, sizeof(vni->mcast_grp));
 
 	return zebra_vxlan_if_update_vni(ifp, vni, &ctx);
 }
diff --git a/zebra/zebra_vxlan_if.h b/zebra/zebra_vxlan_if.h
index 7d2ddb2d8d..8a03acbf1e 100644
--- a/zebra/zebra_vxlan_if.h
+++ b/zebra/zebra_vxlan_if.h
@@ -64,9 +64,12 @@ extern void zebra_vxlan_if_vni_walk(struct zebra_if *zif,
 				    void *arg);
 extern vni_t zebra_vxlan_if_access_vlan_vni_find(struct zebra_if *zif,
 						 struct interface *br_if);
-extern int zebra_vxlan_if_vni_mcast_group_update(struct interface *ifp,
-						 vni_t vni_id,
-						 struct in_addr *mcast_group);
+extern int
+zebra_vxlan_if_vni_mcast_group_add_update(struct interface *ifp, vni_t vni_id,
+					  struct in_addr *mcast_group);
+extern int zebra_vxlan_if_vni_mcast_group_del(struct interface *ifp,
+					      vni_t vni_id,
+					      struct in_addr *mcast_group);
 extern int zebra_vxlan_if_vni_down(struct interface *ifp,
 				   struct zebra_vxlan_vni *vni);
 extern int zebra_vxlan_if_down(struct interface *ifp);