[dpdk-stable] patch 'ethdev: fix RSS flow expansion in case of mismatch' has been queued to stable release 19.11.6
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Wed Oct 28 11:44:44 CET 2020
Hi,
FYI, your patch has been queued to stable release 19.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From 311ef43d620d0a907130d7856b2c991be32c71d1 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at nvidia.com>
Date: Thu, 24 Sep 2020 17:52:13 +0300
Subject: [PATCH] ethdev: fix RSS flow expansion in case of mismatch
[ upstream commit 7f6a3168edc38d4caf353ee150071c827fe01b95 ]
Function rte_flow_expand_rss() is used to expand a flow rule with
partial pattern into several rules, to ensure all relevant packets
are matched.
It uses utility function rte_flow_expand_rss_item_complete(), to check
if the last valid item in the flow rule pattern needs to be completed.
For example the pattern "eth / ipv4 proto is 17 / end" will be completed
with a "udp" item.
This function returns "void" item in two cases:
1) The last item has empty spec, for example "eth / ipv4 / end".
2) The last itme has spec that can't be expanded for RSS.
For example the pattern "eth / ipv4 proto is 47 / end" ends with IPv4
item that has next protocol GRE.
In both cases the flow rule may be expanded, but in the second case such
expansion may create rules with invalid pattern.
For example "eth / ipv4 proto is 47 / udp / end".
In such a case the flow rule should not be expanded.
This patch updates function rte_flow_expand_rss_item_complete().
Return value RTE_FLOW_ITEM_TYPE_END is used to indicate the flow rule
should not be expanded.
In such a case, rte_flow_expand_rss() will return with the original flow
rule only, without any expansion.
Fixes: fc2dd8dd492f ("ethdev: fix expand RSS flows")
Signed-off-by: Dekel Peled <dekelp at nvidia.com>
Acked-by: Xiaoyu Min <jackmin at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Acked-by: Ori Kam <orika at nvidia.com>
---
lib/librte_ethdev/rte_flow.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index 391165646a..7171c11499 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -241,6 +241,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
ret = RTE_FLOW_ITEM_TYPE_IPV6;
else if (rte_be_to_cpu_16(ether_type) == RTE_ETHER_TYPE_VLAN)
ret = RTE_FLOW_ITEM_TYPE_VLAN;
+ else
+ ret = RTE_FLOW_ITEM_TYPE_END;
break;
case RTE_FLOW_ITEM_TYPE_VLAN:
if (item->mask)
@@ -258,6 +260,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
ret = RTE_FLOW_ITEM_TYPE_IPV6;
else if (rte_be_to_cpu_16(ether_type) == RTE_ETHER_TYPE_VLAN)
ret = RTE_FLOW_ITEM_TYPE_VLAN;
+ else
+ ret = RTE_FLOW_ITEM_TYPE_END;
break;
case RTE_FLOW_ITEM_TYPE_IPV4:
if (item->mask)
@@ -278,6 +282,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
ret = RTE_FLOW_ITEM_TYPE_IPV4;
else if (ip_next_proto == IPPROTO_IPV6)
ret = RTE_FLOW_ITEM_TYPE_IPV6;
+ else
+ ret = RTE_FLOW_ITEM_TYPE_END;
break;
case RTE_FLOW_ITEM_TYPE_IPV6:
if (item->mask)
@@ -298,6 +304,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
ret = RTE_FLOW_ITEM_TYPE_IPV4;
else if (ip_next_proto == IPPROTO_IPV6)
ret = RTE_FLOW_ITEM_TYPE_IPV6;
+ else
+ ret = RTE_FLOW_ITEM_TYPE_END;
break;
default:
ret = RTE_FLOW_ITEM_TYPE_VOID;
@@ -1104,10 +1112,14 @@ rte_flow_expand_rss(struct rte_flow_expand_rss *buf, size_t size,
memset(flow_items, 0, sizeof(flow_items));
user_pattern_size -= sizeof(*item);
/*
- * Check if the last valid item has spec set
- * and need complete pattern.
+ * Check if the last valid item has spec set, need complete pattern,
+ * and the pattern can be used for expansion.
*/
missed_item.type = rte_flow_expand_rss_item_complete(last_item);
+ if (missed_item.type == RTE_FLOW_ITEM_TYPE_END) {
+ /* Item type END indicates expansion is not required. */
+ return lsize;
+ }
if (missed_item.type != RTE_FLOW_ITEM_TYPE_VOID) {
next = NULL;
missed = 1;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-10-28 10:35:15.629398450 +0000
+++ 0125-ethdev-fix-RSS-flow-expansion-in-case-of-mismatch.patch 2020-10-28 10:35:11.688832733 +0000
@@ -1,8 +1,10 @@
-From 7f6a3168edc38d4caf353ee150071c827fe01b95 Mon Sep 17 00:00:00 2001
+From 311ef43d620d0a907130d7856b2c991be32c71d1 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at nvidia.com>
Date: Thu, 24 Sep 2020 17:52:13 +0300
Subject: [PATCH] ethdev: fix RSS flow expansion in case of mismatch
+[ upstream commit 7f6a3168edc38d4caf353ee150071c827fe01b95 ]
+
Function rte_flow_expand_rss() is used to expand a flow rule with
partial pattern into several rules, to ensure all relevant packets
are matched.
@@ -28,7 +30,6 @@
rule only, without any expansion.
Fixes: fc2dd8dd492f ("ethdev: fix expand RSS flows")
-Cc: stable at dpdk.org
Signed-off-by: Dekel Peled <dekelp at nvidia.com>
Acked-by: Xiaoyu Min <jackmin at nvidia.com>
@@ -39,10 +40,10 @@
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
-index f8fdd68fe9..59a386d074 100644
+index 391165646a..7171c11499 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
-@@ -247,6 +247,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
+@@ -241,6 +241,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
ret = RTE_FLOW_ITEM_TYPE_IPV6;
else if (rte_be_to_cpu_16(ether_type) == RTE_ETHER_TYPE_VLAN)
ret = RTE_FLOW_ITEM_TYPE_VLAN;
@@ -51,7 +52,7 @@
break;
case RTE_FLOW_ITEM_TYPE_VLAN:
if (item->mask)
-@@ -264,6 +266,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
+@@ -258,6 +260,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
ret = RTE_FLOW_ITEM_TYPE_IPV6;
else if (rte_be_to_cpu_16(ether_type) == RTE_ETHER_TYPE_VLAN)
ret = RTE_FLOW_ITEM_TYPE_VLAN;
@@ -60,7 +61,7 @@
break;
case RTE_FLOW_ITEM_TYPE_IPV4:
if (item->mask)
-@@ -284,6 +288,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
+@@ -278,6 +282,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
ret = RTE_FLOW_ITEM_TYPE_IPV4;
else if (ip_next_proto == IPPROTO_IPV6)
ret = RTE_FLOW_ITEM_TYPE_IPV6;
@@ -69,7 +70,7 @@
break;
case RTE_FLOW_ITEM_TYPE_IPV6:
if (item->mask)
-@@ -304,6 +310,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
+@@ -298,6 +304,8 @@ rte_flow_expand_rss_item_complete(const struct rte_flow_item *item)
ret = RTE_FLOW_ITEM_TYPE_IPV4;
else if (ip_next_proto == IPPROTO_IPV6)
ret = RTE_FLOW_ITEM_TYPE_IPV6;
@@ -78,7 +79,7 @@
break;
default:
ret = RTE_FLOW_ITEM_TYPE_VOID;
-@@ -1110,10 +1118,14 @@ rte_flow_expand_rss(struct rte_flow_expand_rss *buf, size_t size,
+@@ -1104,10 +1112,14 @@ rte_flow_expand_rss(struct rte_flow_expand_rss *buf, size_t size,
memset(flow_items, 0, sizeof(flow_items));
user_pattern_size -= sizeof(*item);
/*
More information about the stable
mailing list