git.droids-corp.org / dpdk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8594e2a)
net/mlx5: fix modify field action conversion
authorViacheslav Ovsiienko <viacheslavo@nvidia.com>
Mon, 8 Nov 2021 14:11:31 +0000 (16:11 +0200)
committerRaslan Darawsheh <rasland@nvidia.com>
Wed, 10 Nov 2021 14:44:45 +0000 (15:44 +0100)
The routine converting RTE flow modify field action into
field driver's presentation did not specify the field mask
correctly and this resulted into wrong conversion for
the actions with shifted fields.

Fixes: 40c8fb1fd3b3 ("net/mlx5: update modify field action")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
drivers/net/mlx5/mlx5_flow_dv.c patch | blob | history

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 0beaf7b..28911d6 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1470,11 +1470,11 @@ mlx5_flow_field_id_to_modify_info
                                info[idx] = (struct field_modify_info){2, 4,
                                                MLX5_MODI_OUT_DMAC_15_0};
                                if (width < 16) {
-                                       mask[idx] = rte_cpu_to_be_16(0xffff >>
+                                       mask[1] = rte_cpu_to_be_16(0xffff >>
                                                                 (16 - width));
                                        width = 0;
                                } else {
-                                       mask[idx] = RTE_BE16(0xffff);
+                                       mask[1] = RTE_BE16(0xffff);
                                        width -= 16;
                                }
                                if (!width)
@@ -1483,8 +1483,8 @@ mlx5_flow_field_id_to_modify_info
                        }
                        info[idx] = (struct field_modify_info){4, 0,
                                                MLX5_MODI_OUT_DMAC_47_16};
-                       mask[idx] = rte_cpu_to_be_32((0xffffffff >>
-                                                     (32 - width)) << off);
+                       mask[0] = rte_cpu_to_be_32((0xffffffff >>
+                                                   (32 - width)) << off);
                } else {
                        if (data->offset < 16)
                                info[idx++] = (struct field_modify_info){2, 4,
@@ -1500,11 +1500,11 @@ mlx5_flow_field_id_to_modify_info
                                info[idx] = (struct field_modify_info){2, 4,
                                                MLX5_MODI_OUT_SMAC_15_0};
                                if (width < 16) {
-                                       mask[idx] = rte_cpu_to_be_16(0xffff >>
+                                       mask[1] = rte_cpu_to_be_16(0xffff >>
                                                                 (16 - width));
                                        width = 0;
                                } else {
-                                       mask[idx] = RTE_BE16(0xffff);
+                                       mask[1] = RTE_BE16(0xffff);
                                        width -= 16;
                                }
                                if (!width)
@@ -1513,8 +1513,8 @@ mlx5_flow_field_id_to_modify_info
                        }
                        info[idx] = (struct field_modify_info){4, 0,
                                                MLX5_MODI_OUT_SMAC_47_16};
-                       mask[idx] = rte_cpu_to_be_32((0xffffffff >>
-                                                     (32 - width)) << off);
+                       mask[0] = rte_cpu_to_be_32((0xffffffff >>
+                                                   (32 - width)) << off);
                } else {
                        if (data->offset < 16)
                                info[idx++] = (struct field_modify_info){2, 4,
@@ -1582,12 +1582,12 @@ mlx5_flow_field_id_to_modify_info
                                info[idx] = (struct field_modify_info){4, 12,
                                                MLX5_MODI_OUT_SIPV6_31_0};
                                if (width < 32) {
-                                       mask[idx] =
+                                       mask[3] =
                                                rte_cpu_to_be_32(0xffffffff >>
                                                                 (32 - width));
                                        width = 0;
                                } else {
-                                       mask[idx] = RTE_BE32(0xffffffff);
+                                       mask[3] = RTE_BE32(0xffffffff);
                                        width -= 32;
                                }
                                if (!width)
@@ -1598,12 +1598,12 @@ mlx5_flow_field_id_to_modify_info
                                info[idx] = (struct field_modify_info){4, 8,
                                                MLX5_MODI_OUT_SIPV6_63_32};
                                if (width < 32) {
-                                       mask[idx] =
+                                       mask[2] =
                                                rte_cpu_to_be_32(0xffffffff >>
                                                                 (32 - width));
                                        width = 0;
                                } else {
-                                       mask[idx] = RTE_BE32(0xffffffff);
+                                       mask[2] = RTE_BE32(0xffffffff);
                                        width -= 32;
                                }
                                if (!width)
@@ -1614,12 +1614,12 @@ mlx5_flow_field_id_to_modify_info
                                info[idx] = (struct field_modify_info){4, 4,
                                                MLX5_MODI_OUT_SIPV6_95_64};
                                if (width < 32) {
-                                       mask[idx] =
+                                       mask[1] =
                                                rte_cpu_to_be_32(0xffffffff >>
                                                                 (32 - width));
                                        width = 0;
                                } else {
-                                       mask[idx] = RTE_BE32(0xffffffff);
+                                       mask[1] = RTE_BE32(0xffffffff);
                                        width -= 32;
                                }
                                if (!width)
@@ -1628,8 +1628,7 @@ mlx5_flow_field_id_to_modify_info
                        }
                        info[idx] = (struct field_modify_info){4, 0,
                                                MLX5_MODI_OUT_SIPV6_127_96};
-                       mask[idx] = rte_cpu_to_be_32(0xffffffff >>
-                                                    (32 - width));
+                       mask[0] = rte_cpu_to_be_32(0xffffffff >> (32 - width));
                } else {
                        if (data->offset < 32)
                                info[idx++] = (struct field_modify_info){4, 12,
@@ -1651,12 +1650,12 @@ mlx5_flow_field_id_to_modify_info
                                info[idx] = (struct field_modify_info){4, 12,
                                                MLX5_MODI_OUT_DIPV6_31_0};
                                if (width < 32) {
-                                       mask[idx] =
+                                       mask[3] =
                                                rte_cpu_to_be_32(0xffffffff >>
                                                                 (32 - width));
                                        width = 0;
                                } else {
-                                       mask[idx] = RTE_BE32(0xffffffff);
+                                       mask[3] = RTE_BE32(0xffffffff);
                                        width -= 32;
                                }
                                if (!width)
@@ -1667,12 +1666,12 @@ mlx5_flow_field_id_to_modify_info
                                info[idx] = (struct field_modify_info){4, 8,
                                                MLX5_MODI_OUT_DIPV6_63_32};
                                if (width < 32) {
-                                       mask[idx] =
+                                       mask[2] =
                                                rte_cpu_to_be_32(0xffffffff >>
                                                                 (32 - width));
                                        width = 0;
                                } else {
-                                       mask[idx] = RTE_BE32(0xffffffff);
+                                       mask[2] = RTE_BE32(0xffffffff);
                                        width -= 32;
                                }
                                if (!width)
@@ -1683,12 +1682,12 @@ mlx5_flow_field_id_to_modify_info
                                info[idx] = (struct field_modify_info){4, 4,
                                                MLX5_MODI_OUT_DIPV6_95_64};
                                if (width < 32) {
-                                       mask[idx] =
+                                       mask[1] =
                                                rte_cpu_to_be_32(0xffffffff >>
                                                                 (32 - width));
                                        width = 0;
                                } else {
-                                       mask[idx] = RTE_BE32(0xffffffff);
+                                       mask[1] = RTE_BE32(0xffffffff);
                                        width -= 32;
                                }
                                if (!width)
@@ -1697,8 +1696,7 @@ mlx5_flow_field_id_to_modify_info
                        }
                        info[idx] = (struct field_modify_info){4, 0,
                                                MLX5_MODI_OUT_DIPV6_127_96};
-                       mask[idx] = rte_cpu_to_be_32(0xffffffff >>
-                                                    (32 - width));
+                       mask[0] = rte_cpu_to_be_32(0xffffffff >> (32 - width));
                } else {
                        if (data->offset < 32)
                                info[idx++] = (struct field_modify_info){4, 12,
DPDK repo used for reviews