net/mlx5: fix port matching in sample flow rule

If there are an explicit port match and sample action in the same flow,
mlx5 PMD pushes the explicit port match in the prefix subflow, and
uses the tag item match in the suffix subflow.

The explicit port match was translated into source vport match so
the sample suffix subflow lost this match after flow split.

This patch copies the explicit port match to the sample suffix subflow,
and the latter gets the correct source vport value in the flow matcher.

Fixes: b4c0ddbfcc58 ("net/mlx5: split sample flow into two sub-flows")
Cc: stable@dpdk.org
Signed-off-by: Jiawei Wang <jiaweiw@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index cd55bdc2c08f5bffb06c0c4a3effdab2a89f5701..78cb38d42b074c8488714fe5aefbee9d074fe6a9 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -5783,7 +5783,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
        return flag ? actions_n + 1 : 0;
 }
 
-#define SAMPLE_SUFFIX_ITEM 2
+#define SAMPLE_SUFFIX_ITEM 3
 
 /**
  * Split the sample flow.
@@ -5824,6 +5824,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
 static int
 flow_sample_split_prep(struct rte_eth_dev *dev,
                       int add_tag,
+                      const struct rte_flow_item items[],
                       struct rte_flow_item sfx_items[],
                       const struct rte_flow_action actions[],
                       struct rte_flow_action actions_sfx[],
@@ -5951,6 +5952,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev,
                        .data = tag_id,
                };
                /* Prepare the suffix subflow items. */
+               for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
+                       if (items->type == RTE_FLOW_ITEM_TYPE_PORT_ID) {
+                               memcpy(sfx_items, items, sizeof(*sfx_items));
+                               sfx_items++;
+                       }
+               }
                tag_spec = (void *)(sfx_items + SAMPLE_SUFFIX_ITEM);
                tag_spec->data = tag_id;
                tag_spec->id = set_tag->id;
@@ -6563,7 +6570,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,
                        jump_table = attr->group * MLX5_FLOW_TABLE_FACTOR +
                                     next_ft_step;
                pre_actions = sfx_actions + actions_n;
-               tag_id = flow_sample_split_prep(dev, add_tag, sfx_items,
+               tag_id = flow_sample_split_prep(dev, add_tag, items, sfx_items,
                                                actions, sfx_actions,
                                                pre_actions, actions_n,
                                                sample_action_pos,