Bgp nexthop group optimisations

bgpd/bgp_debug.c

@@ -60,6 +60,7 @@ unsigned long conf_bgp_debug_graceful_restart;
 unsigned long conf_bgp_debug_evpn_mh;
 unsigned long conf_bgp_debug_bfd;
 unsigned long conf_bgp_debug_cond_adv;
+unsigned long conf_bgp_debug_nexthop_group;
 
 unsigned long term_bgp_debug_as4;
 unsigned long term_bgp_debug_neighbor_events;
@@ -80,6 +81,7 @@ unsigned long term_bgp_debug_graceful_restart;
 unsigned long term_bgp_debug_evpn_mh;
 unsigned long term_bgp_debug_bfd;
 unsigned long term_bgp_debug_cond_adv;
+unsigned long term_bgp_debug_nexthop_group;
 
 struct list *bgp_debug_neighbor_events_peers = NULL;
 struct list *bgp_debug_keepalive_peers = NULL;
@@ -2040,6 +2042,40 @@ DEFPY (debug_bgp_evpn_mh,
 	return CMD_SUCCESS;
 }
 
+DEFPY (debug_bgp_nexthop_group,
+       debug_bgp_nexthop_group_cmd,
+       "[no$no] debug bgp nexthop-group [detail$detail]",
+       NO_STR
+       DEBUG_STR
+       BGP_STR
+       "Nexthop Group debugging\n"
+       "Detailed Nexthop Group debugging\n")
+{
+	if (vty->node == CONFIG_NODE) {
+		if (no) {
+			DEBUG_OFF(nexthop_group, NEXTHOP_GROUP);
+			DEBUG_OFF(nexthop_group, NEXTHOP_GROUP_DETAIL);
+		} else {
+			DEBUG_ON(nexthop_group, NEXTHOP_GROUP);
+			if (detail)
+				DEBUG_ON(nexthop_group, NEXTHOP_GROUP_DETAIL);
+		}
+	} else {
+		if (no) {
+			TERM_DEBUG_OFF(nexthop_group, NEXTHOP_GROUP);
+			TERM_DEBUG_OFF(nexthop_group, NEXTHOP_GROUP_DETAIL);
+			vty_out(vty, "BGP nexthop group debugging is off\n");
+		} else {
+			TERM_DEBUG_ON(nexthop_group, NEXTHOP_GROUP);
+			if (detail)
+				TERM_DEBUG_ON(nexthop_group, NEXTHOP_GROUP_DETAIL);
+			vty_out(vty, "BGP nexthop group %sdebugging is on\n",
+				detail ? "detailed " : "");
+		}
+	}
+	return CMD_SUCCESS;
+}
+
 DEFUN (debug_bgp_labelpool,
        debug_bgp_labelpool_cmd,
        "debug bgp labelpool",
@@ -2177,6 +2213,8 @@ DEFUN (no_debug_bgp,
 	TERM_DEBUG_OFF(evpn_mh, EVPN_MH_RT);
 	TERM_DEBUG_OFF(bfd, BFD_LIB);
 	TERM_DEBUG_OFF(cond_adv, COND_ADV);
+	TERM_DEBUG_OFF(nexthop_group, NEXTHOP_GROUP);
+	TERM_DEBUG_OFF(nexthop_group, NEXTHOP_GROUP_DETAIL);
 
 	vty_out(vty, "All possible debugging has been turned off\n");
 
@@ -2270,6 +2308,11 @@ DEFUN_NOSH (show_debugging_bgp,
 		vty_out(vty,
 			"  BGP conditional advertisement debugging is on\n");
 
+	if (BGP_DEBUG(nexthop_group, NEXTHOP_GROUP_DETAIL))
+		vty_out(vty, "  BGP nexthop group detailed debugging is on\n");
+	else if (BGP_DEBUG(nexthop_group, NEXTHOP_GROUP))
+		vty_out(vty, "  BGP nexthop group debugging is on\n");
+
 	cmd_show_lib_debugs(vty);
 
 	hook_call(bgp_hook_config_write_debug, vty, false);
@@ -2408,6 +2451,14 @@ static int bgp_config_write_debug(struct vty *vty)
 		write++;
 	}
 
+	if (CONF_BGP_DEBUG(nexthop_group, NEXTHOP_GROUP_DETAIL)) {
+		vty_out(vty, "debug bgp nexthop-group detail\n");
+		write++;
+	} else if (CONF_BGP_DEBUG(nexthop_group, NEXTHOP_GROUP)) {
+		vty_out(vty, "debug bgp nexthop-group\n");
+		write++;
+	}
+
 	if (hook_call(bgp_hook_config_write_debug, vty, true))
 		write++;
 
@@ -2545,6 +2596,10 @@ void bgp_debug_init(void)
 	/* debug bgp conditional advertisement */
 	install_element(ENABLE_NODE, &debug_bgp_cond_adv_cmd);
 	install_element(CONFIG_NODE, &debug_bgp_cond_adv_cmd);
+
+	/* debug bgp nexthop group [detail] */
+	install_element(ENABLE_NODE, &debug_bgp_nexthop_group_cmd);
+	install_element(CONFIG_NODE, &debug_bgp_nexthop_group_cmd);
 }
 
 /* Return true if this prefix is on the per_prefix_list of prefixes to debug

bgpd/bgp_debug.h

@@ -71,6 +71,7 @@ extern unsigned long conf_bgp_debug_graceful_restart;
 extern unsigned long conf_bgp_debug_evpn_mh;
 extern unsigned long conf_bgp_debug_bfd;
 extern unsigned long conf_bgp_debug_cond_adv;
+extern unsigned long conf_bgp_debug_nexthop_group;
 
 extern unsigned long term_bgp_debug_as4;
 extern unsigned long term_bgp_debug_neighbor_events;
@@ -89,6 +90,7 @@ extern unsigned long term_bgp_debug_graceful_restart;
 extern unsigned long term_bgp_debug_evpn_mh;
 extern unsigned long term_bgp_debug_bfd;
 extern unsigned long term_bgp_debug_cond_adv;
+extern unsigned long term_bgp_debug_nexthop_group;
 
 extern struct list *bgp_debug_neighbor_events_peers;
 extern struct list *bgp_debug_keepalive_peers;
@@ -130,6 +132,8 @@ struct bgp_debug_filter {
 #define BGP_DEBUG_PBR_ERROR           0x02
 #define BGP_DEBUG_EVPN_MH_ES          0x01
 #define BGP_DEBUG_EVPN_MH_RT          0x02
+#define BGP_DEBUG_NEXTHOP_GROUP	       0x01
+#define BGP_DEBUG_NEXTHOP_GROUP_DETAIL 0x02
 
 #define BGP_DEBUG_GRACEFUL_RESTART     0x01
 

bgpd/bgp_fsm.c

@@ -42,6 +42,7 @@
 #include "bgpd/bgp_io.h"
 #include "bgpd/bgp_zebra.h"
 #include "bgpd/bgp_vty.h"
+#include "bgpd/bgp_nhg.h"
 
 DEFINE_HOOK(peer_backward_transition, (struct peer * peer), (peer));
 DEFINE_HOOK(peer_status_changed, (struct peer * peer), (peer));
@@ -1242,6 +1243,12 @@ void bgp_fsm_change_status(struct peer_connection *connection,
 	if (status >= Clearing && (peer->established || peer == bgp->peer_self)) {
 		bgp_clear_route_all(peer);
 
+		/* do not wait the clear-node thread to be called. otherwise,
+		 * the updated paths may be processed before.
+		 */
+		if (bgp_option_check(BGP_OPT_NHG))
+			bgp_nhg_clear_nhg_nexthop();
+
 		/* If no route was queued for the clear-node processing,
 		 * generate the
 		 * completion event here. This is needed because if there are no

bgpd/bgp_main.c

@@ -522,6 +522,7 @@ int main(int argc, char **argv)
 	if (bgpd_di.graceful_restart)
 		SET_FLAG(bm->flags, BM_FLAG_GRACEFUL_RESTART);
 
+	bgp_nhg_configure_default();
 	bgp_error_init();
 	/* Initializations. */
 	libagentx_init();

bgpd/bgp_memory.c

@@ -86,6 +86,7 @@ DEFINE_MTYPE(BGPD, BGP_DEBUG_STR, "BGP debug filter string");
 
 DEFINE_MTYPE(BGPD, BGP_DISTANCE, "BGP distance");
 DEFINE_MTYPE(BGPD, BGP_NEXTHOP_CACHE, "BGP nexthop");
+DEFINE_MTYPE(BGPD, BGP_NHG_CACHE, "BGP NHG");
 DEFINE_MTYPE(BGPD, BGP_CONFED_LIST, "BGP confed list");
 DEFINE_MTYPE(BGPD, PEER_UPDATE_SOURCE, "BGP peer update interface");
 DEFINE_MTYPE(BGPD, PEER_CONF_IF, "BGP peer config interface");

bgpd/bgp_memory.h

@@ -82,6 +82,7 @@ DECLARE_MTYPE(BGP_DEBUG_STR);
 
 DECLARE_MTYPE(BGP_DISTANCE);
 DECLARE_MTYPE(BGP_NEXTHOP_CACHE);
+DECLARE_MTYPE(BGP_NHG_CACHE);
 DECLARE_MTYPE(BGP_CONFED_LIST);
 DECLARE_MTYPE(PEER_UPDATE_SOURCE);
 DECLARE_MTYPE(PEER_CONF_IF);

bgpd/bgp_nexthop.c

@@ -729,61 +729,11 @@ bool bgp_subgrp_multiaccess_check_v4(struct in_addr nexthop,
 	return false;
 }
 
-static void bgp_show_bgp_path_info_flags(uint32_t flags, json_object *json)
-{
-	json_object *json_flags = NULL;
-
-	if (!json)
-		return;
-
-	json_flags = json_object_new_object();
-	json_object_boolean_add(json_flags, "igpChanged",
-				CHECK_FLAG(flags, BGP_PATH_IGP_CHANGED));
-	json_object_boolean_add(json_flags, "damped",
-				CHECK_FLAG(flags, BGP_PATH_DAMPED));
-	json_object_boolean_add(json_flags, "history",
-				CHECK_FLAG(flags, BGP_PATH_HISTORY));
-	json_object_boolean_add(json_flags, "bestpath",
-				CHECK_FLAG(flags, BGP_PATH_SELECTED));
-	json_object_boolean_add(json_flags, "valid",
-				CHECK_FLAG(flags, BGP_PATH_VALID));
-	json_object_boolean_add(json_flags, "attrChanged",
-				CHECK_FLAG(flags, BGP_PATH_ATTR_CHANGED));
-	json_object_boolean_add(json_flags, "deterministicMedCheck",
-				CHECK_FLAG(flags, BGP_PATH_DMED_CHECK));
-	json_object_boolean_add(json_flags, "deterministicMedSelected",
-				CHECK_FLAG(flags, BGP_PATH_DMED_SELECTED));
-	json_object_boolean_add(json_flags, "stale",
-				CHECK_FLAG(flags, BGP_PATH_STALE));
-	json_object_boolean_add(json_flags, "removed",
-				CHECK_FLAG(flags, BGP_PATH_REMOVED));
-	json_object_boolean_add(json_flags, "counted",
-				CHECK_FLAG(flags, BGP_PATH_COUNTED));
-	json_object_boolean_add(json_flags, "multipath",
-				CHECK_FLAG(flags, BGP_PATH_MULTIPATH));
-	json_object_boolean_add(json_flags, "multipathChanged",
-				CHECK_FLAG(flags, BGP_PATH_MULTIPATH_CHG));
-	json_object_boolean_add(json_flags, "ribAttributeChanged",
-				CHECK_FLAG(flags, BGP_PATH_RIB_ATTR_CHG));
-	json_object_boolean_add(json_flags, "nexthopSelf",
-				CHECK_FLAG(flags, BGP_PATH_ANNC_NH_SELF));
-	json_object_boolean_add(json_flags, "linkBandwidthChanged",
-				CHECK_FLAG(flags, BGP_PATH_LINK_BW_CHG));
-	json_object_boolean_add(json_flags, "acceptOwn",
-				CHECK_FLAG(flags, BGP_PATH_ACCEPT_OWN));
-	json_object_object_add(json, "flags", json_flags);
-}
-
 static void bgp_show_nexthop_paths(struct vty *vty, struct bgp *bgp,
 				   struct bgp_nexthop_cache *bnc,
 				   json_object *json)
 {
-	struct bgp_dest *dest;
 	struct bgp_path_info *path;
-	afi_t afi;
-	safi_t safi;
-	struct bgp_table *table;
-	struct bgp *bgp_path;
 	json_object *paths = NULL;
 	json_object *json_path = NULL;
 
@@ -792,44 +742,11 @@ static void bgp_show_nexthop_paths(struct vty *vty, struct bgp *bgp,
 	else
 		vty_out(vty, "  Paths:\n");
 	LIST_FOREACH (path, &(bnc->paths), nh_thread) {
-		dest = path->net;
-		assert(dest && bgp_dest_table(dest));
-		afi = family2afi(bgp_dest_get_prefix(dest)->family);
-		table = bgp_dest_table(dest);
-		safi = table->safi;
-		bgp_path = table->bgp;
-
-
-		if (json) {
+		if (json)
 			json_path = json_object_new_object();
-			json_object_string_add(json_path, "afi", afi2str(afi));
-			json_object_string_add(json_path, "safi",
-					       safi2str(safi));
-			json_object_string_addf(json_path, "prefix", "%pBD",
-						dest);
-			if (dest->pdest)
-				json_object_string_addf(
-					json_path, "rd",
-					BGP_RD_AS_FORMAT(bgp->asnotation),
-					(struct prefix_rd *)bgp_dest_get_prefix(
-						dest->pdest));
-			json_object_string_add(
-				json_path, "vrf",
-				vrf_id_to_name(bgp_path->vrf_id));
-			bgp_show_bgp_path_info_flags(path->flags, json_path);
+		bgp_path_info_display(path, vty, json_path);
+		if (json)
 			json_object_array_add(paths, json_path);
-			continue;
-		}
-		if (dest->pdest) {
-			vty_out(vty, "    %d/%d %pBD RD ", afi, safi, dest);
-			vty_out(vty, BGP_RD_AS_FORMAT(bgp->asnotation),
-				(struct prefix_rd *)bgp_dest_get_prefix(
-					dest->pdest));
-			vty_out(vty, " %s flags 0x%x\n", bgp_path->name_pretty,
-				path->flags);
-		} else
-			vty_out(vty, "    %d/%d %pBD %s flags 0x%x\n",
-				afi, safi, dest, bgp_path->name_pretty, path->flags);
 	}
 	if (json)
 		json_object_object_add(json, "paths", paths);