Skip to contentSkip to conversation

ethdev: fix GENEVE option item conversion

PATCH Applied Michael Baum 2 participants 2 messages Jul 15, 2024 – Jul 19, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ethdev: fix GENEVE option item conversion

The "rte_flow_conv()" function, enables, among other things, to copy item list.

For GENEVE option item, the function copies it without considering deep copy. It copies the "data" pointer without copying the pointed values.

This patch adds deep copy for after regular copy.

Fixes 2b4c72b4d10d ("ethdev: introduce GENEVE header TLV option item")
---
 lib/ethdev/rte_flow.c | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)
lib/ethdev/rte_flow.c +25 -4
index ca2f85c3fa..4076ae4ee1 100644
@@ -623,6 +623,7 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
 	switch (item->type) {
 		union {
 			const struct rte_flow_item_raw *raw;
+			const struct rte_flow_item_geneve_opt *geneve_opt;
 		} spec;
 		union {
 			const struct rte_flow_item_raw *raw;
@@ -632,10 +633,13 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
 		} mask;
 		union {
 			const struct rte_flow_item_raw *raw;
+			const struct rte_flow_item_geneve_opt *geneve_opt;
 		} src;
 		union {
 			struct rte_flow_item_raw *raw;
+			struct rte_flow_item_geneve_opt *geneve_opt;
 		} dst;
+		void *deep_src;
 		size_t tmp;
 
 	case RTE_FLOW_ITEM_TYPE_RAW:
@@ -664,13 +668,30 @@ rte_flow_conv_item_spec(void *buf, const size_t size,
 			tmp = last.raw->length & mask.raw->length;
 		if (tmp) {
 			off = RTE_ALIGN_CEIL(off, sizeof(*dst.raw->pattern));
-			if (size >= off + tmp)
-				dst.raw->pattern = rte_memcpy
-					((void *)((uintptr_t)dst.raw + off),
-					 src.raw->pattern, tmp);
+			if (size >= off + tmp) {
+				deep_src = (void *)((uintptr_t)dst.raw + off);
+				dst.raw->pattern = rte_memcpy(deep_src,
+							      src.raw->pattern,
+							      tmp);
+			}
 			off += tmp;
 		}
 		break;
+	case RTE_FLOW_ITEM_TYPE_GENEVE_OPT:
+		off = rte_flow_conv_copy(buf, data, size,
+					 rte_flow_desc_item, item->type);
+		spec.geneve_opt = item->spec;
+		src.geneve_opt = data;
+		dst.geneve_opt = buf;
+		tmp = spec.geneve_opt->option_len << 2;
+		if (size > 0 && src.geneve_opt->data) {
+			deep_src = (void *)((uintptr_t)(dst.geneve_opt + 1));
+			dst.geneve_opt->data = rte_memcpy(deep_src,
+							  src.geneve_opt->data,
+							  tmp);
+		}
+		off += tmp;
+		break;
 	default:
 		off = rte_flow_conv_copy(buf, data, size,
 					 rte_flow_desc_item, item->type);
Signature · 1 line
2.25.1
Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 6 lines · Michael Baum

The "rte_flow_conv()" function, enables, among other things, to copy item list.

For GENEVE option item, the function copies it without considering deep copy. It copies the "data" pointer without copying the pointed values.

Quoted 7 lines

This patch adds deep copy for after regular copy.

Fixes 2b4c72b4d10d ("ethdev: introduce GENEVE header TLV option item")

Applied to dpdk-next-net/main, thanks.