net/mlx5: fix cross GVMI metadata match for E-Switch setup

The metadata flow item did not check for cross GVMI support.

Fixes: a78425ba3793 ("net/mlx5: support flow metadata between E-Switch and VM")
Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Bing Zhao <bingz@nvidia.com>

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index e332226fffe53a5ddab2fcd1308f8c20531f2e98..83a4adc971f582a9078ab15e260c31371d3d3cc0 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1810,7 +1810,8 @@ flow_hw_get_reg_id_by_domain(struct rte_eth_dev *dev,
        switch (type) {
        case RTE_FLOW_ITEM_TYPE_META:
                if (sh->config.dv_esw_en &&
-                   sh->config.dv_xmeta_en == MLX5_XMETA_MODE_META32_HWS) {
+                   (sh->config.dv_xmeta_en == MLX5_XMETA_MODE_META32_HWS ||
+                    mlx5_esw_metadata_passing_enabled(sh))) {
                        return REG_C_1;
                }
                if ((mlx5_vport_rx_metadata_passing_enabled(sh) &&