Merge pull request FRRouting#20377 from donaldsharp/asic_notification_removal

zebra: Remove zrouter.zav.asic_notification_nexthop_control

Author: mjstapp

zebra/rib.h

@@ -140,10 +140,6 @@ struct route_entry {
 #define ROUTE_ENTRY_INSTALLED        0x10
 /* Route has Failed installation into the Data Plane in some manner */
 #define ROUTE_ENTRY_FAILED           0x20
-/* Route has a 'fib' set of nexthops, probably because the installed set
- * differs from the rib/normal set of nexthops.
- */
-#define ROUTE_ENTRY_USE_FIB_NHG      0x40
 /*
  * Route entries that are going to the dplane for a Route Replace
  * let's note the fact that this is happening.  This will
@@ -168,13 +164,6 @@ struct route_entry {
 	time_t uptime;
 
 	struct re_opaque *opaque;
-
-	/* Nexthop group from FIB (optional), reflecting what is actually
-	 * installed in the FIB if that differs. The 'backup' group is used
-	 * when backup nexthops are present in the route's nhg.
-	 */
-	struct nexthop_group fib_ng;
-	struct nexthop_group fib_backup_ng;
 };
 
 #define RIB_SYSTEM_ROUTE(R) RSYSTEM_ROUTE((R)->type)
@@ -614,23 +603,7 @@ DECLARE_HOOK(rib_shutdown, (struct route_node * rn), (rn));
  */
 static inline struct nexthop_group *rib_get_fib_nhg(struct route_entry *re)
 {
-	/* If the fib set is a subset of the active rib set,
-	 * use the dedicated fib list.
-	 */
-	if (CHECK_FLAG(re->status, ROUTE_ENTRY_USE_FIB_NHG))
-		return &(re->fib_ng);
-	else
-		return &(re->nhe->nhg);
-}
-
-/*
- * Access backup nexthop-group that represents the installed backup nexthops;
- * any installed backup will be on the fib list.
- */
-static inline struct nexthop_group *rib_get_fib_backup_nhg(
-	struct route_entry *re)
-{
-	return &(re->fib_backup_ng);
+	return &(re->nhe->nhg);
 }
 
 extern void zebra_gr_process_client(afi_t afi, vrf_id_t vrf_id, uint8_t proto, uint8_t instance,

zebra/zebra_dplane.c

@@ -4286,26 +4286,6 @@ static int dplane_ctx_pw_init(struct zebra_dplane_ctx *ctx,
 			}
 		}
 
-		/* Include any installed backup nexthops also. */
-		nhg = rib_get_fib_backup_nhg(re);
-		if (nhg && nhg->nexthop) {
-			for (ALL_NEXTHOPS_PTR(nhg, nh)) {
-				if (!CHECK_FLAG(nh->flags, NEXTHOP_FLAG_ACTIVE)
-				    || CHECK_FLAG(nh->flags,
-						  NEXTHOP_FLAG_RECURSIVE)
-				    || nh->nh_label == NULL)
-					continue;
-
-				newnh = nexthop_dup(nh, NULL);
-
-				if (last_nh)
-					NEXTHOP_APPEND(last_nh, newnh);
-				else
-					ctx->u.pw.fib_nhg.nexthop = newnh;
-				last_nh = newnh;
-			}
-		}
-
 		/* Copy primary nexthops; recursive info is included too */
 		assert(re->nhe != NULL); /* SA warning */
 		copy_nexthops(&(ctx->u.pw.primary_nhg.nexthop),
@@ -5000,13 +4980,6 @@ dplane_route_notif_update(struct route_node *rn,
 			copy_nexthops(&(new_ctx->u.rinfo.zd_ng.nexthop),
 				      nhg->nexthop, NULL);
 
-		/* Check for installed backup nexthops also */
-		nhg = rib_get_fib_backup_nhg(re);
-		if (nhg && nhg->nexthop) {
-			copy_nexthops(&(new_ctx->u.rinfo.zd_ng.nexthop),
-				      nhg->nexthop, NULL);
-		}
-
 		for (ALL_NEXTHOPS(new_ctx->u.rinfo.zd_ng, nexthop))
 			UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
 

zebra/zebra_nhg.c

@@ -2585,32 +2585,6 @@ static int nexthop_active(struct nexthop *nexthop, struct nhg_hash_entry *nhe,
 				}
 			}
 
-			/* Examine installed backup nexthops, if any. There
-			 * are only installed backups *if* there is a
-			 * dedicated fib list. The UI can also control use
-			 * of backups for resolution.
-			 */
-			nhg = rib_get_fib_backup_nhg(match);
-			if (!use_recursive_backups ||
-			    nhg == NULL || nhg->nexthop == NULL)
-				goto done_with_match;
-
-			for (ALL_NEXTHOPS_PTR(nhg, newhop)) {
-				if (!nexthop_valid_resolve(nexthop, newhop))
-					continue;
-
-				if (IS_ZEBRA_DEBUG_NHG_DETAIL)
-					zlog_debug(
-						"%s: RECURSIVE match backup %p (%pNG), newhop %pNHv",
-						__func__, match, match->nhe,
-						newhop);
-
-				SET_FLAG(nexthop->flags,
-					 NEXTHOP_FLAG_RECURSIVE);
-				nexthop_set_resolved(afi, newhop, nexthop, NULL, flags);
-				resolved = 1;
-			}
-
 done_with_match:
 			/* Capture resolving mtu */
 			if (resolved) {

zebra/zebra_pw.c

@@ -284,28 +284,6 @@ static int zebra_pw_check_reachability_strict(const struct zebra_pw *pw,
 		}
 	}
 
-	if (fail_p)
-		goto done;
-
-	nhg = rib_get_fib_backup_nhg(re);
-	if (nhg && nhg->nexthop) {
-		for (ALL_NEXTHOPS_PTR(nhg, nexthop)) {
-			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
-				continue;
-
-			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE)) {
-				if (nexthop->nh_label != NULL)
-					found_p = true;
-				else {
-					fail_p = true;
-					break;
-				}
-			}
-		}
-	}
-
-done:
-
 	if (fail_p || !found_p) {
 		if (IS_ZEBRA_DEBUG_PW)
 			zlog_debug("%s: unlabeled route for %s",
@@ -360,28 +338,9 @@ static int zebra_pw_check_reachability(const struct zebra_pw *pw)
 	if (found_p)
 		return 0;
 
-	nhg = rib_get_fib_backup_nhg(re);
-	if (nhg && nhg->nexthop) {
-		for (ALL_NEXTHOPS_PTR(nhg, nexthop)) {
-			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
-				continue;
-
-			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE) &&
-			    nexthop->nh_label != NULL) {
-				found_p = true;
-				break;
-			}
-		}
-	}
-
-	if (!found_p) {
-		if (IS_ZEBRA_DEBUG_PW)
-			zlog_debug("%s: unlabeled route for %s",
-				   __func__, pw->ifname);
-		return -1;
-	}
-
-	return 0;
+	if (IS_ZEBRA_DEBUG_PW)
+		zlog_debug("%s: unlabeled route for %s", __func__, pw->ifname);
+	return -1;
 }
 
 static int zebra_pw_client_close(struct zserv *client)
@@ -672,23 +631,6 @@ static void vty_show_mpls_pseudowire_detail(struct vty *vty)
 				vty_out(vty, "  Next Hop label: %s\n",
 					"-");
 		}
-
-		/* Include any installed backups */
-		nhg = rib_get_fib_backup_nhg(re);
-		if (nhg == NULL)
-			continue;
-
-		for (ALL_NEXTHOPS_PTR(nhg, nexthop)) {
-			snprintfrr(buf_nh, sizeof(buf_nh), "%pNHv",
-				   nexthop);
-			vty_out(vty, "  Next Hop: %s\n", buf_nh);
-			if (nexthop->nh_label)
-				vty_out(vty, "  Next Hop label: %u\n",
-					nexthop->nh_label->label[0]);
-			else
-				vty_out(vty, "  Next Hop label: %s\n",
-					"-");
-		}
 	}
 }
 
@@ -750,26 +692,6 @@ static void vty_show_mpls_pseudowire(struct zebra_pw *pw, json_object *json_pws)
 		json_object_array_add(json_nexthops, json_nexthop);
 	}
 
-	/* Include installed backup nexthops also */
-	nhg = rib_get_fib_backup_nhg(re);
-	if (nhg == NULL)
-		goto done;
-
-	for (ALL_NEXTHOPS_PTR(nhg, nexthop)) {
-		json_nexthop = json_object_new_object();
-		snprintfrr(buf_nh, sizeof(buf_nh), "%pNHv", nexthop);
-		json_object_string_add(json_nexthop, "nexthop", buf_nh);
-		if (nexthop->nh_label)
-			json_object_int_add(
-				json_nexthop, "nhLabel",
-				nexthop->nh_label->label[0]);
-		else
-			json_object_string_add(json_nexthop, "nhLabel",
-					       "-");
-
-		json_object_array_add(json_nexthops, json_nexthop);
-	}
-
 done:
 
 	json_object_object_add(json_pw, "nexthops", json_nexthops);