sonic-net
diff --git a/‎.gitmodules‎
Lines changed: 1 addition & 1 deletion b/‎.gitmodules‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎rules/frr.mk‎
Lines changed: 3 additions & 3 deletions b/‎rules/frr.mk‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/sonic-frr/dplane_fpm_sonic/dplane_fpm_sonic.c‎
Lines changed: 48 additions & 22 deletions b/‎src/sonic-frr/dplane_fpm_sonic/dplane_fpm_sonic.c‎
Lines changed: 48 additions & 22 deletions
diff --git a/‎src/sonic-frr/frr‎ b/‎src/sonic-frr/frr‎
diff --git a/‎…rity-of-Vty-connected-from-message.patch‎ ‎…rity-of-Vty-connected-from-message.patch‎src/sonic-frr/patch/0001-Reduce-severity-of-Vty-connected-from-message.patch renamed to src/sonic-frr/patch/0001-SONiC-ONLY-Reduce-severity-of-Vty-connected-from-message.patch
Lines changed: 7 additions & 8 deletions b/‎…rity-of-Vty-connected-from-message.patch‎ ‎…rity-of-Vty-connected-from-message.patch‎src/sonic-frr/patch/0001-Reduce-severity-of-Vty-connected-from-message.patch renamed to src/sonic-frr/patch/0001-SONiC-ONLY-Reduce-severity-of-Vty-connected-from-message.patch
Lines changed: 7 additions & 8 deletions
diff --git a/‎…T_HOP-to-be-0.0.0.0-due-to-allevia.patch‎ ‎…T_HOP-to-be-0.0.0.0-due-to-allevia.patch‎src/sonic-frr/patch/0002-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch renamed to src/sonic-frr/patch/0002-SONiC-ONLY-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
Lines changed: 7 additions & 8 deletions b/‎…T_HOP-to-be-0.0.0.0-due-to-allevia.patch‎ ‎…T_HOP-to-be-0.0.0.0-due-to-allevia.patch‎src/sonic-frr/patch/0002-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch renamed to src/sonic-frr/patch/0002-SONiC-ONLY-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
Lines changed: 7 additions & 8 deletions
diff --git a/‎…xthops-compare-vrf-only-if-ip-type.patch‎ ‎…xthops-compare-vrf-only-if-ip-type.patch‎src/sonic-frr/patch/0003-nexthops-compare-vrf-only-if-ip-type.patch renamed to src/sonic-frr/patch/0003-SONiC-ONLY-nexthops-compare-vrf-only-if-ip-type.patch
Lines changed: 12 additions & 12 deletions b/‎…xthops-compare-vrf-only-if-ip-type.patch‎ ‎…xthops-compare-vrf-only-if-ip-type.patch‎src/sonic-frr/patch/0003-nexthops-compare-vrf-only-if-ip-type.patch renamed to src/sonic-frr/patch/0003-SONiC-ONLY-nexthops-compare-vrf-only-if-ip-type.patch
Lines changed: 12 additions & 12 deletions
@@ -46,7 +46,7 @@
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/sonic-net/sonic-frr.git
-	branch = frr-10.3
+	branch = frr-10.4.1
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
 	url = https://github.com/p4lang/p4-hlir.git
 
@@ -1,9 +1,9 @@
 # FRRouting (frr) package
 
-FRR_VERSION = 10.3
+FRR_VERSION = 10.4.1
 FRR_SUBVERSION = 0
-FRR_BRANCH = frr-10.3
-FRR_TAG = frr-10.3
+FRR_BRANCH = frr-10.4.1
+FRR_TAG = frr-10.4.1
 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG
 
 
 
@@ -671,8 +671,8 @@ static void fpm_reconnect(struct fpm_nl_ctx *fnc)
 
 	stream_reset(fnc->ibuf);
 	stream_reset(fnc->obuf);
-	EVENT_OFF(fnc->t_read);
-	EVENT_OFF(fnc->t_write);
+	event_cancel(&fnc->t_read);
+	event_cancel(&fnc->t_write);
 
 	/* Reset the barrier value */
 	cleaning_p = true;
@@ -699,6 +699,10 @@ static void fpm_read(struct event *t)
 	size_t available_bytes;
 	size_t hdr_available_bytes;
 	int ival;
+	struct dplane_ctx_list_head batch_list;
+
+	/* Initialize the batch list */
+	dplane_ctx_q_init(&batch_list);
 
 	/* Let's ignore the input at the moment. */
 	rv = stream_read_try(fnc->ibuf, fnc->socket,
@@ -739,7 +743,7 @@ static void fpm_read(struct event *t)
 	while (available_bytes) {
 		if (available_bytes < (ssize_t)FPM_MSG_HDR_LEN) {
 			stream_pulldown(fnc->ibuf);
-			return;
+			goto send_batch;
 		}
 
 		fpm.version = stream_getc(fnc->ibuf);
@@ -754,7 +758,7 @@ static void fpm_read(struct event *t)
 				__func__, fpm.version, fpm.msg_type);
 
 			FPM_RECONNECT(fnc);
-			return;
+			goto send_batch;
 		}
 
 		/*
@@ -766,7 +770,7 @@ static void fpm_read(struct event *t)
 				"%s: Received message length: %u that does not even fill the FPM header",
 				__func__, fpm.msg_len);
 			FPM_RECONNECT(fnc);
-			return;
+			goto send_batch;
 		}
 
 		/*
@@ -777,7 +781,7 @@ static void fpm_read(struct event *t)
 		if (fpm.msg_len > available_bytes) {
 			stream_rewind_getp(fnc->ibuf, FPM_MSG_HDR_LEN);
 			stream_pulldown(fnc->ibuf);
-			return;
+			goto send_batch;
 		}
 
 		available_bytes -= FPM_MSG_HDR_LEN;
@@ -827,8 +831,9 @@ static void fpm_read(struct event *t)
 				break;
 			}
 
-			/* Parse the route data into a dplane ctx, then
- 			 * enqueue it to zebra for processing.
+			/*
+			 * Parse the route data into a dplane ctx, add to ctx list
+ 			 * and enqueue the batch of ctx to zebra for processing.
  			 */
 			ctx = dplane_ctx_alloc();
 			dplane_ctx_route_init(ctx, DPLANE_OP_ROUTE_NOTIFY, NULL,
@@ -840,8 +845,9 @@ static void fpm_read(struct event *t)
 				dplane_ctx_set_vrf(ctx, ival);
 				dplane_ctx_set_table(ctx,
 								ZEBRA_ROUTE_TABLE_UNKNOWN);
-	
-					dplane_provider_enqueue_to_zebra(ctx);
+
+				/* Add to the list for batching */
+				dplane_ctx_enqueue_tail(&batch_list, ctx);
 			} else {
 				/*
 				 * Let's continue to read other messages
@@ -861,6 +867,15 @@ static void fpm_read(struct event *t)
 	}
 
 	stream_reset(fnc->ibuf);
+
+send_batch:
+	/* Send all contexts to zebra in a single batch if we have any */
+	if (dplane_ctx_queue_count(&batch_list) > 0) {
+		if (IS_ZEBRA_DEBUG_FPM)
+			zlog_debug("%s: Sending batch of %u contexts to zebra", __func__,
+				   dplane_ctx_queue_count(&batch_list));
+		dplane_provider_enqueue_ctx_list_to_zebra(&batch_list);
+	}
 }
 
 static void fpm_write(struct event *t)
@@ -2494,6 +2509,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 				zlog_err(
 					"%s: netlink_srv6_msg_encode failed",
 					__func__);
+				dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 				return 0;
 			}
 		} else {
@@ -2504,6 +2520,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 				zlog_err(
 					"%s: netlink_route_multipath_msg_encode failed",
 					__func__);
+				dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 				return 0;
 			}
 		}
@@ -2524,6 +2541,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 				zlog_err(
 					"%s: netlink_srv6_msg_encode failed",
 					__func__);
+				dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 				return 0;
 			}
 		} else {
@@ -2535,6 +2553,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 				zlog_err(
 					"%s: netlink_route_multipath_msg_encode failed",
 					__func__);
+				dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 				return 0;
 			}
 		}
@@ -2549,6 +2568,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 		if (rv <= 0) {
 			zlog_err("%s: netlink_macfdb_update_ctx failed",
 				 __func__);
+			dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 			return 0;
 		}
 
@@ -2561,6 +2581,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 		if (rv <= 0) {
 			zlog_err("%s: netlink_nexthop_msg_encode failed",
 				 __func__);
+			dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 			return 0;
 		}
 
@@ -2573,6 +2594,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 		if (rv <= 0) {
 			zlog_err("%s: netlink_nexthop_msg_encode failed",
 				 __func__);
+			dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 			return 0;
 		}
 
@@ -2585,6 +2607,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 			zlog_err(
 				"%s: netlink_srv6_msg_encode failed",
 				__func__);
+			dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 			return 0;
 		}
 		nl_buf_len += (size_t)rv;
@@ -2597,6 +2620,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 			zlog_err(
 				"%s: netlink_srv6_msg_encode failed",
 				__func__);
+			dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 			return 0;
 		}
 		nl_buf_len += (size_t)rv;
@@ -2608,6 +2632,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 		if (rv <= 0) {
 			zlog_err("%s: netlink_nexthop_msg_encode failed",
 				 __func__);
+			dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 			return 0;
 		}
 
@@ -2620,6 +2645,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 		if (rv <= 0) {
 			zlog_err("%s: netlink_pic_context_msg_encode failed",
 				 __func__);
+			dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 			return 0;
 		}
 
@@ -2632,6 +2658,7 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
 		if (rv <= 0) {
 			zlog_err("%s: netlink_lsp_msg_encoder failed",
 				 __func__);
+			dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_FAILURE);
 			return 0;
 		}
 
@@ -3135,7 +3162,6 @@ static void fpm_process_queue(struct event *t)
 		/* Account the processed entries. */
 		processed_contexts++;
 
-		dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_SUCCESS);
 		dplane_provider_enqueue_out_ctx(fnc->prov, ctx);
 	}
 
@@ -3154,7 +3180,7 @@ static void fpm_process_queue(struct event *t)
 		event_add_timer(fnc->fthread->master, fpm_process_wedged, fnc,
 				DPLANE_FPM_NL_WEDGIE_TIME, &fnc->t_wedged);
 	} else
-		EVENT_OFF(fnc->t_wedged);
+		event_cancel(&fnc->t_wedged);
 
 	/*
 	 * Let the dataplane thread know if there are items in the
@@ -3267,16 +3293,16 @@ static int fpm_nl_finish_early(struct fpm_nl_ctx *fnc)
 		return 0;
 
 	/* Disable all events and close socket. */
-	EVENT_OFF(fnc->t_lspreset);
-	EVENT_OFF(fnc->t_lspwalk);
-	EVENT_OFF(fnc->t_nhgreset);
-	EVENT_OFF(fnc->t_nhgwalk);
-	EVENT_OFF(fnc->t_ribreset);
-	EVENT_OFF(fnc->t_ribwalk);
-	EVENT_OFF(fnc->t_rmacreset);
-	EVENT_OFF(fnc->t_rmacwalk);
-	EVENT_OFF(fnc->t_event);
-	EVENT_OFF(fnc->t_nhg);
+	event_cancel(&fnc->t_lspreset);
+	event_cancel(&fnc->t_lspwalk);
+	event_cancel(&fnc->t_nhgreset);
+	event_cancel(&fnc->t_nhgwalk);
+	event_cancel(&fnc->t_ribreset);
+	event_cancel(&fnc->t_ribwalk);
+	event_cancel(&fnc->t_rmacreset);
+	event_cancel(&fnc->t_rmacwalk);
+	event_cancel(&fnc->t_event);
+	event_cancel(&fnc->t_nhg);
 	event_cancel_async(fnc->fthread->master, &fnc->t_read, NULL);
 	event_cancel_async(fnc->fthread->master, &fnc->t_write, NULL);
 	event_cancel_async(fnc->fthread->master, &fnc->t_connect, NULL);
 
@@ -1,16 +1,18 @@
-From 69370e52e94c66e06052a7859dd059dfa34fd61e Mon Sep 17 00:00:00 2001
+[PATCH] From 15274a197e4d3b7ac0f11ca63a5274f1168739f5 Mon Sep 17
+
 From: Pavel Shirshov <[email protected]>
 Date: Mon, 16 Nov 2020 18:11:47 -0800
-Subject: [PATCH] From 15274a197e4d3b7ac0f11ca63a5274f1168739f5 Mon Sep 17
  00:00:00 2001 Subject: [PATCH 2/8] Reduce severity of 'Vty connected from'
  message
-
+---
+ lib/vty.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/vty.c b/lib/vty.c
-index 1d04e75bf..ecbbd73db 100644
+index 43ff964d8..fad2ff991 100644
 --- a/lib/vty.c
 +++ b/lib/vty.c
-@@ -1968,7 +1968,7 @@ static void vty_accept(struct event *thread)
+@@ -1959,7 +1959,7 @@ static void vty_accept(struct event *thread)
  		zlog_info("can't set sockopt to vty_sock : %s",
  			  safe_strerror(errno));
 
@@ -19,6 +21,3 @@ index 1d04e75bf..ecbbd73db 100644
 
  	vty_create(vty_sock, &su);
  }
--- 
-2.17.1
-
@@ -1,16 +1,18 @@
-From 44ed2b0d2a2ca6029238118603264e02e2e965f4 Mon Sep 17 00:00:00 2001
+[PATCH] From afff474c79e0c177e090d1b45d68c9f816a52e3e Mon Sep 17
+
 From: Pavel Shirshov <[email protected]>
 Date: Mon, 16 Nov 2020 18:33:46 -0800
-Subject: [PATCH] From afff474c79e0c177e090d1b45d68c9f816a52e3e Mon Sep 17
  00:00:00 2001 Subject: [PATCH 4/8] Allow BGP attr NEXT_HOP to be 0.0.0.0 due
  to  alleviate
-
+---
+ bgpd/bgp_route.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
-index 39172cc08..9d96a3e43 100644
+index aa6c701ca..a8427bc3b 100644
 --- a/bgpd/bgp_route.c
 +++ b/bgpd/bgp_route.c
-@@ -4719,8 +4719,7 @@ bool bgp_update_martian_nexthop(struct bgp *bgp, afi_t afi, safi_t safi,
+@@ -4786,8 +4786,7 @@ bool bgp_update_martian_nexthop(struct bgp *bgp, afi_t afi, safi_t safi,
  	 * E.g.: IPv6 prefix can be with nexthop: 0.0.0.0, and mp_nexthop: fc00::1.
  	 */
  	if (CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)))
@@ -20,6 +22,3 @@ index 39172cc08..9d96a3e43 100644
  			      bgp_nexthop_self(bgp, afi, type, stype, attr, dest));
 
  	/* If MP_NEXTHOP is present, validate it. */
--- 
-2.17.1
-
@@ -1,15 +1,18 @@
-From 2b778b1984c5f88500625a0e96a5ba1d1fe0316c Mon Sep 17 00:00:00 2001
+[PATCH] From 786087468520db44c55e3566f77438b41f52763f Mon Sep 17
+
 From: Pavel Shirshov <[email protected]>
 Date: Mon, 16 Nov 2020 18:35:01 -0800
-Subject: [PATCH] From 786087468520db44c55e3566f77438b41f52763f Mon Sep 17
  00:00:00 2001 Subject: [PATCH 5/8] nexthops compare vrf only if ip type
-
+---
+ lib/nexthop.c |   12 ++++++------
+ lib/zclient.c |   12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/lib/nexthop.c b/lib/nexthop.c
-index c377b9cb0..6fe45b2c5 100644
+index e8f5ecf17..9381b3a89 100644
 --- a/lib/nexthop.c
 +++ b/lib/nexthop.c
-@@ -143,12 +143,6 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
+@@ -149,12 +149,6 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
  {
  	int ret = 0;
 
@@ -22,7 +25,7 @@ index c377b9cb0..6fe45b2c5 100644
  	if (next1->type < next2->type)
  		return -1;
 
-@@ -166,6 +160,12 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
+@@ -172,6 +166,12 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
  	switch (next1->type) {
  	case NEXTHOP_TYPE_IPV4:
  	case NEXTHOP_TYPE_IPV6:
@@ -36,10 +39,10 @@ index c377b9cb0..6fe45b2c5 100644
  		if (ret != 0)
  			return ret;
 diff --git a/lib/zclient.c b/lib/zclient.c
-index 5deea8f0c..28e9da721 100644
+index 558626fa3..3ab7bc040 100644
 --- a/lib/zclient.c
 +++ b/lib/zclient.c
-@@ -976,12 +976,6 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
+@@ -982,12 +982,6 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
  {
  	int ret = 0;
 
@@ -52,7 +55,7 @@ index 5deea8f0c..28e9da721 100644
  	if (next1->type < next2->type)
  		return -1;
 
-@@ -997,6 +991,12 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
+@@ -1003,6 +997,12 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
  	switch (next1->type) {
  	case NEXTHOP_TYPE_IPV4:
  	case NEXTHOP_TYPE_IPV6:
@@ -65,6 +68,3 @@ index 5deea8f0c..28e9da721 100644
  		ret = nexthop_g_addr_cmp(next1->type, &next1->gate,
  					 &next2->gate);
  		if (ret != 0)
--- 
-2.17.1
-