net/mlx5: fix RSS RETA update
[dpdk.git] / drivers / net / mlx5 / mlx5_flow_dv.c
index f54440c..a5ced50 100644 (file)
@@ -15,6 +15,7 @@
 #include <rte_flow_driver.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
+#include <rte_bus_pci.h>
 #include <rte_ip.h>
 #include <rte_gre.h>
 #include <rte_vxlan.h>
@@ -92,6 +93,23 @@ static int
 flow_dv_jump_tbl_resource_release(struct rte_eth_dev *dev,
                                  uint32_t rix_jump);
 
+static int16_t
+flow_dv_get_esw_manager_vport_id(struct rte_eth_dev *dev)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+
+       if (priv->pci_dev == NULL)
+               return 0;
+       switch (priv->pci_dev->id.device_id) {
+       case PCI_DEVICE_ID_MELLANOX_CONNECTX5BF:
+       case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF:
+       case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF:
+               return (int16_t)0xfffe;
+       default:
+               return 0;
+       }
+}
+
 /**
  * Initialize flow attributes structure according to flow items' types.
  *
@@ -269,31 +287,6 @@ struct field_modify_info modify_tcp[] = {
        {0, 0, 0},
 };
 
-static const struct rte_flow_item *
-mlx5_flow_find_tunnel_item(const struct rte_flow_item *item)
-{
-       for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
-               switch (item->type) {
-               default:
-                       break;
-               case RTE_FLOW_ITEM_TYPE_VXLAN:
-               case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
-               case RTE_FLOW_ITEM_TYPE_GRE:
-               case RTE_FLOW_ITEM_TYPE_MPLS:
-               case RTE_FLOW_ITEM_TYPE_NVGRE:
-               case RTE_FLOW_ITEM_TYPE_GENEVE:
-                       return item;
-               case RTE_FLOW_ITEM_TYPE_IPV4:
-               case RTE_FLOW_ITEM_TYPE_IPV6:
-                       if (item[1].type == RTE_FLOW_ITEM_TYPE_IPV4 ||
-                           item[1].type == RTE_FLOW_ITEM_TYPE_IPV6)
-                               return item;
-                       break;
-               }
-       }
-       return NULL;
-}
-
 static void
 mlx5_flow_tunnel_ip_check(const struct rte_flow_item *item __rte_unused,
                          uint8_t next_protocol, uint64_t *item_flags,
@@ -1391,7 +1384,7 @@ flow_dv_convert_action_modify_ipv6_dscp
 
 static int
 mlx5_flow_item_field_width(struct mlx5_priv *priv,
-                          enum rte_flow_field_id field)
+                          enum rte_flow_field_id field, int inherit)
 {
        switch (field) {
        case RTE_FLOW_FIELD_START:
@@ -1442,7 +1435,7 @@ mlx5_flow_item_field_width(struct mlx5_priv *priv,
                return __builtin_popcount(priv->sh->dv_meta_mask);
        case RTE_FLOW_FIELD_POINTER:
        case RTE_FLOW_FIELD_VALUE:
-               return 64;
+               return inherit < 0 ? 0 : inherit;
        default:
                MLX5_ASSERT(false);
        }
@@ -1452,17 +1445,14 @@ mlx5_flow_item_field_width(struct mlx5_priv *priv,
 static void
 mlx5_flow_field_id_to_modify_info
                (const struct rte_flow_action_modify_data *data,
-                struct field_modify_info *info,
-                uint32_t *mask, uint32_t *value,
-                uint32_t width, uint32_t dst_width,
-                uint32_t *shift, struct rte_eth_dev *dev,
-                const struct rte_flow_attr *attr,
-                struct rte_flow_error *error)
+                struct field_modify_info *info, uint32_t *mask,
+                uint32_t width, uint32_t *shift, struct rte_eth_dev *dev,
+                const struct rte_flow_attr *attr, struct rte_flow_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
        uint32_t idx = 0;
        uint32_t off = 0;
-       uint64_t val = 0;
+
        switch (data->field) {
        case RTE_FLOW_FIELD_START:
                /* not supported yet */
@@ -1472,7 +1462,7 @@ mlx5_flow_field_id_to_modify_info
                off = data->offset > 16 ? data->offset - 16 : 0;
                if (mask) {
                        if (data->offset < 16) {
-                               info[idx] = (struct field_modify_info){2, 0,
+                               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 >>
@@ -1486,15 +1476,15 @@ mlx5_flow_field_id_to_modify_info
                                        break;
                                ++idx;
                        }
-                       info[idx] = (struct field_modify_info){4, 4 * idx,
+                       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);
                } else {
                        if (data->offset < 16)
-                               info[idx++] = (struct field_modify_info){2, 0,
+                               info[idx++] = (struct field_modify_info){2, 4,
                                                MLX5_MODI_OUT_DMAC_15_0};
-                       info[idx] = (struct field_modify_info){4, off,
+                       info[idx] = (struct field_modify_info){4, 0,
                                                MLX5_MODI_OUT_DMAC_47_16};
                }
                break;
@@ -1502,7 +1492,7 @@ mlx5_flow_field_id_to_modify_info
                off = data->offset > 16 ? data->offset - 16 : 0;
                if (mask) {
                        if (data->offset < 16) {
-                               info[idx] = (struct field_modify_info){2, 0,
+                               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 >>
@@ -1516,15 +1506,15 @@ mlx5_flow_field_id_to_modify_info
                                        break;
                                ++idx;
                        }
-                       info[idx] = (struct field_modify_info){4, 4 * idx,
+                       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);
                } else {
                        if (data->offset < 16)
-                               info[idx++] = (struct field_modify_info){2, 0,
+                               info[idx++] = (struct field_modify_info){2, 4,
                                                MLX5_MODI_OUT_SMAC_15_0};
-                       info[idx] = (struct field_modify_info){4, off,
+                       info[idx] = (struct field_modify_info){4, 0,
                                                MLX5_MODI_OUT_SMAC_47_16};
                }
                break;
@@ -1584,8 +1574,7 @@ mlx5_flow_field_id_to_modify_info
        case RTE_FLOW_FIELD_IPV6_SRC:
                if (mask) {
                        if (data->offset < 32) {
-                               info[idx] = (struct field_modify_info){4,
-                                               4 * idx,
+                               info[idx] = (struct field_modify_info){4, 12,
                                                MLX5_MODI_OUT_SIPV6_31_0};
                                if (width < 32) {
                                        mask[idx] =
@@ -1601,8 +1590,7 @@ mlx5_flow_field_id_to_modify_info
                                ++idx;
                        }
                        if (data->offset < 64) {
-                               info[idx] = (struct field_modify_info){4,
-                                               4 * idx,
+                               info[idx] = (struct field_modify_info){4, 8,
                                                MLX5_MODI_OUT_SIPV6_63_32};
                                if (width < 32) {
                                        mask[idx] =
@@ -1618,8 +1606,7 @@ mlx5_flow_field_id_to_modify_info
                                ++idx;
                        }
                        if (data->offset < 96) {
-                               info[idx] = (struct field_modify_info){4,
-                                               4 * idx,
+                               info[idx] = (struct field_modify_info){4, 4,
                                                MLX5_MODI_OUT_SIPV6_95_64};
                                if (width < 32) {
                                        mask[idx] =
@@ -1634,19 +1621,19 @@ mlx5_flow_field_id_to_modify_info
                                        break;
                                ++idx;
                        }
-                       info[idx] = (struct field_modify_info){4, 4 * idx,
+                       info[idx] = (struct field_modify_info){4, 0,
                                                MLX5_MODI_OUT_SIPV6_127_96};
                        mask[idx] = rte_cpu_to_be_32(0xffffffff >>
                                                     (32 - width));
                } else {
                        if (data->offset < 32)
-                               info[idx++] = (struct field_modify_info){4, 0,
+                               info[idx++] = (struct field_modify_info){4, 12,
                                                MLX5_MODI_OUT_SIPV6_31_0};
                        if (data->offset < 64)
-                               info[idx++] = (struct field_modify_info){4, 0,
+                               info[idx++] = (struct field_modify_info){4, 8,
                                                MLX5_MODI_OUT_SIPV6_63_32};
                        if (data->offset < 96)
-                               info[idx++] = (struct field_modify_info){4, 0,
+                               info[idx++] = (struct field_modify_info){4, 4,
                                                MLX5_MODI_OUT_SIPV6_95_64};
                        if (data->offset < 128)
                                info[idx++] = (struct field_modify_info){4, 0,
@@ -1656,8 +1643,7 @@ mlx5_flow_field_id_to_modify_info
        case RTE_FLOW_FIELD_IPV6_DST:
                if (mask) {
                        if (data->offset < 32) {
-                               info[idx] = (struct field_modify_info){4,
-                                               4 * idx,
+                               info[idx] = (struct field_modify_info){4, 12,
                                                MLX5_MODI_OUT_DIPV6_31_0};
                                if (width < 32) {
                                        mask[idx] =
@@ -1673,8 +1659,7 @@ mlx5_flow_field_id_to_modify_info
                                ++idx;
                        }
                        if (data->offset < 64) {
-                               info[idx] = (struct field_modify_info){4,
-                                               4 * idx,
+                               info[idx] = (struct field_modify_info){4, 8,
                                                MLX5_MODI_OUT_DIPV6_63_32};
                                if (width < 32) {
                                        mask[idx] =
@@ -1690,8 +1675,7 @@ mlx5_flow_field_id_to_modify_info
                                ++idx;
                        }
                        if (data->offset < 96) {
-                               info[idx] = (struct field_modify_info){4,
-                                               4 * idx,
+                               info[idx] = (struct field_modify_info){4, 4,
                                                MLX5_MODI_OUT_DIPV6_95_64};
                                if (width < 32) {
                                        mask[idx] =
@@ -1706,19 +1690,19 @@ mlx5_flow_field_id_to_modify_info
                                        break;
                                ++idx;
                        }
-                       info[idx] = (struct field_modify_info){4, 4 * idx,
+                       info[idx] = (struct field_modify_info){4, 0,
                                                MLX5_MODI_OUT_DIPV6_127_96};
                        mask[idx] = rte_cpu_to_be_32(0xffffffff >>
                                                     (32 - width));
                } else {
                        if (data->offset < 32)
-                               info[idx++] = (struct field_modify_info){4, 0,
+                               info[idx++] = (struct field_modify_info){4, 12,
                                                MLX5_MODI_OUT_DIPV6_31_0};
                        if (data->offset < 64)
-                               info[idx++] = (struct field_modify_info){4, 0,
+                               info[idx++] = (struct field_modify_info){4, 8,
                                                MLX5_MODI_OUT_DIPV6_63_32};
                        if (data->offset < 96)
-                               info[idx++] = (struct field_modify_info){4, 0,
+                               info[idx++] = (struct field_modify_info){4, 4,
                                                MLX5_MODI_OUT_DIPV6_95_64};
                        if (data->offset < 128)
                                info[idx++] = (struct field_modify_info){4, 0,
@@ -1838,35 +1822,6 @@ mlx5_flow_field_id_to_modify_info
                break;
        case RTE_FLOW_FIELD_POINTER:
        case RTE_FLOW_FIELD_VALUE:
-               if (data->field == RTE_FLOW_FIELD_POINTER)
-                       memcpy(&val, (void *)(uintptr_t)data->value,
-                              sizeof(uint64_t));
-               else
-                       val = data->value;
-               for (idx = 0; idx < MLX5_ACT_MAX_MOD_FIELDS; idx++) {
-                       if (mask[idx]) {
-                               if (dst_width == 48) {
-                                       /*special case for MAC addresses */
-                                       value[idx] = rte_cpu_to_be_16(val);
-                                       val >>= 16;
-                                       dst_width -= 16;
-                               } else if (dst_width > 16) {
-                                       value[idx] = rte_cpu_to_be_32(val);
-                                       val >>= 32;
-                               } else if (dst_width > 8) {
-                                       value[idx] = rte_cpu_to_be_16(val);
-                                       val >>= 16;
-                               } else {
-                                       value[idx] = (uint8_t)val;
-                                       val >>= 8;
-                               }
-                               if (*shift)
-                                       value[idx] <<= *shift;
-                               if (!val)
-                                       break;
-                       }
-               }
-               break;
        default:
                MLX5_ASSERT(false);
                break;
@@ -1898,42 +1853,40 @@ flow_dv_convert_action_modify_field
                         const struct rte_flow_attr *attr,
                         struct rte_flow_error *error)
 {
-       struct mlx5_priv *priv = dev->data->dev_private;
        const struct rte_flow_action_modify_field *conf =
                (const struct rte_flow_action_modify_field *)(action->conf);
-       struct rte_flow_item item;
+       struct rte_flow_item item = {
+               .spec = NULL,
+               .mask = NULL
+       };
        struct field_modify_info field[MLX5_ACT_MAX_MOD_FIELDS] = {
                                                                {0, 0, 0} };
        struct field_modify_info dcopy[MLX5_ACT_MAX_MOD_FIELDS] = {
                                                                {0, 0, 0} };
        uint32_t mask[MLX5_ACT_MAX_MOD_FIELDS] = {0, 0, 0, 0, 0};
-       uint32_t value[MLX5_ACT_MAX_MOD_FIELDS] = {0, 0, 0, 0, 0};
        uint32_t type;
        uint32_t shift = 0;
-       uint32_t dst_width = mlx5_flow_item_field_width(priv, conf->dst.field);
 
        if (conf->src.field == RTE_FLOW_FIELD_POINTER ||
-               conf->src.field == RTE_FLOW_FIELD_VALUE) {
+           conf->src.field == RTE_FLOW_FIELD_VALUE) {
                type = MLX5_MODIFICATION_TYPE_SET;
                /** For SET fill the destination field (field) first. */
                mlx5_flow_field_id_to_modify_info(&conf->dst, field, mask,
-                                                 value, conf->width, dst_width,
-                                                 &shift, dev, attr, error);
-               /** Then copy immediate value from source as per mask. */
-               mlx5_flow_field_id_to_modify_info(&conf->src, dcopy, mask,
-                                                 value, conf->width, dst_width,
-                                                 &shift, dev, attr, error);
-               item.spec = &value;
+                                                 conf->width, &shift, dev,
+                                                 attr, error);
+               item.spec = conf->src.field == RTE_FLOW_FIELD_POINTER ?
+                                       (void *)(uintptr_t)conf->src.pvalue :
+                                       (void *)(uintptr_t)&conf->src.value;
        } else {
                type = MLX5_MODIFICATION_TYPE_COPY;
                /** For COPY fill the destination field (dcopy) without mask. */
                mlx5_flow_field_id_to_modify_info(&conf->dst, dcopy, NULL,
-                                                 value, conf->width, dst_width,
-                                                 &shift, dev, attr, error);
+                                                 conf->width, &shift, dev,
+                                                 attr, error);
                /** Then construct the source field (field) with mask. */
                mlx5_flow_field_id_to_modify_info(&conf->src, field, mask,
-                                                 value, conf->width, dst_width,
-                                                 &shift, dev, attr, error);
+                                                 conf->width, &shift,
+                                                 dev, attr, error);
        }
        item.mask = &mask;
        return flow_dv_convert_modify_action(&item,
@@ -2224,6 +2177,8 @@ flow_dv_validate_item_port_id(struct rte_eth_dev *dev,
                return ret;
        if (!spec)
                return 0;
+       if (spec->id == MLX5_PORT_ESW_MGR)
+               return 0;
        esw_priv = mlx5_port_to_eswitch_info(spec->id, false);
        if (!esw_priv)
                return rte_flow_error_set(error, rte_errno,
@@ -2412,11 +2367,10 @@ flow_dv_validate_item_gtp_psc(const struct rte_flow_item *item,
 {
        const struct rte_flow_item_gtp *gtp_spec;
        const struct rte_flow_item_gtp *gtp_mask;
-       const struct rte_flow_item_gtp_psc *spec;
        const struct rte_flow_item_gtp_psc *mask;
        const struct rte_flow_item_gtp_psc nic_mask = {
-               .pdu_type = 0xFF,
-               .qfi = 0xFF,
+               .hdr.type = 0xF,
+               .hdr.qfi = 0x3F,
        };
 
        if (!gtp_item || !(last_item & MLX5_FLOW_LAYER_GTP))
@@ -2440,12 +2394,7 @@ flow_dv_validate_item_gtp_psc(const struct rte_flow_item *item,
        /* GTP spec is here and E flag is requested to match zero. */
        if (!item->spec)
                return 0;
-       spec = item->spec;
        mask = item->mask ? item->mask : &rte_flow_item_gtp_psc_mask;
-       if (spec->pdu_type > MLX5_GTP_EXT_MAX_PDU_TYPE)
-               return rte_flow_error_set
-                       (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item,
-                        "PDU type should be smaller than 16");
        return mlx5_flow_item_acceptable(item, (const uint8_t *)mask,
                                         (const uint8_t *)&nic_mask,
                                         sizeof(struct rte_flow_item_gtp_psc),
@@ -3314,26 +3263,6 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,
        return 0;
 }
 
-/**
- * Check if action counter is shared by either old or new mechanism.
- *
- * @param[in] action
- *   Pointer to the action structure.
- *
- * @return
- *   True when counter is shared, false otherwise.
- */
-static inline bool
-is_shared_action_count(const struct rte_flow_action *action)
-{
-       const struct rte_flow_action_count *count =
-                       (const struct rte_flow_action_count *)action->conf;
-
-       if ((int)action->type == MLX5_RTE_FLOW_ACTION_TYPE_COUNT)
-               return true;
-       return !!(count && count->shared);
-}
-
 /**
  * Validate count action.
  *
@@ -3356,7 +3285,7 @@ flow_dv_validate_action_count(struct rte_eth_dev *dev, bool shared,
 {
        struct mlx5_priv *priv = dev->data->dev_private;
 
-       if (!priv->config.devx)
+       if (!priv->sh->devx)
                goto notsup_err;
        if (action_flags & MLX5_FLOW_ACTION_COUNT)
                return rte_flow_error_set(error, EINVAL,
@@ -3684,8 +3613,8 @@ flow_dv_encap_decap_create_cb(void *tool_ctx, void *cb_ctx)
        }
        *resource = *ctx_resource;
        resource->idx = idx;
-       ret = mlx5_flow_os_create_flow_action_packet_reformat(sh->ctx, domain,
-                                                             resource,
+       ret = mlx5_flow_os_create_flow_action_packet_reformat(sh->cdev->ctx,
+                                                             domain, resource,
                                                             &resource->action);
        if (ret) {
                mlx5_ipool_free(sh->ipool[MLX5_IPOOL_DECAP_ENCAP], idx);
@@ -4880,9 +4809,9 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev *dev,
        const struct rte_flow_action_modify_field *action_modify_field =
                action->conf;
        uint32_t dst_width = mlx5_flow_item_field_width(priv,
-                               action_modify_field->dst.field);
+                               action_modify_field->dst.field, -1);
        uint32_t src_width = mlx5_flow_item_field_width(priv,
-                               action_modify_field->src.field);
+                               action_modify_field->src.field, dst_width);
 
        ret = flow_dv_validate_action_modify_hdr(action_flags, action, error);
        if (ret)
@@ -5054,14 +4983,14 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev,
 }
 
 /*
- * Validate the port_id action.
+ * Validate action PORT_ID / REPRESENTED_PORT.
  *
  * @param[in] dev
  *   Pointer to rte_eth_dev structure.
  * @param[in] action_flags
  *   Bit-fields that holds the actions detected until now.
  * @param[in] action
- *   Port_id RTE action structure.
+ *   PORT_ID / REPRESENTED_PORT action structure.
  * @param[in] attr
  *   Attributes of flow that includes this action.
  * @param[out] error
@@ -5078,6 +5007,7 @@ flow_dv_validate_action_port_id(struct rte_eth_dev *dev,
                                struct rte_flow_error *error)
 {
        const struct rte_flow_action_port_id *port_id;
+       const struct rte_flow_action_ethdev *ethdev;
        struct mlx5_priv *act_priv;
        struct mlx5_priv *dev_priv;
        uint16_t port;
@@ -5086,13 +5016,13 @@ flow_dv_validate_action_port_id(struct rte_eth_dev *dev,
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
                                          NULL,
-                                         "port id action is valid in transfer"
+                                         "port action is valid in transfer"
                                          " mode only");
        if (!action || !action->conf)
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_ACTION_CONF,
                                          NULL,
-                                         "port id action parameters must be"
+                                         "port action parameters must be"
                                          " specified");
        if (action_flags & (MLX5_FLOW_FATE_ACTIONS |
                            MLX5_FLOW_FATE_ESWITCH_ACTIONS))
@@ -5106,13 +5036,27 @@ flow_dv_validate_action_port_id(struct rte_eth_dev *dev,
                                          RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
                                          NULL,
                                          "failed to obtain E-Switch info");
-       port_id = action->conf;
-       port = port_id->original ? dev->data->port_id : port_id->id;
+       switch (action->type) {
+       case RTE_FLOW_ACTION_TYPE_PORT_ID:
+               port_id = action->conf;
+               port = port_id->original ? dev->data->port_id : port_id->id;
+               break;
+       case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
+               ethdev = action->conf;
+               port = ethdev->port_id;
+               break;
+       default:
+               MLX5_ASSERT(false);
+               return rte_flow_error_set
+                               (error, EINVAL,
+                                RTE_FLOW_ERROR_TYPE_ACTION, action,
+                                "unknown E-Switch action");
+       }
        act_priv = mlx5_port_to_eswitch_info(port, false);
        if (!act_priv)
                return rte_flow_error_set
                                (error, rte_errno,
-                                RTE_FLOW_ERROR_TYPE_ACTION_CONF, port_id,
+                                RTE_FLOW_ERROR_TYPE_ACTION_CONF, action->conf,
                                 "failed to obtain E-Switch port id for port");
        if (act_priv->domain_id != dev_priv->domain_id)
                return rte_flow_error_set
@@ -5303,7 +5247,7 @@ flow_dv_validate_action_age(uint64_t action_flags,
        struct mlx5_priv *priv = dev->data->dev_private;
        const struct rte_flow_action_age *age = action->conf;
 
-       if (!priv->config.devx || (priv->sh->cmng.counter_fallback &&
+       if (!priv->sh->devx || (priv->sh->cmng.counter_fallback &&
            !priv->sh->aso_age_mng))
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -5485,7 +5429,7 @@ flow_dv_modify_create_cb(void *tool_ctx, void *cb_ctx)
        else
                ns = sh->rx_domain;
        ret = mlx5_flow_os_create_flow_action_modify_header
-                                       (sh->ctx, ns, entry,
+                                       (sh->cdev->ctx, ns, entry,
                                         data_len, &entry->action);
        if (ret) {
                mlx5_ipool_free(sh->mdh_ipools[ref->actions_num - 1], idx);
@@ -5588,7 +5532,7 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION, action,
                                          "ratio value starts from 1");
-       if (!priv->config.devx || (sample->ratio > 0 && !priv->sampler_en))
+       if (!priv->sh->devx || (sample->ratio > 0 && !priv->sampler_en))
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
                                          NULL,
@@ -5664,8 +5608,7 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
                        break;
                case RTE_FLOW_ACTION_TYPE_COUNT:
                        ret = flow_dv_validate_action_count
-                               (dev, is_shared_action_count(act),
-                                *action_flags | sub_action_flags,
+                               (dev, false, *action_flags | sub_action_flags,
                                 error);
                        if (ret < 0)
                                return ret;
@@ -5675,6 +5618,7 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
                        ++actions_n;
                        break;
                case RTE_FLOW_ACTION_TYPE_PORT_ID:
+               case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
                        ret = flow_dv_validate_action_port_id(dev,
                                                              sub_action_flags,
                                                              act,
@@ -6107,7 +6051,7 @@ flow_dv_counter_pool_prepare(struct rte_eth_dev *dev,
 
        if (fallback) {
                /* bulk_bitmap must be 0 for single counter allocation. */
-               dcs = mlx5_devx_cmd_flow_counter_alloc(priv->sh->ctx, 0);
+               dcs = mlx5_devx_cmd_flow_counter_alloc(priv->sh->cdev->ctx, 0);
                if (!dcs)
                        return NULL;
                pool = flow_dv_find_pool_by_id(cmng, dcs->id);
@@ -6125,7 +6069,7 @@ flow_dv_counter_pool_prepare(struct rte_eth_dev *dev,
                *cnt_free = cnt;
                return pool;
        }
-       dcs = mlx5_devx_cmd_flow_counter_alloc(priv->sh->ctx, 0x4);
+       dcs = mlx5_devx_cmd_flow_counter_alloc(priv->sh->cdev->ctx, 0x4);
        if (!dcs) {
                rte_errno = ENODATA;
                return NULL;
@@ -6172,7 +6116,7 @@ flow_dv_counter_alloc(struct rte_eth_dev *dev, uint32_t age)
                        age ? MLX5_COUNTER_TYPE_AGE : MLX5_COUNTER_TYPE_ORIGIN;
        uint32_t cnt_idx;
 
-       if (!priv->config.devx) {
+       if (!priv->sh->devx) {
                rte_errno = ENOTSUP;
                return 0;
        }
@@ -6236,60 +6180,6 @@ err:
        return 0;
 }
 
-/**
- * Allocate a shared flow counter.
- *
- * @param[in] ctx
- *   Pointer to the shared counter configuration.
- * @param[in] data
- *   Pointer to save the allocated counter index.
- *
- * @return
- *   Index to flow counter on success, 0 otherwise and rte_errno is set.
- */
-
-static int32_t
-flow_dv_counter_alloc_shared_cb(void *ctx, union mlx5_l3t_data *data)
-{
-       struct mlx5_shared_counter_conf *conf = ctx;
-       struct rte_eth_dev *dev = conf->dev;
-       struct mlx5_flow_counter *cnt;
-
-       data->dword = flow_dv_counter_alloc(dev, 0);
-       data->dword |= MLX5_CNT_SHARED_OFFSET;
-       cnt = flow_dv_counter_get_by_idx(dev, data->dword, NULL);
-       cnt->shared_info.id = conf->id;
-       return 0;
-}
-
-/**
- * Get a shared flow counter.
- *
- * @param[in] dev
- *   Pointer to the Ethernet device structure.
- * @param[in] id
- *   Counter identifier.
- *
- * @return
- *   Index to flow counter on success, 0 otherwise and rte_errno is set.
- */
-static uint32_t
-flow_dv_counter_get_shared(struct rte_eth_dev *dev, uint32_t id)
-{
-       struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_shared_counter_conf conf = {
-               .dev = dev,
-               .id = id,
-       };
-       union mlx5_l3t_data data = {
-               .dword = 0,
-       };
-
-       mlx5_l3t_prepare_entry(priv->sh->cnt_id_tbl, id, &data,
-                              flow_dv_counter_alloc_shared_cb, &conf);
-       return data.dword;
-}
-
 /**
  * Get age param from counter index.
  *
@@ -6372,27 +6262,16 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t counter)
        if (pool->is_aged) {
                flow_dv_counter_remove_from_age(dev, counter, cnt);
        } else {
-               /*
-                * If the counter action is shared by ID, the l3t_clear_entry
-                * function reduces its references counter. If after the
-                * reduction the action is still referenced, the function
-                * returns here and does not release it.
-                */
-               if (IS_LEGACY_SHARED_CNT(counter) &&
-                   mlx5_l3t_clear_entry(priv->sh->cnt_id_tbl,
-                                        cnt->shared_info.id))
-                       return;
                /*
                 * If the counter action is shared by indirect action API,
                 * the atomic function reduces its references counter.
                 * If after the reduction the action is still referenced, the
                 * function returns here and does not release it.
-                * When the counter action is not shared neither by ID nor by
+                * When the counter action is not shared by
                 * indirect action API, shared info is 1 before the reduction,
                 * so this condition is failed and function doesn't return here.
                 */
-               if (!IS_LEGACY_SHARED_CNT(counter) &&
-                   __atomic_sub_fetch(&cnt->shared_info.refcnt, 1,
+               if (__atomic_sub_fetch(&cnt->shared_info.refcnt, 1,
                                       __ATOMIC_RELAXED))
                        return;
        }
@@ -6473,20 +6352,19 @@ flow_dv_mtr_container_resize(struct rte_eth_dev *dev)
  *   NULL otherwise and rte_errno is set.
  */
 static struct mlx5_aso_mtr_pool *
-flow_dv_mtr_pool_create(struct rte_eth_dev *dev,
-                            struct mlx5_aso_mtr **mtr_free)
+flow_dv_mtr_pool_create(struct rte_eth_dev *dev, struct mlx5_aso_mtr **mtr_free)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_aso_mtr_pools_mng *pools_mng =
-                               &priv->sh->mtrmng->pools_mng;
+       struct mlx5_aso_mtr_pools_mng *pools_mng = &priv->sh->mtrmng->pools_mng;
        struct mlx5_aso_mtr_pool *pool = NULL;
        struct mlx5_devx_obj *dcs = NULL;
        uint32_t i;
        uint32_t log_obj_size;
 
        log_obj_size = rte_log2_u32(MLX5_ASO_MTRS_PER_POOL >> 1);
-       dcs = mlx5_devx_cmd_create_flow_meter_aso_obj(priv->sh->ctx,
-                       priv->sh->pdn, log_obj_size);
+       dcs = mlx5_devx_cmd_create_flow_meter_aso_obj(priv->sh->cdev->ctx,
+                                                     priv->sh->cdev->pdn,
+                                                     log_obj_size);
        if (!dcs) {
                rte_errno = ENODATA;
                return NULL;
@@ -6508,8 +6386,7 @@ flow_dv_mtr_pool_create(struct rte_eth_dev *dev,
        pools_mng->n_valid++;
        for (i = 1; i < MLX5_ASO_MTRS_PER_POOL; ++i) {
                pool->mtrs[i].offset = i;
-               LIST_INSERT_HEAD(&pools_mng->meters,
-                                               &pool->mtrs[i], next);
+               LIST_INSERT_HEAD(&pools_mng->meters, &pool->mtrs[i], next);
        }
        pool->mtrs[0].offset = 0;
        *mtr_free = &pool->mtrs[0];
@@ -6559,7 +6436,7 @@ flow_dv_mtr_alloc(struct rte_eth_dev *dev)
        struct mlx5_aso_mtr_pool *pool;
        uint32_t mtr_idx = 0;
 
-       if (!priv->config.devx) {
+       if (!priv->sh->devx) {
                rte_errno = ENOTSUP;
                return 0;
        }
@@ -6679,119 +6556,85 @@ flow_dv_validate_attributes(struct rte_eth_dev *dev,
        return ret;
 }
 
-static uint16_t
-mlx5_flow_locate_proto_l3(const struct rte_flow_item **head,
-                         const struct rte_flow_item *end)
+static int
+validate_integrity_bits(const struct rte_flow_item_integrity *mask,
+                       int64_t pattern_flags, uint64_t l3_flags,
+                       uint64_t l4_flags, uint64_t ip4_flag,
+                       struct rte_flow_error *error)
 {
-       const struct rte_flow_item *item = *head;
-       uint16_t l3_protocol;
+       if (mask->l3_ok && !(pattern_flags & l3_flags))
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM,
+                                         NULL, "missing L3 protocol");
+
+       if (mask->ipv4_csum_ok && !(pattern_flags & ip4_flag))
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM,
+                                         NULL, "missing IPv4 protocol");
+
+       if ((mask->l4_ok || mask->l4_csum_ok) && !(pattern_flags & l4_flags))
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM,
+                                         NULL, "missing L4 protocol");
 
-       for (; item != end; item++) {
-               switch (item->type) {
-               default:
-                       break;
-               case RTE_FLOW_ITEM_TYPE_IPV4:
-                       l3_protocol = RTE_ETHER_TYPE_IPV4;
-                       goto l3_ok;
-               case RTE_FLOW_ITEM_TYPE_IPV6:
-                       l3_protocol = RTE_ETHER_TYPE_IPV6;
-                       goto l3_ok;
-               case RTE_FLOW_ITEM_TYPE_ETH:
-                       if (item->mask && item->spec) {
-                               MLX5_ETHER_TYPE_FROM_HEADER(rte_flow_item_eth,
-                                                           type, item,
-                                                           l3_protocol);
-                               if (l3_protocol == RTE_ETHER_TYPE_IPV4 ||
-                                   l3_protocol == RTE_ETHER_TYPE_IPV6)
-                                       goto l3_ok;
-                       }
-                       break;
-               case RTE_FLOW_ITEM_TYPE_VLAN:
-                       if (item->mask && item->spec) {
-                               MLX5_ETHER_TYPE_FROM_HEADER(rte_flow_item_vlan,
-                                                           inner_type, item,
-                                                           l3_protocol);
-                               if (l3_protocol == RTE_ETHER_TYPE_IPV4 ||
-                                   l3_protocol == RTE_ETHER_TYPE_IPV6)
-                                       goto l3_ok;
-                       }
-                       break;
-               }
-       }
        return 0;
-l3_ok:
-       *head = item;
-       return l3_protocol;
 }
 
-static uint8_t
-mlx5_flow_locate_proto_l4(const struct rte_flow_item **head,
-                         const struct rte_flow_item *end)
+static int
+flow_dv_validate_item_integrity_post(const struct
+                                    rte_flow_item *integrity_items[2],
+                                    int64_t pattern_flags,
+                                    struct rte_flow_error *error)
 {
-       const struct rte_flow_item *item = *head;
-       uint8_t l4_protocol;
+       const struct rte_flow_item_integrity *mask;
+       int ret;
 
-       for (; item != end; item++) {
-               switch (item->type) {
-               default:
-                       break;
-               case RTE_FLOW_ITEM_TYPE_TCP:
-                       l4_protocol = IPPROTO_TCP;
-                       goto l4_ok;
-               case RTE_FLOW_ITEM_TYPE_UDP:
-                       l4_protocol = IPPROTO_UDP;
-                       goto l4_ok;
-               case RTE_FLOW_ITEM_TYPE_IPV4:
-                       if (item->mask && item->spec) {
-                               const struct rte_flow_item_ipv4 *mask, *spec;
-
-                               mask = (typeof(mask))item->mask;
-                               spec = (typeof(spec))item->spec;
-                               l4_protocol = mask->hdr.next_proto_id &
-                                             spec->hdr.next_proto_id;
-                               if (l4_protocol == IPPROTO_TCP ||
-                                   l4_protocol == IPPROTO_UDP)
-                                       goto l4_ok;
-                       }
-                       break;
-               case RTE_FLOW_ITEM_TYPE_IPV6:
-                       if (item->mask && item->spec) {
-                               const struct rte_flow_item_ipv6 *mask, *spec;
-                               mask = (typeof(mask))item->mask;
-                               spec = (typeof(spec))item->spec;
-                               l4_protocol = mask->hdr.proto & spec->hdr.proto;
-                               if (l4_protocol == IPPROTO_TCP ||
-                                   l4_protocol == IPPROTO_UDP)
-                                       goto l4_ok;
-                       }
-                       break;
-               }
+       if (pattern_flags & MLX5_FLOW_ITEM_OUTER_INTEGRITY) {
+               mask = (typeof(mask))integrity_items[0]->mask;
+               ret = validate_integrity_bits(mask, pattern_flags,
+                                             MLX5_FLOW_LAYER_OUTER_L3,
+                                             MLX5_FLOW_LAYER_OUTER_L4,
+                                             MLX5_FLOW_LAYER_OUTER_L3_IPV4,
+                                             error);
+               if (ret)
+                       return ret;
+       }
+       if (pattern_flags & MLX5_FLOW_ITEM_INNER_INTEGRITY) {
+               mask = (typeof(mask))integrity_items[1]->mask;
+               ret = validate_integrity_bits(mask, pattern_flags,
+                                             MLX5_FLOW_LAYER_INNER_L3,
+                                             MLX5_FLOW_LAYER_INNER_L4,
+                                             MLX5_FLOW_LAYER_INNER_L3_IPV4,
+                                             error);
+               if (ret)
+                       return ret;
        }
        return 0;
-l4_ok:
-       *head = item;
-       return l4_protocol;
 }
 
 static int
 flow_dv_validate_item_integrity(struct rte_eth_dev *dev,
-                               const struct rte_flow_item *rule_items,
                                const struct rte_flow_item *integrity_item,
+                               uint64_t pattern_flags, uint64_t *last_item,
+                               const struct rte_flow_item *integrity_items[2],
                                struct rte_flow_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       const struct rte_flow_item *tunnel_item, *end_item, *item = rule_items;
        const struct rte_flow_item_integrity *mask = (typeof(mask))
                                                     integrity_item->mask;
        const struct rte_flow_item_integrity *spec = (typeof(spec))
                                                     integrity_item->spec;
-       uint32_t protocol;
 
        if (!priv->config.hca_attr.pkt_integrity_match)
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_ITEM,
                                          integrity_item,
                                          "packet integrity integrity_item not supported");
+       if (!spec)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_ITEM,
+                                         integrity_item,
+                                         "no spec for integrity item");
        if (!mask)
                mask = &rte_flow_item_integrity_mask;
        if (!mlx5_validate_integrity_item(mask))
@@ -6799,34 +6642,22 @@ flow_dv_validate_item_integrity(struct rte_eth_dev *dev,
                                          RTE_FLOW_ERROR_TYPE_ITEM,
                                          integrity_item,
                                          "unsupported integrity filter");
-       tunnel_item = mlx5_flow_find_tunnel_item(rule_items);
        if (spec->level > 1) {
-               if (!tunnel_item)
-                       return rte_flow_error_set(error, ENOTSUP,
-                                                 RTE_FLOW_ERROR_TYPE_ITEM,
-                                                 integrity_item,
-                                                 "missing tunnel item");
-               item = tunnel_item;
-               end_item = mlx5_find_end_item(tunnel_item);
+               if (pattern_flags & MLX5_FLOW_ITEM_INNER_INTEGRITY)
+                       return rte_flow_error_set
+                               (error, ENOTSUP,
+                                RTE_FLOW_ERROR_TYPE_ITEM,
+                                NULL, "multiple inner integrity items not supported");
+               integrity_items[1] = integrity_item;
+               *last_item |= MLX5_FLOW_ITEM_INNER_INTEGRITY;
        } else {
-               end_item = tunnel_item ? tunnel_item :
-                          mlx5_find_end_item(integrity_item);
-       }
-       if (mask->l3_ok || mask->ipv4_csum_ok) {
-               protocol = mlx5_flow_locate_proto_l3(&item, end_item);
-               if (!protocol)
-                       return rte_flow_error_set(error, EINVAL,
-                                                 RTE_FLOW_ERROR_TYPE_ITEM,
-                                                 integrity_item,
-                                                 "missing L3 protocol");
-       }
-       if (mask->l4_ok || mask->l4_csum_ok) {
-               protocol = mlx5_flow_locate_proto_l4(&item, end_item);
-               if (!protocol)
-                       return rte_flow_error_set(error, EINVAL,
-                                                 RTE_FLOW_ERROR_TYPE_ITEM,
-                                                 integrity_item,
-                                                 "missing L4 protocol");
+               if (pattern_flags & MLX5_FLOW_ITEM_OUTER_INTEGRITY)
+                       return rte_flow_error_set
+                               (error, ENOTSUP,
+                                RTE_FLOW_ERROR_TYPE_ITEM,
+                                NULL, "multiple outer integrity items not supported");
+               integrity_items[0] = integrity_item;
+               *last_item |= MLX5_FLOW_ITEM_OUTER_INTEGRITY;
        }
        return 0;
 }
@@ -6923,7 +6754,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                .std_tbl_fix = true,
        };
        const struct rte_eth_hairpin_conf *conf;
-       const struct rte_flow_item *rule_items = items;
+       const struct rte_flow_item *integrity_items[2] = {NULL, NULL};
        const struct rte_flow_item *port_id_item = NULL;
        bool def_policy = false;
        uint16_t udp_dport = 0;
@@ -7250,16 +7081,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                        last_item = MLX5_FLOW_LAYER_ECPRI;
                        break;
                case RTE_FLOW_ITEM_TYPE_INTEGRITY:
-                       if (item_flags & MLX5_FLOW_ITEM_INTEGRITY)
-                               return rte_flow_error_set
-                                       (error, ENOTSUP,
-                                        RTE_FLOW_ERROR_TYPE_ITEM,
-                                        NULL, "multiple integrity items not supported");
-                       ret = flow_dv_validate_item_integrity(dev, rule_items,
-                                                             items, error);
+                       ret = flow_dv_validate_item_integrity(dev, items,
+                                                             item_flags,
+                                                             &last_item,
+                                                             integrity_items,
+                                                             error);
                        if (ret < 0)
                                return ret;
-                       last_item = MLX5_FLOW_ITEM_INTEGRITY;
                        break;
                case RTE_FLOW_ITEM_TYPE_CONNTRACK:
                        ret = flow_dv_validate_item_aso_ct(dev, items,
@@ -7279,6 +7107,12 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                }
                item_flags |= last_item;
        }
+       if (item_flags & MLX5_FLOW_ITEM_INTEGRITY) {
+               ret = flow_dv_validate_item_integrity_post(integrity_items,
+                                                          item_flags, error);
+               if (ret)
+                       return ret;
+       }
        for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
                int type = actions->type;
                bool shared_count = false;
@@ -7302,6 +7136,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                case RTE_FLOW_ACTION_TYPE_VOID:
                        break;
                case RTE_FLOW_ACTION_TYPE_PORT_ID:
+               case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
                        ret = flow_dv_validate_action_port_id(dev,
                                                              action_flags,
                                                              actions,
@@ -7432,8 +7267,9 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                        ++actions_n;
                        break;
                case MLX5_RTE_FLOW_ACTION_TYPE_COUNT:
+                       shared_count = true;
+                       /* fall-through. */
                case RTE_FLOW_ACTION_TYPE_COUNT:
-                       shared_count = is_shared_action_count(actions);
                        ret = flow_dv_validate_action_count(dev, shared_count,
                                                            action_flags,
                                                            error);
@@ -9181,7 +9017,7 @@ flow_dev_geneve_tlv_option_resource_register(struct rte_eth_dev *dev,
                }
        } else {
                /* Create a GENEVE TLV object and resource. */
-               obj = mlx5_devx_cmd_create_geneve_tlv_option(sh->ctx,
+               obj = mlx5_devx_cmd_create_geneve_tlv_option(sh->cdev->ctx,
                                geneve_opt_v->option_class,
                                geneve_opt_v->option_type,
                                geneve_opt_v->option_len);
@@ -9267,6 +9103,8 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *matcher,
                MLX5_SET(fte_match_set_misc, misc_v, geneve_opt_len,
                         geneve_opt_v->option_len + 1);
        }
+       MLX5_SET(fte_match_set_misc, misc_m, geneve_tlv_option_0_exist, 1);
+       MLX5_SET(fte_match_set_misc, misc_v, geneve_tlv_option_0_exist, 1);
        /* Set the data. */
        if (geneve_opt_v->data) {
                memcpy(&opt_data_key, geneve_opt_v->data,
@@ -9689,6 +9527,11 @@ flow_dv_translate_item_port_id(struct rte_eth_dev *dev, void *matcher,
        struct mlx5_priv *priv;
        uint16_t mask, id;
 
+       if (pid_v && pid_v->id == MLX5_PORT_ESW_MGR) {
+               flow_dv_translate_item_source_vport(matcher, key,
+                       flow_dv_get_esw_manager_vport_id(dev), 0xffff);
+               return 0;
+       }
        mask = pid_m ? pid_m->id : 0xffff;
        id = pid_v ? pid_v->id : dev->data->port_id;
        priv = mlx5_port_to_eswitch_info(id, item == NULL);
@@ -9951,14 +9794,14 @@ flow_dv_translate_item_gtp_psc(void *matcher, void *key,
                if (!gtp_psc_m)
                        gtp_psc_m = &rte_flow_item_gtp_psc_mask;
                dw_0.w32 = 0;
-               dw_0.type_flags = MLX5_GTP_PDU_TYPE_SHIFT(gtp_psc_m->pdu_type);
-               dw_0.qfi = gtp_psc_m->qfi;
+               dw_0.type_flags = MLX5_GTP_PDU_TYPE_SHIFT(gtp_psc_m->hdr.type);
+               dw_0.qfi = gtp_psc_m->hdr.qfi;
                MLX5_SET(fte_match_set_misc3, misc3_m, gtpu_first_ext_dw_0,
                         rte_cpu_to_be_32(dw_0.w32));
                dw_0.w32 = 0;
-               dw_0.type_flags = MLX5_GTP_PDU_TYPE_SHIFT(gtp_psc_v->pdu_type &
-                                                       gtp_psc_m->pdu_type);
-               dw_0.qfi = gtp_psc_v->qfi & gtp_psc_m->qfi;
+               dw_0.type_flags = MLX5_GTP_PDU_TYPE_SHIFT(gtp_psc_v->hdr.type &
+                                                       gtp_psc_m->hdr.type);
+               dw_0.qfi = gtp_psc_v->hdr.qfi & gtp_psc_m->hdr.qfi;
                MLX5_SET(fte_match_set_misc3, misc3_v, gtpu_first_ext_dw_0,
                         rte_cpu_to_be_32(dw_0.w32));
        }
@@ -9976,12 +9819,13 @@ flow_dv_translate_item_gtp_psc(void *matcher, void *key,
  *   Flow matcher value.
  * @param[in] item
  *   Flow pattern to translate.
- * @param[in] samples
- *   Sample IDs to be used in the matching.
+ * @param[in] last_item
+ *   Last item flags.
  */
 static void
 flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, void *matcher,
-                            void *key, const struct rte_flow_item *item)
+                            void *key, const struct rte_flow_item *item,
+                            uint64_t last_item)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
        const struct rte_flow_item_ecpri *ecpri_m = item->mask;
@@ -9994,6 +9838,22 @@ flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, void *matcher,
        void *dw_m;
        void *dw_v;
 
+       /*
+        * In case of eCPRI over Ethernet, if EtherType is not specified,
+        * match on eCPRI EtherType implicitly.
+        */
+       if (last_item & MLX5_FLOW_LAYER_OUTER_L2) {
+               void *hdrs_m, *hdrs_v, *l2m, *l2v;
+
+               hdrs_m = MLX5_ADDR_OF(fte_match_param, matcher, outer_headers);
+               hdrs_v = MLX5_ADDR_OF(fte_match_param, key, outer_headers);
+               l2m = MLX5_ADDR_OF(fte_match_set_lyr_2_4, hdrs_m, ethertype);
+               l2v = MLX5_ADDR_OF(fte_match_set_lyr_2_4, hdrs_v, ethertype);
+               if (*(uint16_t *)l2m == 0 && *(uint16_t *)l2v == 0) {
+                       *(uint16_t *)l2m = UINT16_MAX;
+                       *(uint16_t *)l2v = RTE_BE16(RTE_ETHER_TYPE_ECPRI);
+               }
+       }
        if (!ecpri_v)
                return;
        if (!ecpri_m)
@@ -10522,7 +10382,8 @@ flow_dv_matcher_create_cb(void *tool_ctx, void *cb_ctx)
        dv_attr.priority = ref->priority;
        if (tbl->is_egress)
                dv_attr.flags |= IBV_FLOW_ATTR_FLAGS_EGRESS;
-       ret = mlx5_flow_os_create_flow_matcher(sh->ctx, &dv_attr, tbl->tbl.obj,
+       ret = mlx5_flow_os_create_flow_matcher(sh->cdev->ctx, &dv_attr,
+                                              tbl->tbl.obj,
                                               &resource->matcher_object);
        if (ret) {
                mlx5_free(resource);
@@ -10757,12 +10618,12 @@ flow_dv_tag_release(struct rte_eth_dev *dev,
 }
 
 /**
- * Translate port ID action to vport.
+ * Translate action PORT_ID / REPRESENTED_PORT to vport.
  *
  * @param[in] dev
  *   Pointer to rte_eth_dev structure.
  * @param[in] action
- *   Pointer to the port ID action.
+ *   Pointer to action PORT_ID / REPRESENTED_PORT.
  * @param[out] dst_port_id
  *   The target port ID.
  * @param[out] error
@@ -10779,10 +10640,29 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev,
 {
        uint32_t port;
        struct mlx5_priv *priv;
-       const struct rte_flow_action_port_id *conf =
-                       (const struct rte_flow_action_port_id *)action->conf;
 
-       port = conf->original ? dev->data->port_id : conf->id;
+       switch (action->type) {
+       case RTE_FLOW_ACTION_TYPE_PORT_ID: {
+               const struct rte_flow_action_port_id *conf;
+
+               conf = (const struct rte_flow_action_port_id *)action->conf;
+               port = conf->original ? dev->data->port_id : conf->id;
+               break;
+       }
+       case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT: {
+               const struct rte_flow_action_ethdev *ethdev;
+
+               ethdev = (const struct rte_flow_action_ethdev *)action->conf;
+               port = ethdev->port_id;
+               break;
+       }
+       default:
+               MLX5_ASSERT(false);
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, action,
+                                         "unknown E-Switch action");
+       }
+
        priv = mlx5_port_to_eswitch_info(port, false);
        if (!priv)
                return rte_flow_error_set(error, -rte_errno,
@@ -10824,16 +10704,14 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev,
 static uint32_t
 flow_dv_translate_create_counter(struct rte_eth_dev *dev,
                                struct mlx5_flow *dev_flow,
-                               const struct rte_flow_action_count *count,
+                               const struct rte_flow_action_count *count
+                                       __rte_unused,
                                const struct rte_flow_action_age *age)
 {
        uint32_t counter;
        struct mlx5_age_param *age_param;
 
-       if (count && count->shared)
-               counter = flow_dv_counter_get_shared(dev, count->id);
-       else
-               counter = flow_dv_counter_alloc(dev, !!age);
+       counter = flow_dv_counter_alloc(dev, !!age);
        if (!counter || age == NULL)
                return counter;
        age_param = flow_dv_counter_idx_get_age(dev, counter);
@@ -10872,22 +10750,22 @@ flow_dv_translate_item_tx_queue(struct rte_eth_dev *dev,
        void *misc_v =
                MLX5_ADDR_OF(fte_match_param, key, misc_parameters);
        struct mlx5_txq_ctrl *txq;
-       uint32_t queue;
-
+       uint32_t queue, mask;
 
        queue_m = (const void *)item->mask;
-       if (!queue_m)
-               return;
        queue_v = (const void *)item->spec;
        if (!queue_v)
                return;
        txq = mlx5_txq_get(dev, queue_v->queue);
        if (!txq)
                return;
-       queue = txq->obj->sq->id;
-       MLX5_SET(fte_match_set_misc, misc_m, source_sqn, queue_m->queue);
-       MLX5_SET(fte_match_set_misc, misc_v, source_sqn,
-                queue & queue_m->queue);
+       if (txq->type == MLX5_TXQ_TYPE_HAIRPIN)
+               queue = txq->obj->sq->id;
+       else
+               queue = txq->obj->sq_obj.sq->id;
+       mask = queue_m == NULL ? UINT32_MAX : queue_m->queue;
+       MLX5_SET(fte_match_set_misc, misc_m, source_sqn, mask);
+       MLX5_SET(fte_match_set_misc, misc_v, source_sqn, queue & mask);
        mlx5_txq_release(dev, queue_v->queue);
 }
 
@@ -10915,9 +10793,9 @@ flow_dv_hashfields_set(struct mlx5_flow *dev_flow,
        if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L3_IPV4)) ||
            (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L3_IPV4))) {
                if (rss_types & MLX5_IPV4_LAYER_TYPES) {
-                       if (rss_types & ETH_RSS_L3_SRC_ONLY)
+                       if (rss_types & RTE_ETH_RSS_L3_SRC_ONLY)
                                dev_flow->hash_fields |= IBV_RX_HASH_SRC_IPV4;
-                       else if (rss_types & ETH_RSS_L3_DST_ONLY)
+                       else if (rss_types & RTE_ETH_RSS_L3_DST_ONLY)
                                dev_flow->hash_fields |= IBV_RX_HASH_DST_IPV4;
                        else
                                dev_flow->hash_fields |= MLX5_IPV4_IBV_RX_HASH;
@@ -10925,9 +10803,9 @@ flow_dv_hashfields_set(struct mlx5_flow *dev_flow,
        } else if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L3_IPV6)) ||
                   (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L3_IPV6))) {
                if (rss_types & MLX5_IPV6_LAYER_TYPES) {
-                       if (rss_types & ETH_RSS_L3_SRC_ONLY)
+                       if (rss_types & RTE_ETH_RSS_L3_SRC_ONLY)
                                dev_flow->hash_fields |= IBV_RX_HASH_SRC_IPV6;
-                       else if (rss_types & ETH_RSS_L3_DST_ONLY)
+                       else if (rss_types & RTE_ETH_RSS_L3_DST_ONLY)
                                dev_flow->hash_fields |= IBV_RX_HASH_DST_IPV6;
                        else
                                dev_flow->hash_fields |= MLX5_IPV6_IBV_RX_HASH;
@@ -10941,11 +10819,11 @@ flow_dv_hashfields_set(struct mlx5_flow *dev_flow,
                return;
        if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L4_UDP)) ||
            (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L4_UDP))) {
-               if (rss_types & ETH_RSS_UDP) {
-                       if (rss_types & ETH_RSS_L4_SRC_ONLY)
+               if (rss_types & RTE_ETH_RSS_UDP) {
+                       if (rss_types & RTE_ETH_RSS_L4_SRC_ONLY)
                                dev_flow->hash_fields |=
                                                IBV_RX_HASH_SRC_PORT_UDP;
-                       else if (rss_types & ETH_RSS_L4_DST_ONLY)
+                       else if (rss_types & RTE_ETH_RSS_L4_DST_ONLY)
                                dev_flow->hash_fields |=
                                                IBV_RX_HASH_DST_PORT_UDP;
                        else
@@ -10953,11 +10831,11 @@ flow_dv_hashfields_set(struct mlx5_flow *dev_flow,
                }
        } else if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L4_TCP)) ||
                   (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L4_TCP))) {
-               if (rss_types & ETH_RSS_TCP) {
-                       if (rss_types & ETH_RSS_L4_SRC_ONLY)
+               if (rss_types & RTE_ETH_RSS_TCP) {
+                       if (rss_types & RTE_ETH_RSS_L4_SRC_ONLY)
                                dev_flow->hash_fields |=
                                                IBV_RX_HASH_SRC_PORT_TCP;
-                       else if (rss_types & ETH_RSS_L4_DST_ONLY)
+                       else if (rss_types & RTE_ETH_RSS_L4_DST_ONLY)
                                dev_flow->hash_fields |=
                                                IBV_RX_HASH_DST_PORT_TCP;
                        else
@@ -11621,6 +11499,7 @@ flow_dv_translate_action_sample(struct rte_eth_dev *dev,
                        break;
                }
                case RTE_FLOW_ACTION_TYPE_PORT_ID:
+               case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
                {
                        struct mlx5_flow_dv_port_id_action_resource
                                        port_id_resource;
@@ -11941,8 +11820,8 @@ flow_dv_age_pool_create(struct rte_eth_dev *dev,
        struct mlx5_devx_obj *obj = NULL;
        uint32_t i;
 
-       obj = mlx5_devx_cmd_create_flow_hit_aso_obj(priv->sh->ctx,
-                                                   priv->sh->pdn);
+       obj = mlx5_devx_cmd_create_flow_hit_aso_obj(priv->sh->cdev->ctx,
+                                                   priv->sh->cdev->pdn);
        if (!obj) {
                rte_errno = ENODATA;
                DRV_LOG(ERR, "Failed to create flow_hit_aso_obj using DevX.");
@@ -12121,8 +12000,7 @@ flow_dv_translate_integrity_l4(const struct rte_flow_item_integrity *mask,
 static void
 flow_dv_translate_integrity_l3(const struct rte_flow_item_integrity *mask,
                               const struct rte_flow_item_integrity *value,
-                              void *headers_m, void *headers_v,
-                              bool is_ipv4)
+                              void *headers_m, void *headers_v, bool is_ipv4)
 {
        if (mask->l3_ok) {
                /* application l3_ok filter aggregates all hardware l3 filters
@@ -12153,45 +12031,66 @@ flow_dv_translate_integrity_l3(const struct rte_flow_item_integrity *mask,
 }
 
 static void
-flow_dv_translate_item_integrity(void *matcher, void *key,
-                                const struct rte_flow_item *head_item,
-                                const struct rte_flow_item *integrity_item)
+set_integrity_bits(void *headers_m, void *headers_v,
+                  const struct rte_flow_item *integrity_item, bool is_l3_ip4)
 {
+       const struct rte_flow_item_integrity *spec = integrity_item->spec;
        const struct rte_flow_item_integrity *mask = integrity_item->mask;
-       const struct rte_flow_item_integrity *value = integrity_item->spec;
-       const struct rte_flow_item *tunnel_item, *end_item, *item;
-       void *headers_m;
-       void *headers_v;
-       uint32_t l3_protocol;
 
-       if (!value)
-               return;
+       /* Integrity bits validation cleared spec pointer */
+       MLX5_ASSERT(spec != NULL);
        if (!mask)
                mask = &rte_flow_item_integrity_mask;
-       if (value->level > 1) {
+       flow_dv_translate_integrity_l3(mask, spec, headers_m, headers_v,
+                                      is_l3_ip4);
+       flow_dv_translate_integrity_l4(mask, spec, headers_m, headers_v);
+}
+
+static void
+flow_dv_translate_item_integrity_post(void *matcher, void *key,
+                                     const
+                                     struct rte_flow_item *integrity_items[2],
+                                     uint64_t pattern_flags)
+{
+       void *headers_m, *headers_v;
+       bool is_l3_ip4;
+
+       if (pattern_flags & MLX5_FLOW_ITEM_INNER_INTEGRITY) {
                headers_m = MLX5_ADDR_OF(fte_match_param, matcher,
                                         inner_headers);
                headers_v = MLX5_ADDR_OF(fte_match_param, key, inner_headers);
-       } else {
+               is_l3_ip4 = (pattern_flags & MLX5_FLOW_LAYER_INNER_L3_IPV4) !=
+                           0;
+               set_integrity_bits(headers_m, headers_v,
+                                  integrity_items[1], is_l3_ip4);
+       }
+       if (pattern_flags & MLX5_FLOW_ITEM_OUTER_INTEGRITY) {
                headers_m = MLX5_ADDR_OF(fte_match_param, matcher,
                                         outer_headers);
                headers_v = MLX5_ADDR_OF(fte_match_param, key, outer_headers);
+               is_l3_ip4 = (pattern_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV4) !=
+                           0;
+               set_integrity_bits(headers_m, headers_v,
+                                  integrity_items[0], is_l3_ip4);
        }
-       tunnel_item = mlx5_flow_find_tunnel_item(head_item);
-       if (value->level > 1) {
-               /* tunnel item was verified during the item validation */
-               item = tunnel_item;
-               end_item = mlx5_find_end_item(tunnel_item);
+}
+
+static void
+flow_dv_translate_item_integrity(const struct rte_flow_item *item,
+                                const struct rte_flow_item *integrity_items[2],
+                                uint64_t *last_item)
+{
+       const struct rte_flow_item_integrity *spec = (typeof(spec))item->spec;
+
+       /* integrity bits validation cleared spec pointer */
+       MLX5_ASSERT(spec != NULL);
+       if (spec->level > 1) {
+               integrity_items[1] = item;
+               *last_item |= MLX5_FLOW_ITEM_INNER_INTEGRITY;
        } else {
-               item = head_item;
-               end_item = tunnel_item ? tunnel_item :
-                          mlx5_find_end_item(integrity_item);
+               integrity_items[0] = item;
+               *last_item |= MLX5_FLOW_ITEM_OUTER_INTEGRITY;
        }
-       l3_protocol = mask->l3_ok ?
-                     mlx5_flow_locate_proto_l3(&item, end_item) : 0;
-       flow_dv_translate_integrity_l3(mask, value, headers_m, headers_v,
-                                      l3_protocol == RTE_ETHER_TYPE_IPV4);
-       flow_dv_translate_integrity_l4(mask, value, headers_m, headers_v);
 }
 
 /**
@@ -12285,17 +12184,27 @@ flow_dv_aso_ct_dev_release(struct rte_eth_dev *dev, uint32_t idx)
 }
 
 static inline int
-flow_dv_aso_ct_release(struct rte_eth_dev *dev, uint32_t own_idx)
+flow_dv_aso_ct_release(struct rte_eth_dev *dev, uint32_t own_idx,
+                      struct rte_flow_error *error)
 {
        uint16_t owner = (uint16_t)MLX5_INDIRECT_ACT_CT_GET_OWNER(own_idx);
        uint32_t idx = MLX5_INDIRECT_ACT_CT_GET_IDX(own_idx);
        struct rte_eth_dev *owndev = &rte_eth_devices[owner];
-       RTE_SET_USED(dev);
+       int ret;
 
        MLX5_ASSERT(owner < RTE_MAX_ETHPORTS);
        if (dev->data->dev_started != 1)
-               return -1;
-       return flow_dv_aso_ct_dev_release(owndev, idx);
+               return rte_flow_error_set(error, EAGAIN,
+                                         RTE_FLOW_ERROR_TYPE_ACTION,
+                                         NULL,
+                                         "Indirect CT action cannot be destroyed when the port is stopped");
+       ret = flow_dv_aso_ct_dev_release(owndev, idx);
+       if (ret < 0)
+               return rte_flow_error_set(error, EAGAIN,
+                                         RTE_FLOW_ERROR_TYPE_ACTION,
+                                         NULL,
+                                         "Current state prevents indirect CT action from being destroyed");
+       return ret;
 }
 
 /*
@@ -12359,8 +12268,9 @@ flow_dv_ct_pool_create(struct rte_eth_dev *dev,
        uint32_t i;
        uint32_t log_obj_size = rte_log2_u32(MLX5_ASO_CT_ACTIONS_PER_POOL);
 
-       obj = mlx5_devx_cmd_create_conn_track_offload_obj(priv->sh->ctx,
-                                               priv->sh->pdn, log_obj_size);
+       obj = mlx5_devx_cmd_create_conn_track_offload_obj(priv->sh->cdev->ctx,
+                                                         priv->sh->cdev->pdn,
+                                                         log_obj_size);
        if (!obj) {
                rte_errno = ENODATA;
                DRV_LOG(ERR, "Failed to create conn_track_offload_obj using DevX.");
@@ -12415,7 +12325,7 @@ flow_dv_aso_ct_alloc(struct rte_eth_dev *dev, struct rte_flow_error *error)
        uint32_t ct_idx;
 
        MLX5_ASSERT(mng);
-       if (!priv->config.devx) {
+       if (!priv->sh->devx) {
                rte_errno = ENOTSUP;
                return 0;
        }
@@ -12596,7 +12506,7 @@ flow_dv_translate(struct rte_eth_dev *dev,
                        (1 << MLX5_SCALE_FLOW_GROUP_BIT),
                .std_tbl_fix = true,
        };
-       const struct rte_flow_item *head_item = items;
+       const struct rte_flow_item *integrity_items[2] = {NULL, NULL};
 
        if (!wks)
                return rte_flow_error_set(error, ENOMEM,
@@ -12691,6 +12601,7 @@ flow_dv_translate(struct rte_eth_dev *dev,
                case RTE_FLOW_ACTION_TYPE_VOID:
                        break;
                case RTE_FLOW_ACTION_TYPE_PORT_ID:
+               case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
                        if (flow_dv_translate_action_port_id(dev, action,
                                                             &port_id, error))
                                return -rte_errno;
@@ -12811,10 +12722,13 @@ flow_dv_translate(struct rte_eth_dev *dev,
                                MLX5_FLOW_FATE_QUEUE;
                        break;
                case MLX5_RTE_FLOW_ACTION_TYPE_AGE:
-                       flow->age = (uint32_t)(uintptr_t)(action->conf);
-                       age_act = flow_aso_age_get_by_idx(dev, flow->age);
-                       __atomic_fetch_add(&age_act->refcnt, 1,
-                                          __ATOMIC_RELAXED);
+                       owner_idx = (uint32_t)(uintptr_t)action->conf;
+                       age_act = flow_aso_age_get_by_idx(dev, owner_idx);
+                       if (flow->age == 0) {
+                               flow->age = owner_idx;
+                               __atomic_fetch_add(&age_act->refcnt, 1,
+                                                  __ATOMIC_RELAXED);
+                       }
                        age_act_pos = actions_n++;
                        action_flags |= MLX5_FLOW_ACTION_AGE;
                        break;
@@ -12824,9 +12738,9 @@ flow_dv_translate(struct rte_eth_dev *dev,
                        action_flags |= MLX5_FLOW_ACTION_AGE;
                        break;
                case MLX5_RTE_FLOW_ACTION_TYPE_COUNT:
-                       cnt_act = flow_dv_counter_get_by_idx(dev,
-                                       (uint32_t)(uintptr_t)action->conf,
-                                       NULL);
+                       owner_idx = (uint32_t)(uintptr_t)action->conf;
+                       cnt_act = flow_dv_counter_get_by_idx(dev, owner_idx,
+                                                            NULL);
                        MLX5_ASSERT(cnt_act != NULL);
                        /**
                         * When creating meter drop flow in drop table, the
@@ -12837,16 +12751,18 @@ flow_dv_translate(struct rte_eth_dev *dev,
                                dev_flow->dv.actions[actions_n++] =
                                                        cnt_act->action;
                        } else {
-                               flow->counter =
-                                       (uint32_t)(uintptr_t)(action->conf);
-                               __atomic_fetch_add(&cnt_act->shared_info.refcnt,
-                                               1, __ATOMIC_RELAXED);
+                               if (flow->counter == 0) {
+                                       flow->counter = owner_idx;
+                                       __atomic_fetch_add
+                                               (&cnt_act->shared_info.refcnt,
+                                                1, __ATOMIC_RELAXED);
+                               }
                                /* Save information first, will apply later. */
                                action_flags |= MLX5_FLOW_ACTION_COUNT;
                        }
                        break;
                case RTE_FLOW_ACTION_TYPE_COUNT:
-                       if (!dev_conf->devx) {
+                       if (!priv->sh->devx) {
                                return rte_flow_error_set
                                              (error, ENOTSUP,
                                               RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
@@ -13163,9 +13079,13 @@ flow_dv_translate(struct rte_eth_dev *dev,
                        else
                                dev_flow->dv.actions[actions_n] =
                                                        ct->dr_action_rply;
-                       flow->indirect_type = MLX5_INDIRECT_ACTION_TYPE_CT;
-                       flow->ct = owner_idx;
-                       __atomic_fetch_add(&ct->refcnt, 1, __ATOMIC_RELAXED);
+                       if (flow->ct == 0) {
+                               flow->indirect_type =
+                                               MLX5_INDIRECT_ACTION_TYPE_CT;
+                               flow->ct = owner_idx;
+                               __atomic_fetch_add(&ct->refcnt, 1,
+                                                  __ATOMIC_RELAXED);
+                       }
                        actions_n++;
                        action_flags |= MLX5_FLOW_ACTION_CT;
                        break;
@@ -13184,8 +13104,7 @@ flow_dv_translate(struct rte_eth_dev *dev,
                         * when they are not shared.
                         */
                        if (action_flags & MLX5_FLOW_ACTION_AGE) {
-                               if ((non_shared_age &&
-                                    count && !count->shared) ||
+                               if ((non_shared_age && count) ||
                                    !(priv->sh->flow_hit_aso_en &&
                                      (attr->group || attr->transfer))) {
                                        /* Creates age by counters. */
@@ -13474,14 +13393,14 @@ flow_dv_translate(struct rte_eth_dev *dev,
                                                "cannot create eCPRI parser");
                        }
                        flow_dv_translate_item_ecpri(dev, match_mask,
-                                                    match_value, items);
+                                                    match_value, items,
+                                                    last_item);
                        /* No other protocol should follow eCPRI layer. */
                        last_item = MLX5_FLOW_LAYER_ECPRI;
                        break;
                case RTE_FLOW_ITEM_TYPE_INTEGRITY:
-                       flow_dv_translate_item_integrity(match_mask,
-                                                        match_value,
-                                                        head_item, items);
+                       flow_dv_translate_item_integrity(items, integrity_items,
+                                                        &last_item);
                        break;
                case RTE_FLOW_ITEM_TYPE_CONNTRACK:
                        flow_dv_translate_item_aso_ct(dev, match_mask,
@@ -13505,6 +13424,11 @@ flow_dv_translate(struct rte_eth_dev *dev,
                                                   match_value, NULL, attr))
                        return -rte_errno;
        }
+       if (item_flags & MLX5_FLOW_ITEM_INTEGRITY) {
+               flow_dv_translate_item_integrity_post(match_mask, match_value,
+                                                     integrity_items,
+                                                     item_flags);
+       }
 #ifdef RTE_LIBRTE_MLX5_DEBUG
        MLX5_ASSERT(!flow_dv_check_valid_spec(matcher.mask.buf,
                                              dev_flow->dv.value.buf));
@@ -13588,7 +13512,8 @@ flow_dv_translate(struct rte_eth_dev *dev,
        matcher.crc = rte_raw_cksum((const void *)matcher.mask.buf,
                                    matcher.mask.size);
        matcher.priority = mlx5_get_matcher_priority(dev, attr,
-                                       matcher.priority);
+                                                    matcher.priority,
+                                                    dev_flow->external);
        /**
         * When creating meter drop flow in drop table, using original
         * 5-tuple match, the matcher priority should be lower than
@@ -14345,7 +14270,7 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)
        }
        /* Keep the current age handling by default. */
        if (flow->indirect_type == MLX5_INDIRECT_ACTION_TYPE_CT && flow->ct)
-               flow_dv_aso_ct_release(dev, flow->ct);
+               flow_dv_aso_ct_release(dev, flow->ct, NULL);
        else if (flow->age)
                flow_dv_aso_age_release(dev, flow->age);
        if (flow->geneve_tlv_option) {
@@ -14475,9 +14400,9 @@ __flow_dv_action_rss_l34_hash_adjust(struct mlx5_shared_action_rss *rss,
        case MLX5_RSS_HASH_IPV4:
                if (rss_types & MLX5_IPV4_LAYER_TYPES) {
                        *hash_field &= ~MLX5_RSS_HASH_IPV4;
-                       if (rss_types & ETH_RSS_L3_DST_ONLY)
+                       if (rss_types & RTE_ETH_RSS_L3_DST_ONLY)
                                *hash_field |= IBV_RX_HASH_DST_IPV4;
-                       else if (rss_types & ETH_RSS_L3_SRC_ONLY)
+                       else if (rss_types & RTE_ETH_RSS_L3_SRC_ONLY)
                                *hash_field |= IBV_RX_HASH_SRC_IPV4;
                        else
                                *hash_field |= MLX5_RSS_HASH_IPV4;
@@ -14486,9 +14411,9 @@ __flow_dv_action_rss_l34_hash_adjust(struct mlx5_shared_action_rss *rss,
        case MLX5_RSS_HASH_IPV6:
                if (rss_types & MLX5_IPV6_LAYER_TYPES) {
                        *hash_field &= ~MLX5_RSS_HASH_IPV6;
-                       if (rss_types & ETH_RSS_L3_DST_ONLY)
+                       if (rss_types & RTE_ETH_RSS_L3_DST_ONLY)
                                *hash_field |= IBV_RX_HASH_DST_IPV6;
-                       else if (rss_types & ETH_RSS_L3_SRC_ONLY)
+                       else if (rss_types & RTE_ETH_RSS_L3_SRC_ONLY)
                                *hash_field |= IBV_RX_HASH_SRC_IPV6;
                        else
                                *hash_field |= MLX5_RSS_HASH_IPV6;
@@ -14497,11 +14422,11 @@ __flow_dv_action_rss_l34_hash_adjust(struct mlx5_shared_action_rss *rss,
        case MLX5_RSS_HASH_IPV4_UDP:
                /* fall-through. */
        case MLX5_RSS_HASH_IPV6_UDP:
-               if (rss_types & ETH_RSS_UDP) {
+               if (rss_types & RTE_ETH_RSS_UDP) {
                        *hash_field &= ~MLX5_UDP_IBV_RX_HASH;
-                       if (rss_types & ETH_RSS_L4_DST_ONLY)
+                       if (rss_types & RTE_ETH_RSS_L4_DST_ONLY)
                                *hash_field |= IBV_RX_HASH_DST_PORT_UDP;
-                       else if (rss_types & ETH_RSS_L4_SRC_ONLY)
+                       else if (rss_types & RTE_ETH_RSS_L4_SRC_ONLY)
                                *hash_field |= IBV_RX_HASH_SRC_PORT_UDP;
                        else
                                *hash_field |= MLX5_UDP_IBV_RX_HASH;
@@ -14510,11 +14435,11 @@ __flow_dv_action_rss_l34_hash_adjust(struct mlx5_shared_action_rss *rss,
        case MLX5_RSS_HASH_IPV4_TCP:
                /* fall-through. */
        case MLX5_RSS_HASH_IPV6_TCP:
-               if (rss_types & ETH_RSS_TCP) {
+               if (rss_types & RTE_ETH_RSS_TCP) {
                        *hash_field &= ~MLX5_TCP_IBV_RX_HASH;
-                       if (rss_types & ETH_RSS_L4_DST_ONLY)
+                       if (rss_types & RTE_ETH_RSS_L4_DST_ONLY)
                                *hash_field |= IBV_RX_HASH_DST_PORT_TCP;
-                       else if (rss_types & ETH_RSS_L4_SRC_ONLY)
+                       else if (rss_types & RTE_ETH_RSS_L4_SRC_ONLY)
                                *hash_field |= IBV_RX_HASH_SRC_PORT_TCP;
                        else
                                *hash_field |= MLX5_TCP_IBV_RX_HASH;
@@ -14662,8 +14587,8 @@ __flow_dv_action_rss_create(struct rte_eth_dev *dev,
        origin = &shared_rss->origin;
        origin->func = rss->func;
        origin->level = rss->level;
-       /* RSS type 0 indicates default RSS type (ETH_RSS_IP). */
-       origin->types = !rss->types ? ETH_RSS_IP : rss->types;
+       /* RSS type 0 indicates default RSS type (RTE_ETH_RSS_IP). */
+       origin->types = !rss->types ? RTE_ETH_RSS_IP : rss->types;
        /* NULL RSS key indicates default RSS key. */
        rss_key = !rss->key ? rss_hash_default_key : rss->key;
        memcpy(shared_rss->key, rss_key, MLX5_RSS_HASH_KEY_LEN);
@@ -14722,12 +14647,6 @@ __flow_dv_action_rss_release(struct rte_eth_dev *dev, uint32_t idx,
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
                                          "invalid shared action");
-       remaining = __flow_dv_action_rss_hrxqs_release(dev, shared_rss);
-       if (remaining)
-               return rte_flow_error_set(error, EBUSY,
-                                         RTE_FLOW_ERROR_TYPE_ACTION,
-                                         NULL,
-                                         "shared rss hrxq has references");
        if (!__atomic_compare_exchange_n(&shared_rss->refcnt, &old_refcnt,
                                         0, 0, __ATOMIC_ACQUIRE,
                                         __ATOMIC_RELAXED))
@@ -14735,6 +14654,12 @@ __flow_dv_action_rss_release(struct rte_eth_dev *dev, uint32_t idx,
                                          RTE_FLOW_ERROR_TYPE_ACTION,
                                          NULL,
                                          "shared rss has references");
+       remaining = __flow_dv_action_rss_hrxqs_release(dev, shared_rss);
+       if (remaining)
+               return rte_flow_error_set(error, EBUSY,
+                                         RTE_FLOW_ERROR_TYPE_ACTION,
+                                         NULL,
+                                         "shared rss hrxq has references");
        queue = shared_rss->ind_tbl->queues;
        remaining = mlx5_ind_table_obj_release(dev, shared_rss->ind_tbl, true);
        if (remaining)
@@ -14880,7 +14805,7 @@ flow_dv_action_destroy(struct rte_eth_dev *dev,
                                " released with references %d.", idx, ret);
                return 0;
        case MLX5_INDIRECT_ACTION_TYPE_CT:
-               ret = flow_dv_aso_ct_release(dev, idx);
+               ret = flow_dv_aso_ct_release(dev, idx, error);
                if (ret < 0)
                        return ret;
                if (ret > 0)
@@ -15099,7 +15024,7 @@ __flow_dv_destroy_sub_policy_rules(struct rte_eth_dev *dev,
                    policy->act_cnt[i].fate_action == MLX5_FLOW_FATE_MTR)
                        next_fm = mlx5_flow_meter_find(priv,
                                        policy->act_cnt[i].next_mtr_id, NULL);
-               TAILQ_FOREACH_SAFE(color_rule, &sub_policy->color_rules[i],
+               RTE_TAILQ_FOREACH_SAFE(color_rule, &sub_policy->color_rules[i],
                                   next_port, tmp) {
                        claim_zero(mlx5_flow_os_destroy_flow(color_rule->rule));
                        tbl = container_of(color_rule->matcher->tbl,
@@ -15442,6 +15367,7 @@ __flow_dv_create_domain_policy_acts(struct rte_eth_dev *dev,
                                break;
                        }
                        case RTE_FLOW_ACTION_TYPE_PORT_ID:
+                       case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
                        {
                                struct mlx5_flow_dv_port_id_action_resource
                                        port_id_resource;
@@ -15678,14 +15604,14 @@ flow_dv_create_mtr_policy_acts(struct rte_eth_dev *dev,
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-static int
+int
 flow_dv_query_count(struct rte_eth_dev *dev, uint32_t cnt_idx, void *data,
                    struct rte_flow_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
        struct rte_flow_query_count *qc = data;
 
-       if (!priv->config.devx)
+       if (!priv->sh->devx)
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
                                          NULL,
@@ -15716,6 +15642,48 @@ flow_dv_query_count(struct rte_eth_dev *dev, uint32_t cnt_idx, void *data,
                                  "counters are not available");
 }
 
+
+/**
+ * Query counter's action pointer for a DV flow rule via DevX.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ * @param[in] cnt_idx
+ *   Index to the flow counter.
+ * @param[out] action_ptr
+ *   Action pointer for counter.
+ * @param[out] error
+ *   Perform verbose error reporting if not NULL.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+flow_dv_query_count_ptr(struct rte_eth_dev *dev, uint32_t cnt_idx,
+       void **action_ptr, struct rte_flow_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+
+       if (!priv->sh->devx || !action_ptr)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                         NULL,
+                                         "counters are not supported");
+
+       if (cnt_idx) {
+               struct mlx5_flow_counter *cnt = NULL;
+               cnt = flow_dv_counter_get_by_idx(dev, cnt_idx, NULL);
+               if (cnt) {
+                       *action_ptr = cnt->action;
+                       return 0;
+               }
+       }
+       return rte_flow_error_set(error, EINVAL,
+                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                 NULL,
+                                 "counters are not available");
+}
+
 static int
 flow_dv_action_query(struct rte_eth_dev *dev,
                     const struct rte_flow_action_handle *handle, void *data,
@@ -17155,8 +17123,8 @@ mlx5_flow_discover_dr_action_support(struct rte_eth_dev *dev)
                goto err;
        dv_attr.match_criteria_enable = flow_dv_matcher_enable(mask.buf);
        __flow_dv_adjust_buf_size(&mask.size, dv_attr.match_criteria_enable);
-       ret = mlx5_flow_os_create_flow_matcher(sh->ctx, &dv_attr, tbl->obj,
-                                              &matcher);
+       ret = mlx5_flow_os_create_flow_matcher(sh->cdev->ctx, &dv_attr,
+                                              tbl->obj, &matcher);
        if (ret)
                goto err;
        __flow_dv_adjust_buf_size(&value.size, dv_attr.match_criteria_enable);
@@ -17224,7 +17192,7 @@ mlx5_flow_dv_discover_counter_offset_support(struct rte_eth_dev *dev)
                                        0, 0, 0, NULL);
        if (!tbl)
                goto err;
-       dcs = mlx5_devx_cmd_flow_counter_alloc(priv->sh->ctx, 0x4);
+       dcs = mlx5_devx_cmd_flow_counter_alloc(priv->sh->cdev->ctx, 0x4);
        if (!dcs)
                goto err;
        ret = mlx5_flow_os_create_flow_action_count(dcs->obj, UINT16_MAX,
@@ -17233,8 +17201,8 @@ mlx5_flow_dv_discover_counter_offset_support(struct rte_eth_dev *dev)
                goto err;
        dv_attr.match_criteria_enable = flow_dv_matcher_enable(mask.buf);
        __flow_dv_adjust_buf_size(&mask.size, dv_attr.match_criteria_enable);
-       ret = mlx5_flow_os_create_flow_matcher(sh->ctx, &dv_attr, tbl->obj,
-                                              &matcher);
+       ret = mlx5_flow_os_create_flow_matcher(sh->cdev->ctx, &dv_attr,
+                                              tbl->obj, &matcher);
        if (ret)
                goto err;
        __flow_dv_adjust_buf_size(&value.size, dv_attr.match_criteria_enable);
@@ -17298,7 +17266,7 @@ flow_dv_counter_query(struct rte_eth_dev *dev, uint32_t counter, bool clear,
        uint64_t inn_pkts, inn_bytes;
        int ret;
 
-       if (!priv->config.devx)
+       if (!priv->sh->devx)
                return -1;
 
        ret = _flow_dv_query_count(dev, counter, &inn_pkts, &inn_bytes);
@@ -17436,18 +17404,6 @@ flow_dv_action_validate(struct rte_eth_dev *dev,
                                                "Indirect age action not supported");
                return flow_dv_validate_action_age(0, action, dev, err);
        case RTE_FLOW_ACTION_TYPE_COUNT:
-               /*
-                * There are two mechanisms to share the action count.
-                * The old mechanism uses the shared field to share, while the
-                * new mechanism uses the indirect action API.
-                * This validation comes to make sure that the two mechanisms
-                * are not combined.
-                */
-               if (is_shared_action_count(action))
-                       return rte_flow_error_set(err, ENOTSUP,
-                                                 RTE_FLOW_ERROR_TYPE_ACTION,
-                                                 NULL,
-                                                 "Mix shared and indirect counter is not supported");
                return flow_dv_validate_action_count(dev, true, 0, err);
        case RTE_FLOW_ACTION_TYPE_CONNTRACK:
                if (!priv->sh->ct_aso_en)
@@ -17527,6 +17483,7 @@ flow_dv_validate_policy_mtr_hierarchy(struct rte_eth_dev *dev,
                                        RTE_MTR_ERROR_TYPE_POLICER_ACTION_GREEN,
                                        NULL,
                                        "Multiple fate actions not supported.");
+       *hierarchy_domain = 0;
        while (true) {
                fm = mlx5_flow_meter_find(priv, meter_id, NULL);
                if (!fm)
@@ -17539,7 +17496,12 @@ flow_dv_validate_policy_mtr_hierarchy(struct rte_eth_dev *dev,
                        "Non termination meter not supported in hierarchy.");
                policy = mlx5_flow_meter_policy_find(dev, fm->policy_id, NULL);
                MLX5_ASSERT(policy);
-               if (!policy->is_hierarchy) {
+               /**
+                * Only inherit the supported domains of the first meter in
+                * hierarchy.
+                * One meter supports at least one domain.
+                */
+               if (!*hierarchy_domain) {
                        if (policy->transfer)
                                *hierarchy_domain |=
                                                MLX5_MTR_DOMAIN_TRANSFER_BIT;
@@ -17548,6 +17510,8 @@ flow_dv_validate_policy_mtr_hierarchy(struct rte_eth_dev *dev,
                                                MLX5_MTR_DOMAIN_INGRESS_BIT;
                        if (policy->egress)
                                *hierarchy_domain |= MLX5_MTR_DOMAIN_EGRESS_BIT;
+               }
+               if (!policy->is_hierarchy) {
                        *is_rss = policy->is_rss;
                        break;
                }
@@ -17642,6 +17606,7 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev,
                                          NULL, "too many actions");
                        switch (act->type) {
                        case RTE_FLOW_ACTION_TYPE_PORT_ID:
+                       case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT:
                                if (!priv->config.dv_esw_en)
                                        return -rte_mtr_error_set(error,
                                        ENOTSUP,
@@ -17815,21 +17780,26 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev,
                                        "Doesn't support optional action");
                        }
                }
-               if (action_flags[i] & MLX5_FLOW_ACTION_PORT_ID)
+               if (action_flags[i] & MLX5_FLOW_ACTION_PORT_ID) {
                        domain_color[i] = MLX5_MTR_DOMAIN_TRANSFER_BIT;
-               else if ((action_flags[i] &
+               else if ((action_flags[i] &
                          (MLX5_FLOW_ACTION_RSS | MLX5_FLOW_ACTION_QUEUE)) ||
-                        (action_flags[i] & MLX5_FLOW_ACTION_MARK))
+                         (action_flags[i] & MLX5_FLOW_ACTION_MARK)) {
                        /*
                         * Only support MLX5_XMETA_MODE_LEGACY
                         * so MARK action is only in ingress domain.
                         */
                        domain_color[i] = MLX5_MTR_DOMAIN_INGRESS_BIT;
-               else if (action_flags[i] &
-                        MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY)
-                       domain_color[i] = hierarchy_domain;
-               else
+               } else {
                        domain_color[i] = def_domain;
+                       if (action_flags[i] &&
+                           !(action_flags[i] & MLX5_FLOW_FATE_ESWITCH_ACTIONS))
+                               domain_color[i] &=
+                               ~MLX5_MTR_DOMAIN_TRANSFER_BIT;
+               }
+               if (action_flags[i] &
+                   MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY)
+                       domain_color[i] &= hierarchy_domain;
                /*
                 * Non-termination actions only support NIC Tx domain.
                 * The adjustion should be skipped when there is no