patch 'net/dpaa2: fix flow rule resizing' has been queued to stable release 24.11.4
Kevin Traynor
ktraynor at redhat.com
Fri Oct 31 15:34:00 CET 2025
Hi,
FYI, your patch has been queued to stable release 24.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/05/25. 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.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/fcc33d7ad35889c6f80315704bd4fa87e67b1238
Thanks.
Kevin
---
>From fcc33d7ad35889c6f80315704bd4fa87e67b1238 Mon Sep 17 00:00:00 2001
From: Jun Yang <jun.yang at nxp.com>
Date: Thu, 16 Oct 2025 15:57:56 +0530
Subject: [PATCH] net/dpaa2: fix flow rule resizing
[ upstream commit 3904f568b8e9987c82a4123776a62e4ca9857f1d ]
Appending new extract need resize the flow's rule.
The rule's size should start from new extract's position plus
it's size unless the position is less than rule's original size.
Fixes: 56c1817d532e ("net/dpaa2: refactor flow engine")
Signed-off-by: Jun Yang <jun.yang at nxp.com>
---
drivers/net/dpaa2/dpaa2_flow.c | 123 ++++++++++++++++++++++++++-------
1 file changed, 97 insertions(+), 26 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c
index c94eb51ba5..810b6fae4b 100644
--- a/drivers/net/dpaa2/dpaa2_flow.c
+++ b/drivers/net/dpaa2/dpaa2_flow.c
@@ -631,12 +631,9 @@ dpaa2_flow_rule_insert_hole(struct dpaa2_dev_flow *flow,
enum dpaa2_flow_dist_type dist_type)
{
- int end;
-
if (dist_type & DPAA2_FLOW_QOS_TYPE) {
- end = flow->qos_rule_size;
- if (end > offset) {
+ if (offset < flow->qos_rule_size) {
memmove(flow->qos_key_addr + offset + size,
flow->qos_key_addr + offset,
- end - offset);
+ flow->qos_rule_size - offset);
memset(flow->qos_key_addr + offset,
0, size);
@@ -644,17 +641,18 @@ dpaa2_flow_rule_insert_hole(struct dpaa2_dev_flow *flow,
memmove(flow->qos_mask_addr + offset + size,
flow->qos_mask_addr + offset,
- end - offset);
+ flow->qos_rule_size - offset);
memset(flow->qos_mask_addr + offset,
0, size);
+ flow->qos_rule_size += size;
+ } else {
+ flow->qos_rule_size = offset + size;
}
- flow->qos_rule_size += size;
}
if (dist_type & DPAA2_FLOW_FS_TYPE) {
- end = flow->fs_rule_size;
- if (end > offset) {
+ if (offset < flow->fs_rule_size) {
memmove(flow->fs_key_addr + offset + size,
flow->fs_key_addr + offset,
- end - offset);
+ flow->fs_rule_size - offset);
memset(flow->fs_key_addr + offset,
0, size);
@@ -662,9 +660,11 @@ dpaa2_flow_rule_insert_hole(struct dpaa2_dev_flow *flow,
memmove(flow->fs_mask_addr + offset + size,
flow->fs_mask_addr + offset,
- end - offset);
+ flow->fs_rule_size - offset);
memset(flow->fs_mask_addr + offset,
0, size);
+ flow->fs_rule_size += size;
+ } else {
+ flow->fs_rule_size = offset + size;
}
- flow->fs_rule_size += size;
}
@@ -1489,6 +1489,7 @@ dpaa2_flow_faf_add_rule(struct dpaa2_dev_priv *priv,
if (!(*key_addr) &&
- key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT)
- flow->qos_rule_size++;
+ key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT &&
+ offset >= flow->qos_rule_size)
+ flow->qos_rule_size = offset + sizeof(uint8_t);
*key_addr |= (1 << faf_bit_in_byte);
@@ -1511,6 +1512,7 @@ dpaa2_flow_faf_add_rule(struct dpaa2_dev_priv *priv,
if (!(*key_addr) &&
- key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT)
- flow->fs_rule_size++;
+ key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT &&
+ offset >= flow->fs_rule_size)
+ flow->fs_rule_size = offset + sizeof(uint8_t);
*key_addr |= (1 << faf_bit_in_byte);
@@ -1530,4 +1532,5 @@ dpaa2_flow_pr_rule_data_set(struct dpaa2_dev_flow *flow,
int offset;
uint32_t pr_field = pr_offset << 16 | pr_size;
+ char offset_info[64], size_info[64], rule_size_info[64];
offset = dpaa2_flow_extract_key_offset(key_profile,
@@ -1538,17 +1541,41 @@ dpaa2_flow_pr_rule_data_set(struct dpaa2_dev_flow *flow,
return -EINVAL;
}
+ sprintf(offset_info, "offset(%d)", offset);
+ sprintf(size_info, "size(%d)", pr_size);
if (dist_type & DPAA2_FLOW_QOS_TYPE) {
+ sprintf(rule_size_info, "qos rule size(%d)",
+ flow->qos_rule_size);
memcpy((flow->qos_key_addr + offset), key, pr_size);
memcpy((flow->qos_mask_addr + offset), mask, pr_size);
- if (key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT)
- flow->qos_rule_size = offset + pr_size;
+ if (key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT) {
+ if (offset >= flow->qos_rule_size) {
+ flow->qos_rule_size = offset + pr_size;
+ } else if ((offset + pr_size) > flow->qos_rule_size) {
+ DPAA2_PMD_ERR("%s < %s, but %s + %s > %s",
+ offset_info, rule_size_info,
+ offset_info, size_info,
+ rule_size_info);
+ return -EINVAL;
+ }
+ }
}
if (dist_type & DPAA2_FLOW_FS_TYPE) {
+ sprintf(rule_size_info, "fs rule size(%d)",
+ flow->fs_rule_size);
memcpy((flow->fs_key_addr + offset), key, pr_size);
memcpy((flow->fs_mask_addr + offset), mask, pr_size);
- if (key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT)
- flow->fs_rule_size = offset + pr_size;
+ if (key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT) {
+ if (offset >= flow->fs_rule_size) {
+ flow->fs_rule_size = offset + pr_size;
+ } else if ((offset + pr_size) > flow->fs_rule_size) {
+ DPAA2_PMD_ERR("%s < %s, but %s + %s > %s",
+ offset_info, rule_size_info,
+ offset_info, size_info,
+ rule_size_info);
+ return -EINVAL;
+ }
+ }
}
@@ -1564,4 +1591,5 @@ dpaa2_flow_hdr_rule_data_set(struct dpaa2_dev_flow *flow,
{
int offset;
+ char offset_info[64], size_info[64], rule_size_info[64];
if (dpaa2_flow_ip_address_extract(prot, field)) {
@@ -1578,17 +1606,39 @@ dpaa2_flow_hdr_rule_data_set(struct dpaa2_dev_flow *flow,
return -EINVAL;
}
+ sprintf(offset_info, "offset(%d)", offset);
+ sprintf(size_info, "size(%d)", size);
if (dist_type & DPAA2_FLOW_QOS_TYPE) {
+ sprintf(rule_size_info, "qos rule size(%d)",
+ flow->qos_rule_size);
memcpy((flow->qos_key_addr + offset), key, size);
memcpy((flow->qos_mask_addr + offset), mask, size);
- if (key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT)
- flow->qos_rule_size = offset + size;
+ if (key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT) {
+ if (offset >= flow->qos_rule_size) {
+ flow->qos_rule_size = offset + size;
+ } else if ((offset + size) > flow->qos_rule_size) {
+ DPAA2_PMD_ERR("%s: %s < %s, but %s + %s > %s",
+ __func__, offset_info, rule_size_info,
+ offset_info, size_info, rule_size_info);
+ return -EINVAL;
+ }
+ }
}
if (dist_type & DPAA2_FLOW_FS_TYPE) {
+ sprintf(rule_size_info, "fs rule size(%d)",
+ flow->fs_rule_size);
memcpy((flow->fs_key_addr + offset), key, size);
memcpy((flow->fs_mask_addr + offset), mask, size);
- if (key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT)
- flow->fs_rule_size = offset + size;
+ if (key_profile->ip_addr_type == IP_NONE_ADDR_EXTRACT) {
+ if (offset >= flow->fs_rule_size) {
+ flow->fs_rule_size = offset + size;
+ } else if ((offset + size) > flow->fs_rule_size) {
+ DPAA2_PMD_ERR("%s: %s < %s, but %s + %s > %s",
+ __func__, offset_info, rule_size_info,
+ offset_info, size_info, rule_size_info);
+ return -EINVAL;
+ }
+ }
}
@@ -1606,4 +1656,5 @@ dpaa2_flow_raw_rule_data_set(struct dpaa2_dev_flow *flow,
DPAA2_FLOW_MAX_KEY_SIZE : size;
int offset, field;
+ char offset_info[64], size_info[64], rule_size_info[64];
field = extract_offset << DPAA2_FLOW_RAW_OFFSET_FIELD_SHIFT;
@@ -1616,15 +1667,35 @@ dpaa2_flow_raw_rule_data_set(struct dpaa2_dev_flow *flow,
return -EINVAL;
}
+ sprintf(offset_info, "offset(%d)", offset);
+ sprintf(size_info, "size(%d)", size);
if (dist_type & DPAA2_FLOW_QOS_TYPE) {
+ sprintf(rule_size_info, "qos rule size(%d)",
+ flow->qos_rule_size);
memcpy((flow->qos_key_addr + offset), key, size);
memcpy((flow->qos_mask_addr + offset), mask, size);
- flow->qos_rule_size = offset + size;
+ if (offset >= flow->qos_rule_size) {
+ flow->qos_rule_size = offset + size;
+ } else if ((offset + size) > flow->qos_rule_size) {
+ DPAA2_PMD_ERR("%s: %s < %s, but %s + %s > %s",
+ __func__, offset_info, rule_size_info,
+ offset_info, size_info, rule_size_info);
+ return -EINVAL;
+ }
}
if (dist_type & DPAA2_FLOW_FS_TYPE) {
+ sprintf(rule_size_info, "fs rule size(%d)",
+ flow->fs_rule_size);
memcpy((flow->fs_key_addr + offset), key, size);
memcpy((flow->fs_mask_addr + offset), mask, size);
- flow->fs_rule_size = offset + size;
+ if (offset >= flow->fs_rule_size) {
+ flow->fs_rule_size = offset + size;
+ } else if ((offset + size) > flow->fs_rule_size) {
+ DPAA2_PMD_ERR("%s: %s < %s, but %s + %s > %s",
+ __func__, offset_info, rule_size_info,
+ offset_info, size_info, rule_size_info);
+ return -EINVAL;
+ }
}
--
2.51.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-10-31 13:53:55.778674700 +0000
+++ 0118-net-dpaa2-fix-flow-rule-resizing.patch 2025-10-31 13:53:52.300524192 +0000
@@ -1 +1 @@
-From 3904f568b8e9987c82a4123776a62e4ca9857f1d Mon Sep 17 00:00:00 2001
+From fcc33d7ad35889c6f80315704bd4fa87e67b1238 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3904f568b8e9987c82a4123776a62e4ca9857f1d ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 299c50dcdf..2e44bff766 100644
+index c94eb51ba5..810b6fae4b 100644
@@ -75 +76 @@
-@@ -1486,6 +1486,7 @@ dpaa2_flow_faf_add_rule(struct dpaa2_dev_priv *priv,
+@@ -1489,6 +1489,7 @@ dpaa2_flow_faf_add_rule(struct dpaa2_dev_priv *priv,
@@ -85 +86 @@
-@@ -1508,6 +1509,7 @@ dpaa2_flow_faf_add_rule(struct dpaa2_dev_priv *priv,
+@@ -1511,6 +1512,7 @@ dpaa2_flow_faf_add_rule(struct dpaa2_dev_priv *priv,
@@ -95 +96 @@
-@@ -1527,4 +1529,5 @@ dpaa2_flow_pr_rule_data_set(struct dpaa2_dev_flow *flow,
+@@ -1530,4 +1532,5 @@ dpaa2_flow_pr_rule_data_set(struct dpaa2_dev_flow *flow,
@@ -101 +102 @@
-@@ -1535,17 +1538,41 @@ dpaa2_flow_pr_rule_data_set(struct dpaa2_dev_flow *flow,
+@@ -1538,17 +1541,41 @@ dpaa2_flow_pr_rule_data_set(struct dpaa2_dev_flow *flow,
@@ -147 +148 @@
-@@ -1561,4 +1588,5 @@ dpaa2_flow_hdr_rule_data_set(struct dpaa2_dev_flow *flow,
+@@ -1564,4 +1591,5 @@ dpaa2_flow_hdr_rule_data_set(struct dpaa2_dev_flow *flow,
@@ -153 +154 @@
-@@ -1575,17 +1603,39 @@ dpaa2_flow_hdr_rule_data_set(struct dpaa2_dev_flow *flow,
+@@ -1578,17 +1606,39 @@ dpaa2_flow_hdr_rule_data_set(struct dpaa2_dev_flow *flow,
@@ -197 +198 @@
-@@ -1603,4 +1653,5 @@ dpaa2_flow_raw_rule_data_set(struct dpaa2_dev_flow *flow,
+@@ -1606,4 +1656,5 @@ dpaa2_flow_raw_rule_data_set(struct dpaa2_dev_flow *flow,
@@ -203 +204 @@
-@@ -1613,15 +1664,35 @@ dpaa2_flow_raw_rule_data_set(struct dpaa2_dev_flow *flow,
+@@ -1616,15 +1667,35 @@ dpaa2_flow_raw_rule_data_set(struct dpaa2_dev_flow *flow,
More information about the stable
mailing list