zebra: change fpm_read to batch the messages

Make code changes in fpm_read to create a list of ctx and send it to
zebra for processing rather than sending individual ctx

Signed-off-by: Krishnasamy <krishnasamyr@nvidia.com>

diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c
index 9f26852d1f5bb5ff9af96b0b7602f06c7c3f077b..116a697de9e90d735bf56371365415931c812b4b 100644 (file)
--- a/zebra/dplane_fpm_nl.c
+++ b/zebra/dplane_fpm_nl.c
@@ -587,6 +587,10 @@ static void fpm_read(struct event *t)
        struct zebra_dplane_ctx *ctx;
        size_t available_bytes;
        size_t hdr_available_bytes;
+       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,
@@ -627,7 +631,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);
@@ -642,7 +646,7 @@ static void fpm_read(struct event *t)
                                __func__, fpm.version, fpm.msg_type);
 
                        FPM_RECONNECT(fnc);
-                       return;
+                       goto send_batch;
                }
 
                /*
@@ -654,7 +658,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;
                }
 
                /*
@@ -665,7 +669,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;
@@ -715,8 +719,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,
@@ -735,7 +740,8 @@ static void fpm_read(struct event *t)
                                 * tableid to 0 in order for this to work.
                                 */
                                dplane_ctx_set_vrf(ctx, VRF_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
@@ -755,6 +761,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)

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 4344a8d79aed8c580ab04dcc62c975198937b78f..a6d43daa937be65ca0bb7158e682df326ab9e391 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -6589,6 +6589,14 @@ int dplane_provider_work_ready(void)
        return AOK;
 }
 
+/*
+ * Enqueue a context list to zebra main.
+ */
+void dplane_provider_enqueue_ctx_list_to_zebra(struct dplane_ctx_list_head *batch_list)
+{
+       (zdplane_info.dg_results_cb)(batch_list);
+}
+
 /*
  * Enqueue a context directly to zebra main.
  */

diff --git a/zebra/zebra_dplane.h b/zebra/zebra_dplane.h
index cabc70c2320022c4fe15b0ded951b9813cc7217d..1c03a29534d5ee5e7bf5cd5fbe594a6c52269b52 100644 (file)
--- a/zebra/zebra_dplane.h
+++ b/zebra/zebra_dplane.h
@@ -1236,6 +1236,9 @@ void dplane_provider_enqueue_out_ctx(struct zebra_dplane_provider *prov,
 /* Enqueue a context directly to zebra main. */
 void dplane_provider_enqueue_to_zebra(struct zebra_dplane_ctx *ctx);
 
+/* Enqueue a context list to zebra main. */
+void dplane_provider_enqueue_ctx_list_to_zebra(struct dplane_ctx_list_head *batch_list);
+
 /* Enable collection of extra info about interfaces in route updates;
  * this allows a provider/plugin to see some extra info in route update
  * context objects.