lib: Fixed pipeline len for logical flows.

Logical pipeline length was correctly calculated only for ingress. Calculation for egress was added. Signed-off-by: Alexandra Rukomoinikova <arukomoinikova@k2.cloud> Signed-off-by: 0-day Robot <robot@bytheb.org>
ovsrobot · Jan 10, 2025 · a033bf5 · a033bf5
1 parent c9361e6
commit a033bf5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/controller/lflow.c b/controller/lflow.c
@@ -331,8 +331,10 @@ lflow_parse_actions(const struct sbrec_logical_flow *lflow,
         .nd_ra_opts = l_ctx_in->nd_ra_opts,
         .controller_event_opts = l_ctx_in->controller_event_opts,
 
-        .pipeline = ingress ? OVNACT_P_INGRESS : OVNACT_P_EGRESS,
-        .n_tables = LOG_PIPELINE_LEN,
+        .pipeline = ingress ? OVNACT_P_INGRESS
+                            : OVNACT_P_EGRESS,
+        .n_tables = ingress ? LOG_PIPELINE_INGRESS_LEN
+                            : LOG_PIPELINE_EGRESS_LEN,
         .cur_ltable = lflow->table_id,
     };
 

diff --git a/lib/actions.c b/lib/actions.c
@@ -362,7 +362,10 @@ parse_NEXT(struct action_context *ctx)
         }
     }
 
-    if (table >= ctx->pp->n_tables) {
+    if ((pipeline == OVNACT_P_INGRESS
+        && table >= LOG_PIPELINE_INGRESS_LEN) ||
+        (pipeline == OVNACT_P_EGRESS
+        && table >= LOG_PIPELINE_EGRESS_LEN)) {
         lexer_error(ctx->lexer,
                     "\"next\" action cannot advance beyond table %d.",
                     ctx->pp->n_tables - 1);

diff --git a/lib/ovn-util.h b/lib/ovn-util.h
@@ -310,7 +310,8 @@ BUILD_ASSERT_DECL(
 #define SCTP_ABORT_CHUNK_FLAG_T (1 << 0)
 
 /* The number of tables for the ingress and egress pipelines. */
-#define LOG_PIPELINE_LEN 30
+#define LOG_PIPELINE_INGRESS_LEN 31
+#define LOG_PIPELINE_EGRESS_LEN 19
 
 static inline uint32_t
 hash_add_in6_addr(uint32_t hash, const struct in6_addr *addr)

diff --git a/tests/ovn.at b/tests/ovn.at
@@ -830,8 +830,8 @@ next();
     Syntax error at `)' expecting "pipeline" or "table".
 next(10;
     Syntax error at `;' expecting `)'.
-next(24);
-    "next" action cannot advance beyond table 23.
+next(31);
+    "next" action cannot advance beyond table 30.
 
 next(table=lflow_table);
     formats as next;

diff --git a/tests/test-ovn.c b/tests/test-ovn.c
@@ -1341,7 +1341,8 @@ test_parse_actions(struct ovs_cmdl_context *ctx OVS_UNUSED)
             .dhcpv6_opts = &dhcpv6_opts,
             .nd_ra_opts = &nd_ra_opts,
             .controller_event_opts = &event_opts,
-            .n_tables = 24,
+            .pipeline = OVNACT_P_INGRESS,
+            .n_tables = 31,
             .cur_ltable = 10,
         };
 

diff --git a/utilities/ovn-trace.c b/utilities/ovn-trace.c
@@ -990,16 +990,17 @@ parse_lflow_for_datapath(const struct sbrec_logical_flow *sblf,
             return;
         }
 
+        bool ingress = !strcmp(sblf->pipeline, "ingress");
         struct ovnact_parse_params pp = {
             .symtab = &symtab,
             .dhcp_opts = &dhcp_opts,
             .dhcpv6_opts = &dhcpv6_opts,
             .nd_ra_opts = &nd_ra_opts,
             .controller_event_opts = &event_opts,
-            .pipeline = (!strcmp(sblf->pipeline, "ingress")
-                         ? OVNACT_P_INGRESS
-                         : OVNACT_P_EGRESS),
-            .n_tables = LOG_PIPELINE_LEN,
+            .pipeline = ingress ? OVNACT_P_INGRESS
+                                : OVNACT_P_EGRESS,
+            .n_tables = ingress ? LOG_PIPELINE_INGRESS_LEN
+                                : LOG_PIPELINE_EGRESS_LEN,
             .cur_ltable = sblf->table_id,
         };
         uint64_t stub[1024 / 8];