diff mbox series

[ovs-dev,1/1] netdev-offload-dpdk: Fix GRE without a key match

Message ID 20231031143050.122031-1-salems@nvidia.com
State Superseded
Headers show
Series [ovs-dev,1/1] netdev-offload-dpdk: Fix GRE without a key match | expand

Checks

Context Check Description
ovsrobot/apply-robot fail apply and check: fail
ovsrobot/intel-ovs-compilation fail test: fail

Commit Message

Salem Sol Oct. 31, 2023, 2:30 p.m. UTC 
In case there is no match on GRE key, avoid adding the key match item.

Fixes: 7617d0583c73 ("netdev-offload-dpdk: Add support for matching on gre fields.")
Signed-off-by: Salem Sol <salems@nvidia.com>
---
 lib/netdev-offload-dpdk.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
index 9504c906c..c6db11890 100644
--- a/lib/netdev-offload-dpdk.c
+++ b/lib/netdev-offload-dpdk.c
@@ -3136,16 +3136,18 @@  parse_gre_match(struct flow_patterns *patterns,
         greh_spec->k = !!(match->flow.tunnel.flags & FLOW_TNL_F_KEY);
         greh_mask->k = 1;
 
-        key_spec = per_thread_xzalloc(sizeof *key_spec);
-        key_mask = per_thread_xzalloc(sizeof *key_mask);
+        if (greh_spec->k) {
+            key_spec = per_thread_xzalloc(sizeof *key_spec);
+            key_mask = per_thread_xzalloc(sizeof *key_mask);
 
-        *key_spec = htonl(ntohll(match->flow.tunnel.tun_id));
-        *key_mask = htonl(ntohll(match->wc.masks.tunnel.tun_id));
+            *key_spec = htonl(ntohll(match->flow.tunnel.tun_id));
+            *key_mask = htonl(ntohll(match->wc.masks.tunnel.tun_id));
 
+            add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_GRE_KEY, key_spec,
+                             key_mask, NULL);
+        }
         consumed_masks->tunnel.tun_id = 0;
         consumed_masks->tunnel.flags &= ~FLOW_TNL_F_KEY;
-        add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_GRE_KEY, key_spec,
-                         key_mask, NULL);
     }
 
     consumed_masks->tunnel.flags &= ~FLOW_TNL_F_DONT_FRAGMENT;