net/mlx5: fix default context in flow age action
[dpdk.git] / drivers / net / mlx5 / mlx5_flow_dv.c
index 4fdcfce..7fc7efb 100644 (file)
@@ -21,6 +21,8 @@
 #include <rte_gtp.h>
 #include <rte_eal_paging.h>
 #include <rte_mpls.h>
+#include <rte_mtr.h>
+#include <rte_mtr_driver.h>
 
 #include <mlx5_glue.h>
 #include <mlx5_devx_cmds.h>
@@ -185,6 +187,31 @@ flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr,
        attr->valid = 1;
 }
 
+/**
+ * Convert rte_mtr_color to mlx5 color.
+ *
+ * @param[in] rcol
+ *   rte_mtr_color.
+ *
+ * @return
+ *   mlx5 color.
+ */
+static int
+rte_col_2_mlx5_col(enum rte_color rcol)
+{
+       switch (rcol) {
+       case RTE_COLOR_GREEN:
+               return MLX5_FLOW_COLOR_GREEN;
+       case RTE_COLOR_YELLOW:
+               return MLX5_FLOW_COLOR_YELLOW;
+       case RTE_COLOR_RED:
+               return MLX5_FLOW_COLOR_RED;
+       default:
+               break;
+       }
+       return MLX5_FLOW_COLOR_UNDEFINED;
+}
+
 struct field_modify_info {
        uint32_t size; /* Size of field in protocol header, in bytes. */
        uint32_t offset; /* Offset of field in protocol header, in bytes. */
@@ -241,6 +268,31 @@ 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,
@@ -1339,7 +1391,7 @@ mlx5_flow_item_field_width(enum rte_flow_field_id field)
        case RTE_FLOW_FIELD_TCP_ACK_NUM:
                return 32;
        case RTE_FLOW_FIELD_TCP_FLAGS:
-               return 6;
+               return 9;
        case RTE_FLOW_FIELD_UDP_PORT_SRC:
        case RTE_FLOW_FIELD_UDP_PORT_DST:
                return 16;
@@ -1661,10 +1713,10 @@ mlx5_flow_field_id_to_modify_info
                                                     (32 - width));
                break;
        case RTE_FLOW_FIELD_TCP_FLAGS:
-               info[idx] = (struct field_modify_info){1, 0,
+               info[idx] = (struct field_modify_info){2, 0,
                                        MLX5_MODI_OUT_TCP_FLAGS};
                if (mask)
-                       mask[idx] = 0x3f >> (6 - width);
+                       mask[idx] = rte_cpu_to_be_16(0x1ff >> (9 - width));
                break;
        case RTE_FLOW_FIELD_UDP_PORT_SRC:
                info[idx] = (struct field_modify_info){2, 0,
@@ -2571,6 +2623,51 @@ flow_dv_validate_item_ipv6_frag_ext(const struct rte_flow_item *item,
                                  "specified range not supported");
 }
 
+/*
+ * Validate ASO CT item.
+ *
+ * @param[in] dev
+ *   Pointer to the rte_eth_dev structure.
+ * @param[in] item
+ *   Item specification.
+ * @param[in] item_flags
+ *   Pointer to bit-fields that holds the items detected until now.
+ * @param[out] error
+ *   Pointer to error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_dv_validate_item_aso_ct(struct rte_eth_dev *dev,
+                            const struct rte_flow_item *item,
+                            uint64_t *item_flags,
+                            struct rte_flow_error *error)
+{
+       const struct rte_flow_item_conntrack *spec = item->spec;
+       const struct rte_flow_item_conntrack *mask = item->mask;
+       RTE_SET_USED(dev);
+       uint32_t flags;
+
+       if (*item_flags & MLX5_FLOW_LAYER_ASO_CT)
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+                                         "Only one CT is supported");
+       if (!mask)
+               mask = &rte_flow_item_conntrack_mask;
+       flags = spec->flags & mask->flags;
+       if ((flags & RTE_FLOW_CONNTRACK_PKT_STATE_VALID) &&
+           ((flags & RTE_FLOW_CONNTRACK_PKT_STATE_INVALID) ||
+            (flags & RTE_FLOW_CONNTRACK_PKT_STATE_BAD) ||
+            (flags & RTE_FLOW_CONNTRACK_PKT_STATE_DISABLED)))
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+                                         "Conflict status bits");
+       /* State change also needs to be considered. */
+       *item_flags |= MLX5_FLOW_LAYER_ASO_CT;
+       return 0;
+}
+
 /**
  * Validate the pop VLAN action.
  *
@@ -3119,13 +3216,33 @@ 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.
  *
  * @param[in] dev
  *   Pointer to rte_eth_dev structure.
- * @param[in] action
- *   Pointer to the action structure.
+ * @param[in] shared
+ *   Indicator if action is shared.
  * @param[in] action_flags
  *   Holds the actions detected until now.
  * @param[out] error
@@ -3135,13 +3252,11 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-flow_dv_validate_action_count(struct rte_eth_dev *dev,
-                             const struct rte_flow_action *action,
+flow_dv_validate_action_count(struct rte_eth_dev *dev, bool shared,
                              uint64_t action_flags,
                              struct rte_flow_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       const struct rte_flow_action_count *count;
 
        if (!priv->config.devx)
                goto notsup_err;
@@ -3149,8 +3264,7 @@ flow_dv_validate_action_count(struct rte_eth_dev *dev,
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
                                          "duplicate count actions set");
-       count = (const struct rte_flow_action_count *)action->conf;
-       if (count && count->shared && (action_flags & MLX5_FLOW_ACTION_AGE) &&
+       if (shared && (action_flags & MLX5_FLOW_ACTION_AGE) &&
            !priv->sh->flow_hit_aso_en)
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
@@ -3373,6 +3487,57 @@ flow_dv_validate_action_raw_encap_decap
        return 0;
 }
 
+/*
+ * Validate the ASO CT action.
+ *
+ * @param[in] dev
+ *   Pointer to the rte_eth_dev structure.
+ * @param[in] action_flags
+ *   Holds the actions detected until now.
+ * @param[in] item_flags
+ *   The items found in this flow rule.
+ * @param[in] attr
+ *   Pointer to flow attributes.
+ * @param[out] error
+ *   Pointer to error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_dv_validate_action_aso_ct(struct rte_eth_dev *dev,
+                              uint64_t action_flags,
+                              uint64_t item_flags,
+                              const struct rte_flow_attr *attr,
+                              struct rte_flow_error *error)
+{
+       RTE_SET_USED(dev);
+
+       if (attr->group == 0 && !attr->transfer)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                         NULL,
+                                         "Only support non-root table");
+       if (action_flags & MLX5_FLOW_FATE_ACTIONS)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "CT cannot follow a fate action");
+       if ((action_flags & MLX5_FLOW_ACTION_METER) ||
+           (action_flags & MLX5_FLOW_ACTION_AGE))
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "Only one ASO action is supported");
+       if (action_flags & MLX5_FLOW_ACTION_ENCAP)
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "Encap cannot exist before CT");
+       if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L4_TCP))
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                         "Not a outer TCP packet");
+       return 0;
+}
+
 /**
  * Match encap_decap resource.
  *
@@ -4696,10 +4861,6 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev,
                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
                                          "can't have 2 fate actions in"
                                          " same flow");
-       if (action_flags & MLX5_FLOW_ACTION_METER)
-               return rte_flow_error_set(error, ENOTSUP,
-                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
-                                         "jump with meter not support");
        if (!action->conf)
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION_CONF,
@@ -4837,11 +4998,14 @@ mlx5_flow_validate_action_meter(struct rte_eth_dev *dev,
                                uint64_t action_flags,
                                const struct rte_flow_action *action,
                                const struct rte_flow_attr *attr,
+                               bool *def_policy,
                                struct rte_flow_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
        const struct rte_flow_action_meter *am = action->conf;
        struct mlx5_flow_meter_info *fm;
+       struct mlx5_flow_meter_policy *mtr_policy;
+       struct mlx5_flow_mtr_mng *mtrmng = priv->sh->mtrmng;
 
        if (!am)
                return rte_flow_error_set(error, EINVAL,
@@ -4872,10 +5036,40 @@ mlx5_flow_validate_action_meter(struct rte_eth_dev *dev,
              (!fm->ingress && !attr->ingress && attr->egress) ||
              (!fm->egress && !attr->egress && attr->ingress)))
                return rte_flow_error_set(error, EINVAL,
+                       RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                       "Flow attributes domain are either invalid "
+                       "or have a domain conflict with current "
+                       "meter attributes");
+       if (fm->def_policy) {
+               if (!((attr->transfer &&
+                       mtrmng->def_policy[MLX5_MTR_DOMAIN_TRANSFER]) ||
+                       (attr->egress &&
+                       mtrmng->def_policy[MLX5_MTR_DOMAIN_EGRESS]) ||
+                       (attr->ingress &&
+                       mtrmng->def_policy[MLX5_MTR_DOMAIN_INGRESS])))
+                       return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "Flow attributes domain "
+                                         "have a conflict with current "
+                                         "meter domain attributes");
+               *def_policy = true;
+       } else {
+               mtr_policy = mlx5_flow_meter_policy_find(dev,
+                                               fm->policy_id, NULL);
+               if (!mtr_policy)
+                       return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "Invalid policy id for meter ");
+               if (!((attr->transfer && mtr_policy->transfer) ||
+                       (attr->egress && mtr_policy->egress) ||
+                       (attr->ingress && mtr_policy->ingress)))
+                       return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
-                                         "Flow attributes are either invalid "
-                                         "or have a conflict with current "
-                                         "meter attributes");
+                                         "Flow attributes domain "
+                                         "have a conflict with current "
+                                         "meter domain attributes");
+               *def_policy = false;
+       }
        return 0;
 }
 
@@ -5198,7 +5392,7 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
                        break;
                case RTE_FLOW_ACTION_TYPE_COUNT:
                        ret = flow_dv_validate_action_count
-                               (dev, act,
+                               (dev, is_shared_action_count(act),
                                 *action_flags | sub_action_flags,
                                 error);
                        if (ret < 0)
@@ -5368,7 +5562,7 @@ flow_dv_modify_hdr_resource_register
  * @param[in] idx
  *   mlx5 flow counter index in the container.
  * @param[out] ppool
- *   mlx5 flow counter pool in the container,
+ *   mlx5 flow counter pool in the container.
  *
  * @return
  *   Pointer to the counter, NULL otherwise.
@@ -5498,7 +5692,7 @@ flow_dv_container_resize(struct rte_eth_dev *dev)
  *
  * @param[in] dev
  *   Pointer to the Ethernet device structure.
- * @param[in] cnt
+ * @param[in] counter
  *   Index to the flow counter.
  * @param[out] pkts
  *   The statistics value of packets.
@@ -5739,6 +5933,13 @@ flow_dv_counter_alloc(struct rte_eth_dev *dev, uint32_t age)
        if (!fallback && !priv->sh->cmng.query_thread_on)
                /* Start the asynchronous batch query by the host thread. */
                mlx5_set_query_alarm(priv->sh);
+       /*
+        * When the count action isn't shared (by ID), shared_info field is
+        * used for indirect action API's refcnt.
+        * When the counter action is not shared neither by ID nor by indirect
+        * action API, shared info must be 1.
+        */
+       cnt_free->shared_info.refcnt = 1;
        return cnt_idx;
 err:
        if (cnt_free) {
@@ -5885,9 +6086,26 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t counter)
                return;
        cnt = flow_dv_counter_get_by_idx(dev, counter, &pool);
        MLX5_ASSERT(pool);
-       if (IS_SHARED_CNT(counter) &&
+       /*
+        * 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 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, __ATOMIC_RELAXED))
+               return;
        if (pool->is_aged)
                flow_dv_counter_remove_from_age(dev, counter, cnt);
        cnt->pool = pool;
@@ -5899,7 +6117,6 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t counter)
         * container counter list. The list changes while query starts. In
         * this case, lock will not be needed as query callback and release
         * function both operate with the different list.
-        *
         */
        if (!priv->sh->cmng.counter_fallback) {
                rte_spinlock_lock(&pool->csl);
@@ -5929,9 +6146,10 @@ static int
 flow_dv_mtr_container_resize(struct rte_eth_dev *dev)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_aso_mtr_pools_mng *mtrmng = priv->sh->mtrmng;
-       void *old_pools = mtrmng->pools;
-       uint32_t resize = mtrmng->n + MLX5_MTRS_CONTAINER_RESIZE;
+       struct mlx5_aso_mtr_pools_mng *pools_mng =
+                               &priv->sh->mtrmng->pools_mng;
+       void *old_pools = pools_mng->pools;
+       uint32_t resize = pools_mng->n + MLX5_MTRS_CONTAINER_RESIZE;
        uint32_t mem_size = sizeof(struct mlx5_aso_mtr_pool *) * resize;
        void *pools = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, SOCKET_ID_ANY);
 
@@ -5939,16 +6157,16 @@ flow_dv_mtr_container_resize(struct rte_eth_dev *dev)
                rte_errno = ENOMEM;
                return -ENOMEM;
        }
-       if (!mtrmng->n)
+       if (!pools_mng->n)
                if (mlx5_aso_queue_init(priv->sh, ASO_OPC_MOD_POLICER)) {
                        mlx5_free(pools);
                        return -ENOMEM;
                }
        if (old_pools)
-               memcpy(pools, old_pools, mtrmng->n *
+               memcpy(pools, old_pools, pools_mng->n *
                                       sizeof(struct mlx5_aso_mtr_pool *));
-       mtrmng->n = resize;
-       mtrmng->pools = pools;
+       pools_mng->n = resize;
+       pools_mng->pools = pools;
        if (old_pools)
                mlx5_free(old_pools);
        return 0;
@@ -5971,7 +6189,8 @@ 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 *mtrmng = priv->sh->mtrmng;
+       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;
@@ -5991,17 +6210,17 @@ flow_dv_mtr_pool_create(struct rte_eth_dev *dev,
                return NULL;
        }
        pool->devx_obj = dcs;
-       pool->index = mtrmng->n_valid;
-       if (pool->index == mtrmng->n && flow_dv_mtr_container_resize(dev)) {
+       pool->index = pools_mng->n_valid;
+       if (pool->index == pools_mng->n && flow_dv_mtr_container_resize(dev)) {
                mlx5_free(pool);
                claim_zero(mlx5_devx_cmd_destroy(dcs));
                return NULL;
        }
-       mtrmng->pools[pool->index] = pool;
-       mtrmng->n_valid++;
+       pools_mng->pools[pool->index] = pool;
+       pools_mng->n_valid++;
        for (i = 1; i < MLX5_ASO_MTRS_PER_POOL; ++i) {
                pool->mtrs[i].offset = i;
-               LIST_INSERT_HEAD(&mtrmng->meters,
+               LIST_INSERT_HEAD(&pools_mng->meters,
                                                &pool->mtrs[i], next);
        }
        pool->mtrs[0].offset = 0;
@@ -6021,15 +6240,16 @@ static void
 flow_dv_aso_mtr_release_to_pool(struct rte_eth_dev *dev, uint32_t mtr_idx)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_aso_mtr_pools_mng *mtrmng = priv->sh->mtrmng;
+       struct mlx5_aso_mtr_pools_mng *pools_mng =
+                               &priv->sh->mtrmng->pools_mng;
        struct mlx5_aso_mtr *aso_mtr = mlx5_aso_meter_by_idx(priv, mtr_idx);
 
        MLX5_ASSERT(aso_mtr);
-       rte_spinlock_lock(&mtrmng->mtrsl);
+       rte_spinlock_lock(&pools_mng->mtrsl);
        memset(&aso_mtr->fm, 0, sizeof(struct mlx5_flow_meter_info));
        aso_mtr->state = ASO_METER_FREE;
-       LIST_INSERT_HEAD(&mtrmng->meters, aso_mtr, next);
-       rte_spinlock_unlock(&mtrmng->mtrsl);
+       LIST_INSERT_HEAD(&pools_mng->meters, aso_mtr, next);
+       rte_spinlock_unlock(&pools_mng->mtrsl);
 }
 
 /**
@@ -6046,7 +6266,8 @@ flow_dv_mtr_alloc(struct rte_eth_dev *dev)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_aso_mtr *mtr_free = NULL;
-       struct mlx5_aso_mtr_pools_mng *mtrmng = priv->sh->mtrmng;
+       struct mlx5_aso_mtr_pools_mng *pools_mng =
+                               &priv->sh->mtrmng->pools_mng;
        struct mlx5_aso_mtr_pool *pool;
        uint32_t mtr_idx = 0;
 
@@ -6056,16 +6277,16 @@ flow_dv_mtr_alloc(struct rte_eth_dev *dev)
        }
        /* Allocate the flow meter memory. */
        /* Get free meters from management. */
-       rte_spinlock_lock(&mtrmng->mtrsl);
-       mtr_free = LIST_FIRST(&mtrmng->meters);
+       rte_spinlock_lock(&pools_mng->mtrsl);
+       mtr_free = LIST_FIRST(&pools_mng->meters);
        if (mtr_free)
                LIST_REMOVE(mtr_free, next);
        if (!mtr_free && !flow_dv_mtr_pool_create(dev, &mtr_free)) {
-               rte_spinlock_unlock(&mtrmng->mtrsl);
+               rte_spinlock_unlock(&pools_mng->mtrsl);
                return 0;
        }
        mtr_free->state = ASO_METER_WAIT;
-       rte_spinlock_unlock(&mtrmng->mtrsl);
+       rte_spinlock_unlock(&pools_mng->mtrsl);
        pool = container_of(mtr_free,
                        struct mlx5_aso_mtr_pool,
                        mtrs[mtr_free->offset]);
@@ -6170,6 +6391,158 @@ 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)
+{
+       const struct rte_flow_item *item = *head;
+       uint16_t l3_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)
+{
+       const struct rte_flow_item *item = *head;
+       uint8_t l4_protocol;
+
+       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;
+               }
+       }
+       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,
+                               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 (!mask)
+               mask = &rte_flow_item_integrity_mask;
+       if (!mlx5_validate_integrity_item(mask))
+               return rte_flow_error_set(error, ENOTSUP,
+                                         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);
+       } 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");
+       }
+       return 0;
+}
+
 /**
  * Internal validation function. For validating both actions and items.
  *
@@ -6214,7 +6587,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
        const struct rte_flow_action_raw_encap *encap;
        const struct rte_flow_action_rss *rss = NULL;
        const struct rte_flow_action_rss *sample_rss = NULL;
-       const struct rte_flow_action_count *count = NULL;
        const struct rte_flow_action_count *sample_count = NULL;
        const struct rte_flow_item_tcp nic_tcp_mask = {
                .hdr = {
@@ -6255,32 +6627,35 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
        uint32_t rw_act_num = 0;
        uint64_t is_root;
        const struct mlx5_flow_tunnel *tunnel;
+       enum mlx5_tof_rule_type tof_rule_type;
        struct flow_grp_info grp_info = {
                .external = !!external,
                .transfer = !!attr->transfer,
                .fdb_def_rule = !!priv->fdb_def_rule,
+               .std_tbl_fix = true,
        };
        const struct rte_eth_hairpin_conf *conf;
+       const struct rte_flow_item *rule_items = items;
+       bool def_policy = false;
 
        if (items == NULL)
                return -1;
-       if (is_flow_tunnel_match_rule(dev, attr, items, actions)) {
-               tunnel = flow_items_to_tunnel(items);
-               action_flags |= MLX5_FLOW_ACTION_TUNNEL_MATCH |
-                               MLX5_FLOW_ACTION_DECAP;
-       } else if (is_flow_tunnel_steer_rule(dev, attr, items, actions)) {
-               tunnel = flow_actions_to_tunnel(actions);
-               action_flags |= MLX5_FLOW_ACTION_TUNNEL_SET;
-       } else {
-               tunnel = NULL;
+       tunnel = is_tunnel_offload_active(dev) ?
+                mlx5_get_tof(items, actions, &tof_rule_type) : NULL;
+       if (tunnel) {
+               if (priv->representor)
+                       return rte_flow_error_set
+                               (error, ENOTSUP,
+                                RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                NULL, "decap not supported for VF representor");
+               if (tof_rule_type == MLX5_TUNNEL_OFFLOAD_SET_RULE)
+                       action_flags |= MLX5_FLOW_ACTION_TUNNEL_SET;
+               else if (tof_rule_type == MLX5_TUNNEL_OFFLOAD_MATCH_RULE)
+                       action_flags |= MLX5_FLOW_ACTION_TUNNEL_MATCH |
+                                       MLX5_FLOW_ACTION_DECAP;
+               grp_info.std_tbl_fix = tunnel_use_standard_attr_group_translate
+                                       (dev, attr, tunnel, tof_rule_type);
        }
-       if (tunnel && priv->representor)
-               return rte_flow_error_set(error, ENOTSUP,
-                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
-                                         "decap not supported "
-                                         "for VF representor");
-       grp_info.std_tbl_fix = tunnel_use_standard_attr_group_translate
-                               (dev, tunnel, attr, items, actions);
        ret = flow_dv_validate_attributes(dev, tunnel, attr, &grp_info, error);
        if (ret < 0)
                return ret;
@@ -6294,15 +6669,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                                                  RTE_FLOW_ERROR_TYPE_ITEM,
                                                  NULL, "item not supported");
                switch (type) {
-               case MLX5_RTE_FLOW_ITEM_TYPE_TUNNEL:
-                       if (items[0].type != (typeof(items[0].type))
-                                               MLX5_RTE_FLOW_ITEM_TYPE_TUNNEL)
-                               return rte_flow_error_set
-                                               (error, EINVAL,
-                                               RTE_FLOW_ERROR_TYPE_ITEM,
-                                               NULL, "MLX5 private items "
-                                               "must be the first");
-                       break;
                case RTE_FLOW_ITEM_TYPE_VOID:
                        break;
                case RTE_FLOW_ITEM_TYPE_PORT_ID:
@@ -6583,6 +6949,29 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                                return ret;
                        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);
+                       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,
+                                                          &item_flags, error);
+                       if (ret < 0)
+                               return ret;
+                       break;
+               case MLX5_RTE_FLOW_ITEM_TYPE_TUNNEL:
+                       /* tunnel offload item was processed before
+                        * list it here as a supported type
+                        */
+                       break;
                default:
                        return rte_flow_error_set(error, ENOTSUP,
                                                  RTE_FLOW_ERROR_TYPE_ITEM,
@@ -6592,6 +6981,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
        }
        for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
                int type = actions->type;
+               bool shared_count = false;
 
                if (!mlx5_flow_os_action_supported(type))
                        return rte_flow_error_set(error, ENOTSUP,
@@ -6602,6 +6992,12 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                        return rte_flow_error_set(error, ENOTSUP,
                                                  RTE_FLOW_ERROR_TYPE_ACTION,
                                                  actions, "too many actions");
+               if (action_flags &
+                       MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY)
+                       return rte_flow_error_set(error, ENOTSUP,
+                               RTE_FLOW_ERROR_TYPE_ACTION,
+                               NULL, "meter action with policy "
+                               "must be the last action");
                switch (type) {
                case RTE_FLOW_ACTION_TYPE_VOID:
                        break;
@@ -6735,13 +7131,14 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                        action_flags |= MLX5_FLOW_ACTION_DEFAULT_MISS;
                        ++actions_n;
                        break;
+               case MLX5_RTE_FLOW_ACTION_TYPE_COUNT:
                case RTE_FLOW_ACTION_TYPE_COUNT:
-                       ret = flow_dv_validate_action_count(dev, actions,
+                       shared_count = is_shared_action_count(actions);
+                       ret = flow_dv_validate_action_count(dev, shared_count,
                                                            action_flags,
                                                            error);
                        if (ret < 0)
                                return ret;
-                       count = actions->conf;
                        action_flags |= MLX5_FLOW_ACTION_COUNT;
                        ++actions_n;
                        break;
@@ -7017,10 +7414,14 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                        ret = mlx5_flow_validate_action_meter(dev,
                                                              action_flags,
                                                              actions, attr,
+                                                             &def_policy,
                                                              error);
                        if (ret < 0)
                                return ret;
                        action_flags |= MLX5_FLOW_ACTION_METER;
+                       if (!def_policy)
+                               action_flags |=
+                               MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY;
                        ++actions_n;
                        /* Meter action will add one more TAG action. */
                        rw_act_num += MLX5_ACT_NUM_SET_TAG;
@@ -7031,6 +7432,12 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                                                RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
                                                                           NULL,
                          "Shared ASO age action is not supported for group 0");
+                       if (action_flags & MLX5_FLOW_ACTION_AGE)
+                               return rte_flow_error_set
+                                                 (error, EINVAL,
+                                                  RTE_FLOW_ERROR_TYPE_ACTION,
+                                                  NULL,
+                                                  "duplicate age actions set");
                        action_flags |= MLX5_FLOW_ACTION_AGE;
                        ++actions_n;
                        break;
@@ -7045,7 +7452,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                         * mutual exclusion with share counter actions.
                         */
                        if (!priv->sh->flow_hit_aso_en) {
-                               if (count && count->shared)
+                               if (shared_count)
                                        return rte_flow_error_set
                                                (error, EINVAL,
                                                RTE_FLOW_ERROR_TYPE_ACTION,
@@ -7106,17 +7513,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                        action_flags |= MLX5_FLOW_ACTION_SAMPLE;
                        ++actions_n;
                        break;
-               case MLX5_RTE_FLOW_ACTION_TYPE_TUNNEL_SET:
-                       if (actions[0].type != (typeof(actions[0].type))
-                               MLX5_RTE_FLOW_ACTION_TYPE_TUNNEL_SET)
-                               return rte_flow_error_set
-                                               (error, EINVAL,
-                                               RTE_FLOW_ERROR_TYPE_ACTION,
-                                               NULL, "MLX5 private action "
-                                               "must be the first");
-
-                       action_flags |= MLX5_FLOW_ACTION_TUNNEL_SET;
-                       break;
                case RTE_FLOW_ACTION_TYPE_MODIFY_FIELD:
                        ret = flow_dv_validate_action_modify_field(dev,
                                                                   action_flags,
@@ -7133,6 +7529,19 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                        action_flags |= MLX5_FLOW_ACTION_MODIFY_FIELD;
                        rw_act_num += ret;
                        break;
+               case RTE_FLOW_ACTION_TYPE_CONNTRACK:
+                       ret = flow_dv_validate_action_aso_ct(dev, action_flags,
+                                                            item_flags, attr,
+                                                            error);
+                       if (ret < 0)
+                               return ret;
+                       action_flags |= MLX5_FLOW_ACTION_CT;
+                       break;
+               case MLX5_RTE_FLOW_ACTION_TYPE_TUNNEL_SET:
+                       /* tunnel offload action was processed before
+                        * list it here as a supported type
+                        */
+                       break;
                default:
                        return rte_flow_error_set(error, ENOTSUP,
                                                  RTE_FLOW_ERROR_TYPE_ACTION,
@@ -7279,6 +7688,36 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                                                 "multiple VLAN actions");
                }
        }
+       if (action_flags & MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY) {
+               if ((action_flags & (MLX5_FLOW_FATE_ACTIONS &
+                       ~MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY)) &&
+                       attr->ingress)
+                       return rte_flow_error_set
+                               (error, ENOTSUP,
+                               RTE_FLOW_ERROR_TYPE_ACTION,
+                               NULL, "fate action not supported for "
+                               "meter with policy");
+               if (attr->egress) {
+                       if (action_flags & MLX5_FLOW_MODIFY_HDR_ACTIONS)
+                               return rte_flow_error_set
+                                       (error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ACTION,
+                                       NULL, "modify header action in egress "
+                                       "cannot be done before meter action");
+                       if (action_flags & MLX5_FLOW_ACTION_ENCAP)
+                               return rte_flow_error_set
+                                       (error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ACTION,
+                                       NULL, "encap action in egress "
+                                       "cannot be done before meter action");
+                       if (action_flags & MLX5_FLOW_ACTION_OF_PUSH_VLAN)
+                               return rte_flow_error_set
+                                       (error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ACTION,
+                                       NULL, "push vlan action in egress "
+                                       "cannot be done before meter action");
+               }
+       }
        /*
         * Hairpin flow will add one more TAG action in TX implicit mode.
         * In TX explicit mode, there will be no hairpin flow ID.
@@ -7338,6 +7777,7 @@ flow_dv_prepare(struct rte_eth_dev *dev,
        struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace();
 
        MLX5_ASSERT(wks);
+       wks->skip_matcher_reg = 0;
        /* In case of corrupting the memory. */
        if (wks->flow_idx >= MLX5_NUM_MAX_DEV_FLOWS) {
                rte_flow_error_set(error, ENOSPC,
@@ -9276,14 +9716,72 @@ flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, void *matcher,
        }
 }
 
-static uint32_t matcher_zero[MLX5_ST_SZ_DW(fte_match_param)] = { 0 };
-
-#define HEADER_IS_ZERO(match_criteria, headers)                                     \
-       !(memcmp(MLX5_ADDR_OF(fte_match_param, match_criteria, headers),     \
-                matcher_zero, MLX5_FLD_SZ_BYTES(fte_match_param, headers))) \
-
-/**
- * Calculate flow matcher enable bitmap.
+/*
+ * Add connection tracking status item to matcher
+ *
+ * @param[in] dev
+ *   The devich to configure through.
+ * @param[in, out] matcher
+ *   Flow matcher.
+ * @param[in, out] key
+ *   Flow matcher value.
+ * @param[in] item
+ *   Flow pattern to translate.
+ */
+static void
+flow_dv_translate_item_aso_ct(struct rte_eth_dev *dev,
+                             void *matcher, void *key,
+                             const struct rte_flow_item *item)
+{
+       uint32_t reg_value = 0;
+       int reg_id;
+       /* 8LSB 0b 11/0000/11, middle 4 bits are reserved. */
+       uint32_t reg_mask = 0;
+       const struct rte_flow_item_conntrack *spec = item->spec;
+       const struct rte_flow_item_conntrack *mask = item->mask;
+       uint32_t flags;
+       struct rte_flow_error error;
+
+       if (!mask)
+               mask = &rte_flow_item_conntrack_mask;
+       if (!spec || !mask->flags)
+               return;
+       flags = spec->flags & mask->flags;
+       /* The conflict should be checked in the validation. */
+       if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_VALID)
+               reg_value |= MLX5_CT_SYNDROME_VALID;
+       if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_CHANGED)
+               reg_value |= MLX5_CT_SYNDROME_STATE_CHANGE;
+       if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_INVALID)
+               reg_value |= MLX5_CT_SYNDROME_INVALID;
+       if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_DISABLED)
+               reg_value |= MLX5_CT_SYNDROME_TRAP;
+       if (flags & RTE_FLOW_CONNTRACK_PKT_STATE_BAD)
+               reg_value |= MLX5_CT_SYNDROME_BAD_PACKET;
+       if (mask->flags & (RTE_FLOW_CONNTRACK_PKT_STATE_VALID |
+                          RTE_FLOW_CONNTRACK_PKT_STATE_INVALID |
+                          RTE_FLOW_CONNTRACK_PKT_STATE_DISABLED))
+               reg_mask |= 0xc0;
+       if (mask->flags & RTE_FLOW_CONNTRACK_PKT_STATE_CHANGED)
+               reg_mask |= MLX5_CT_SYNDROME_STATE_CHANGE;
+       if (mask->flags & RTE_FLOW_CONNTRACK_PKT_STATE_BAD)
+               reg_mask |= MLX5_CT_SYNDROME_BAD_PACKET;
+       /* The REG_C_x value could be saved during startup. */
+       reg_id = mlx5_flow_get_reg_id(dev, MLX5_ASO_CONNTRACK, 0, &error);
+       if (reg_id == REG_NON)
+               return;
+       flow_dv_match_meta_reg(matcher, key, (enum modify_reg)reg_id,
+                              reg_value, reg_mask);
+}
+
+static uint32_t matcher_zero[MLX5_ST_SZ_DW(fte_match_param)] = { 0 };
+
+#define HEADER_IS_ZERO(match_criteria, headers)                                     \
+       !(memcmp(MLX5_ADDR_OF(fte_match_param, match_criteria, headers),     \
+                matcher_zero, MLX5_FLD_SZ_BYTES(fte_match_param, headers))) \
+
+/**
+ * Calculate flow matcher enable bitmap.
  *
  * @param match_criteria
  *   Pointer to flow matcher criteria.
@@ -9830,6 +10328,8 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev,
  *
  * @param[in] dev
  *   Pointer to rte_eth_dev structure.
+ * @param[in] dev_flow
+ *   Pointer to the mlx5_flow.
  * @param[out] count
  *   Pointer to the counter action configuration.
  * @param[in] age
@@ -9853,7 +10353,7 @@ flow_dv_translate_create_counter(struct rte_eth_dev *dev,
                counter = flow_dv_counter_alloc(dev, !!age);
        if (!counter || age == NULL)
                return counter;
-       age_param  = flow_dv_counter_idx_get_age(dev, counter);
+       age_param = flow_dv_counter_idx_get_age(dev, counter);
        age_param->context = age->context ? age->context :
                (void *)(uintptr_t)(dev_flow->flow_idx);
        age_param->timeout = age->timeout;
@@ -10983,210 +11483,655 @@ flow_dv_aso_age_alloc(struct rte_eth_dev *dev, struct rte_flow_error *error)
 }
 
 /**
- * Create a age action using ASO mechanism.
+ * Initialize flow ASO age parameters.
  *
  * @param[in] dev
  *   Pointer to rte_eth_dev structure.
- * @param[in] age
- *   Pointer to the aging action configuration.
- * @param[out] error
- *   Pointer to the error structure.
+ * @param[in] age_idx
+ *   Index of ASO age action.
+ * @param[in] context
+ *   Pointer to flow counter age context.
+ * @param[in] timeout
+ *   Aging timeout in seconds.
  *
- * @return
- *   Index to flow counter on success, 0 otherwise.
  */
-static uint32_t
-flow_dv_translate_create_aso_age(struct rte_eth_dev *dev,
-                                const struct rte_flow_action_age *age,
-                                struct rte_flow_error *error)
+static void
+flow_dv_aso_age_params_init(struct rte_eth_dev *dev,
+                           uint32_t age_idx,
+                           void *context,
+                           uint32_t timeout)
 {
-       uint32_t age_idx = 0;
        struct mlx5_aso_age_action *aso_age;
 
-       age_idx = flow_dv_aso_age_alloc(dev, error);
-       if (!age_idx)
-               return 0;
        aso_age = flow_aso_age_get_by_idx(dev, age_idx);
-       aso_age->age_params.context = age->context;
-       aso_age->age_params.timeout = age->timeout;
+       MLX5_ASSERT(aso_age);
+       aso_age->age_params.context = context;
+       aso_age->age_params.timeout = timeout;
        aso_age->age_params.port_id = dev->data->port_id;
        __atomic_store_n(&aso_age->age_params.sec_since_last_hit, 0,
                         __ATOMIC_RELAXED);
        __atomic_store_n(&aso_age->age_params.state, AGE_CANDIDATE,
                         __ATOMIC_RELAXED);
-       return age_idx;
+}
+
+static void
+flow_dv_translate_integrity_l4(const struct rte_flow_item_integrity *mask,
+                              const struct rte_flow_item_integrity *value,
+                              void *headers_m, void *headers_v)
+{
+       if (mask->l4_ok) {
+               /* application l4_ok filter aggregates all hardware l4 filters
+                * therefore hw l4_checksum_ok must be implicitly added here.
+                */
+               struct rte_flow_item_integrity local_item;
+
+               local_item.l4_csum_ok = 1;
+               MLX5_SET(fte_match_set_lyr_2_4, headers_m, l4_checksum_ok,
+                        local_item.l4_csum_ok);
+               if (value->l4_ok) {
+                       /* application l4_ok = 1 matches sets both hw flags
+                        * l4_ok and l4_checksum_ok flags to 1.
+                        */
+                       MLX5_SET(fte_match_set_lyr_2_4, headers_v,
+                                l4_checksum_ok, local_item.l4_csum_ok);
+                       MLX5_SET(fte_match_set_lyr_2_4, headers_m, l4_ok,
+                                mask->l4_ok);
+                       MLX5_SET(fte_match_set_lyr_2_4, headers_v, l4_ok,
+                                value->l4_ok);
+               } else {
+                       /* application l4_ok = 0 matches on hw flag
+                        * l4_checksum_ok = 0 only.
+                        */
+                       MLX5_SET(fte_match_set_lyr_2_4, headers_v,
+                                l4_checksum_ok, 0);
+               }
+       } else if (mask->l4_csum_ok) {
+               MLX5_SET(fte_match_set_lyr_2_4, headers_m, l4_checksum_ok,
+                        mask->l4_csum_ok);
+               MLX5_SET(fte_match_set_lyr_2_4, headers_v, ipv4_checksum_ok,
+                        value->l4_csum_ok);
+       }
+}
+
+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)
+{
+       if (mask->l3_ok) {
+               /* application l3_ok filter aggregates all hardware l3 filters
+                * therefore hw ipv4_checksum_ok must be implicitly added here.
+                */
+               struct rte_flow_item_integrity local_item;
+
+               local_item.ipv4_csum_ok = !!is_ipv4;
+               MLX5_SET(fte_match_set_lyr_2_4, headers_m, ipv4_checksum_ok,
+                        local_item.ipv4_csum_ok);
+               if (value->l3_ok) {
+                       MLX5_SET(fte_match_set_lyr_2_4, headers_v,
+                                ipv4_checksum_ok, local_item.ipv4_csum_ok);
+                       MLX5_SET(fte_match_set_lyr_2_4, headers_m, l3_ok,
+                                mask->l3_ok);
+                       MLX5_SET(fte_match_set_lyr_2_4, headers_v, l3_ok,
+                                value->l3_ok);
+               } else {
+                       MLX5_SET(fte_match_set_lyr_2_4, headers_v,
+                                ipv4_checksum_ok, 0);
+               }
+       } else if (mask->ipv4_csum_ok) {
+               MLX5_SET(fte_match_set_lyr_2_4, headers_m, ipv4_checksum_ok,
+                        mask->ipv4_csum_ok);
+               MLX5_SET(fte_match_set_lyr_2_4, headers_v, ipv4_checksum_ok,
+                        value->ipv4_csum_ok);
+       }
+}
+
+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)
+{
+       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;
+       if (!mask)
+               mask = &rte_flow_item_integrity_mask;
+       if (value->level > 1) {
+               headers_m = MLX5_ADDR_OF(fte_match_param, matcher,
+                                        inner_headers);
+               headers_v = MLX5_ADDR_OF(fte_match_param, key, inner_headers);
+       } else {
+               headers_m = MLX5_ADDR_OF(fte_match_param, matcher,
+                                        outer_headers);
+               headers_v = MLX5_ADDR_OF(fte_match_param, key, outer_headers);
+       }
+       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);
+       } else {
+               item = head_item;
+               end_item = tunnel_item ? tunnel_item :
+                          mlx5_find_end_item(integrity_item);
+       }
+       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);
 }
 
 /**
- * Fill the flow with DV spec, lock free
- * (mutex should be acquired by caller).
+ * Prepares DV flow counter with aging configuration.
+ * Gets it by index when exists, creates a new one when doesn't.
  *
  * @param[in] dev
  *   Pointer to rte_eth_dev structure.
- * @param[in, out] dev_flow
+ * @param[in] dev_flow
+ *   Pointer to the mlx5_flow.
+ * @param[in, out] flow
  *   Pointer to the sub flow.
- * @param[in] attr
- *   Pointer to the flow attributes.
- * @param[in] items
- *   Pointer to the list of items.
- * @param[in] actions
- *   Pointer to the list of actions.
+ * @param[in] count
+ *   Pointer to the counter action configuration.
+ * @param[in] age
+ *   Pointer to the aging action configuration.
  * @param[out] error
  *   Pointer to the error structure.
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_errno is set.
+ *   Pointer to the counter, NULL otherwise.
  */
-static int
-flow_dv_translate(struct rte_eth_dev *dev,
-                 struct mlx5_flow *dev_flow,
-                 const struct rte_flow_attr *attr,
-                 const struct rte_flow_item items[],
-                 const struct rte_flow_action actions[],
-                 struct rte_flow_error *error)
+static struct mlx5_flow_counter *
+flow_dv_prepare_counter(struct rte_eth_dev *dev,
+                       struct mlx5_flow *dev_flow,
+                       struct rte_flow *flow,
+                       const struct rte_flow_action_count *count,
+                       const struct rte_flow_action_age *age,
+                       struct rte_flow_error *error)
 {
-       struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_dev_config *dev_conf = &priv->config;
-       struct rte_flow *flow = dev_flow->flow;
-       struct mlx5_flow_handle *handle = dev_flow->handle;
-       struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace();
-       struct mlx5_flow_rss_desc *rss_desc;
-       uint64_t item_flags = 0;
-       uint64_t last_item = 0;
-       uint64_t action_flags = 0;
-       struct mlx5_flow_dv_matcher matcher = {
-               .mask = {
-                       .size = sizeof(matcher.mask.buf) -
-                               MLX5_ST_SZ_BYTES(fte_match_set_misc4),
-               },
-       };
-       int actions_n = 0;
-       bool actions_end = false;
-       union {
-               struct mlx5_flow_dv_modify_hdr_resource res;
-               uint8_t len[sizeof(struct mlx5_flow_dv_modify_hdr_resource) +
-                           sizeof(struct mlx5_modification_cmd) *
-                           (MLX5_MAX_MODIFY_NUM + 1)];
-       } mhdr_dummy;
-       struct mlx5_flow_dv_modify_hdr_resource *mhdr_res = &mhdr_dummy.res;
-       const struct rte_flow_action_count *count = NULL;
-       const struct rte_flow_action_age *age = NULL;
-       union flow_dv_attr flow_attr = { .attr = 0 };
-       uint32_t tag_be;
-       union mlx5_flow_tbl_key tbl_key;
-       uint32_t modify_action_position = UINT32_MAX;
-       void *match_mask = matcher.mask.buf;
-       void *match_value = dev_flow->dv.value.buf;
-       uint8_t next_protocol = 0xff;
-       struct rte_vlan_hdr vlan = { 0 };
-       struct mlx5_flow_dv_dest_array_resource mdest_res;
-       struct mlx5_flow_dv_sample_resource sample_res;
-       void *sample_actions[MLX5_DV_MAX_NUMBER_OF_ACTIONS] = {0};
-       const struct rte_flow_action_sample *sample = NULL;
-       struct mlx5_flow_sub_actions_list *sample_act;
-       uint32_t sample_act_pos = UINT32_MAX;
-       uint32_t num_of_dest = 0;
-       int tmp_actions_n = 0;
-       uint32_t table;
-       int ret = 0;
-       const struct mlx5_flow_tunnel *tunnel;
-       struct flow_grp_info grp_info = {
-               .external = !!dev_flow->external,
-               .transfer = !!attr->transfer,
-               .fdb_def_rule = !!priv->fdb_def_rule,
-               .skip_scale = dev_flow->skip_scale &
-                       (1 << MLX5_SCALE_FLOW_GROUP_BIT),
-       };
+       if (!flow->counter) {
+               flow->counter = flow_dv_translate_create_counter(dev, dev_flow,
+                                                                count, age);
+               if (!flow->counter) {
+                       rte_flow_error_set(error, rte_errno,
+                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                          "cannot create counter object.");
+                       return NULL;
+               }
+       }
+       return flow_dv_counter_get_by_idx(dev, flow->counter, NULL);
+}
 
-       if (!wks)
-               return rte_flow_error_set(error, ENOMEM,
-                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                         NULL,
-                                         "failed to push flow workspace");
-       rss_desc = &wks->rss_desc;
-       memset(&mdest_res, 0, sizeof(struct mlx5_flow_dv_dest_array_resource));
-       memset(&sample_res, 0, sizeof(struct mlx5_flow_dv_sample_resource));
-       mhdr_res->ft_type = attr->egress ? MLX5DV_FLOW_TABLE_TYPE_NIC_TX :
-                                          MLX5DV_FLOW_TABLE_TYPE_NIC_RX;
-       /* update normal path action resource into last index of array */
-       sample_act = &mdest_res.sample_act[MLX5_MAX_DEST_NUM - 1];
-       tunnel = is_flow_tunnel_match_rule(dev, attr, items, actions) ?
-                flow_items_to_tunnel(items) :
-                is_flow_tunnel_steer_rule(dev, attr, items, actions) ?
-                flow_actions_to_tunnel(actions) :
-                dev_flow->tunnel ? dev_flow->tunnel : NULL;
-       mhdr_res->ft_type = attr->egress ? MLX5DV_FLOW_TABLE_TYPE_NIC_TX :
-                                          MLX5DV_FLOW_TABLE_TYPE_NIC_RX;
-       grp_info.std_tbl_fix = tunnel_use_standard_attr_group_translate
-                               (dev, tunnel, attr, items, actions);
-       ret = mlx5_flow_group_to_table(dev, tunnel, attr->group, &table,
-                                      &grp_info, error);
-       if (ret)
-               return ret;
-       dev_flow->dv.group = table;
-       if (attr->transfer)
-               mhdr_res->ft_type = MLX5DV_FLOW_TABLE_TYPE_FDB;
-       /* number of actions must be set to 0 in case of dirty stack. */
-       mhdr_res->actions_num = 0;
-       if (is_flow_tunnel_match_rule(dev, attr, items, actions)) {
-               /*
-                * do not add decap action if match rule drops packet
-                * HW rejects rules with decap & drop
-                *
-                * if tunnel match rule was inserted before matching tunnel set
-                * rule flow table used in the match rule must be registered.
-                * current implementation handles that in the
-                * flow_dv_match_register() at the function end.
-                */
-               bool add_decap = true;
-               const struct rte_flow_action *ptr = actions;
+/*
+ * Release an ASO CT action by its own device.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[in] idx
+ *   Index of ASO CT action to release.
+ *
+ * @return
+ *   0 when CT action was removed, otherwise the number of references.
+ */
+static inline int
+flow_dv_aso_ct_dev_release(struct rte_eth_dev *dev, uint32_t idx)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_aso_ct_pools_mng *mng = priv->sh->ct_mng;
+       uint32_t ret;
+       struct mlx5_aso_ct_action *ct = flow_aso_ct_get_by_dev_idx(dev, idx);
+       enum mlx5_aso_ct_state state =
+                       __atomic_load_n(&ct->state, __ATOMIC_RELAXED);
 
-               for (; ptr->type != RTE_FLOW_ACTION_TYPE_END; ptr++) {
-                       if (ptr->type == RTE_FLOW_ACTION_TYPE_DROP) {
-                               add_decap = false;
-                               break;
-                       }
+       /* Cannot release when CT is in the ASO SQ. */
+       if (state == ASO_CONNTRACK_WAIT || state == ASO_CONNTRACK_QUERY)
+               return -1;
+       ret = __atomic_sub_fetch(&ct->refcnt, 1, __ATOMIC_RELAXED);
+       if (!ret) {
+               if (ct->dr_action_orig) {
+#ifdef HAVE_MLX5_DR_ACTION_ASO_CT
+                       claim_zero(mlx5_glue->destroy_flow_action
+                                       (ct->dr_action_orig));
+#endif
+                       ct->dr_action_orig = NULL;
                }
-               if (add_decap) {
-                       if (flow_dv_create_action_l2_decap(dev, dev_flow,
-                                                          attr->transfer,
-                                                          error))
-                               return -rte_errno;
-                       dev_flow->dv.actions[actions_n++] =
-                                       dev_flow->dv.encap_decap->action;
-                       action_flags |= MLX5_FLOW_ACTION_DECAP;
+               if (ct->dr_action_rply) {
+#ifdef HAVE_MLX5_DR_ACTION_ASO_CT
+                       claim_zero(mlx5_glue->destroy_flow_action
+                                       (ct->dr_action_rply));
+#endif
+                       ct->dr_action_rply = NULL;
                }
+               /* Clear the state to free, no need in 1st allocation. */
+               MLX5_ASO_CT_UPDATE_STATE(ct, ASO_CONNTRACK_FREE);
+               rte_spinlock_lock(&mng->ct_sl);
+               LIST_INSERT_HEAD(&mng->free_cts, ct, next);
+               rte_spinlock_unlock(&mng->ct_sl);
        }
-       for (; !actions_end ; actions++) {
-               const struct rte_flow_action_queue *queue;
-               const struct rte_flow_action_rss *rss;
-               const struct rte_flow_action *action = actions;
-               const uint8_t *rss_key;
-               struct mlx5_flow_tbl_resource *tbl;
-               struct mlx5_aso_age_action *age_act;
-               uint32_t port_id = 0;
-               struct mlx5_flow_dv_port_id_action_resource port_id_resource;
-               int action_type = actions->type;
-               const struct rte_flow_action *found_action = NULL;
-               uint32_t jump_group = 0;
+       return (int)ret;
+}
 
-               if (!mlx5_flow_os_action_supported(action_type))
-                       return rte_flow_error_set(error, ENOTSUP,
-                                                 RTE_FLOW_ERROR_TYPE_ACTION,
-                                                 actions,
-                                                 "action not supported");
-               switch (action_type) {
-               case MLX5_RTE_FLOW_ACTION_TYPE_TUNNEL_SET:
-                       action_flags |= MLX5_FLOW_ACTION_TUNNEL_SET;
-                       break;
-               case RTE_FLOW_ACTION_TYPE_VOID:
-                       break;
-               case RTE_FLOW_ACTION_TYPE_PORT_ID:
-                       if (flow_dv_translate_action_port_id(dev, action,
-                                                            &port_id, error))
-                               return -rte_errno;
-                       port_id_resource.port_id = port_id;
-                       MLX5_ASSERT(!handle->rix_port_id_action);
+static inline int
+flow_dv_aso_ct_release(struct rte_eth_dev *dev, uint32_t own_idx)
+{
+       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);
+
+       MLX5_ASSERT(owner < RTE_MAX_ETHPORTS);
+       if (dev->data->dev_started != 1)
+               return -1;
+       return flow_dv_aso_ct_dev_release(owndev, idx);
+}
+
+/*
+ * Resize the ASO CT pools array by 64 pools.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ *
+ * @return
+ *   0 on success, otherwise negative errno value and rte_errno is set.
+ */
+static int
+flow_dv_aso_ct_pools_resize(struct rte_eth_dev *dev)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_aso_ct_pools_mng *mng = priv->sh->ct_mng;
+       void *old_pools = mng->pools;
+       /* Magic number now, need a macro. */
+       uint32_t resize = mng->n + 64;
+       uint32_t mem_size = sizeof(struct mlx5_aso_ct_pool *) * resize;
+       void *pools = mlx5_malloc(MLX5_MEM_ZERO, mem_size, 0, SOCKET_ID_ANY);
+
+       if (!pools) {
+               rte_errno = ENOMEM;
+               return -rte_errno;
+       }
+       rte_rwlock_write_lock(&mng->resize_rwl);
+       /* ASO SQ/QP was already initialized in the startup. */
+       if (old_pools) {
+               /* Realloc could be an alternative choice. */
+               rte_memcpy(pools, old_pools,
+                          mng->n * sizeof(struct mlx5_aso_ct_pool *));
+               mlx5_free(old_pools);
+       }
+       mng->n = resize;
+       mng->pools = pools;
+       rte_rwlock_write_unlock(&mng->resize_rwl);
+       return 0;
+}
+
+/*
+ * Create and initialize a new ASO CT pool.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[out] ct_free
+ *   Where to put the pointer of a new CT action.
+ *
+ * @return
+ *   The CT actions pool pointer and @p ct_free is set on success,
+ *   NULL otherwise and rte_errno is set.
+ */
+static struct mlx5_aso_ct_pool *
+flow_dv_ct_pool_create(struct rte_eth_dev *dev,
+                      struct mlx5_aso_ct_action **ct_free)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_aso_ct_pools_mng *mng = priv->sh->ct_mng;
+       struct mlx5_aso_ct_pool *pool = NULL;
+       struct mlx5_devx_obj *obj = NULL;
+       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);
+       if (!obj) {
+               rte_errno = ENODATA;
+               DRV_LOG(ERR, "Failed to create conn_track_offload_obj using DevX.");
+               return NULL;
+       }
+       pool = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*pool), 0, SOCKET_ID_ANY);
+       if (!pool) {
+               rte_errno = ENOMEM;
+               claim_zero(mlx5_devx_cmd_destroy(obj));
+               return NULL;
+       }
+       pool->devx_obj = obj;
+       pool->index = mng->next;
+       /* Resize pools array if there is no room for the new pool in it. */
+       if (pool->index == mng->n && flow_dv_aso_ct_pools_resize(dev)) {
+               claim_zero(mlx5_devx_cmd_destroy(obj));
+               mlx5_free(pool);
+               return NULL;
+       }
+       mng->pools[pool->index] = pool;
+       mng->next++;
+       /* Assign the first action in the new pool, the rest go to free list. */
+       *ct_free = &pool->actions[0];
+       /* Lock outside, the list operation is safe here. */
+       for (i = 1; i < MLX5_ASO_CT_ACTIONS_PER_POOL; i++) {
+               /* refcnt is 0 when allocating the memory. */
+               pool->actions[i].offset = i;
+               LIST_INSERT_HEAD(&mng->free_cts, &pool->actions[i], next);
+       }
+       return pool;
+}
+
+/*
+ * Allocate a ASO CT action from free list.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   Index to ASO CT action on success, 0 otherwise and rte_errno is set.
+ */
+static uint32_t
+flow_dv_aso_ct_alloc(struct rte_eth_dev *dev, struct rte_flow_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_aso_ct_pools_mng *mng = priv->sh->ct_mng;
+       struct mlx5_aso_ct_action *ct = NULL;
+       struct mlx5_aso_ct_pool *pool;
+       uint8_t reg_c;
+       uint32_t ct_idx;
+
+       MLX5_ASSERT(mng);
+       if (!priv->config.devx) {
+               rte_errno = ENOTSUP;
+               return 0;
+       }
+       /* Get a free CT action, if no, a new pool will be created. */
+       rte_spinlock_lock(&mng->ct_sl);
+       ct = LIST_FIRST(&mng->free_cts);
+       if (ct) {
+               LIST_REMOVE(ct, next);
+       } else if (!flow_dv_ct_pool_create(dev, &ct)) {
+               rte_spinlock_unlock(&mng->ct_sl);
+               rte_flow_error_set(error, rte_errno, RTE_FLOW_ERROR_TYPE_ACTION,
+                                  NULL, "failed to create ASO CT pool");
+               return 0;
+       }
+       rte_spinlock_unlock(&mng->ct_sl);
+       pool = container_of(ct, struct mlx5_aso_ct_pool, actions[ct->offset]);
+       ct_idx = MLX5_MAKE_CT_IDX(pool->index, ct->offset);
+       /* 0: inactive, 1: created, 2+: used by flows. */
+       __atomic_store_n(&ct->refcnt, 1, __ATOMIC_RELAXED);
+       reg_c = mlx5_flow_get_reg_id(dev, MLX5_ASO_CONNTRACK, 0, error);
+       if (!ct->dr_action_orig) {
+#ifdef HAVE_MLX5_DR_ACTION_ASO_CT
+               ct->dr_action_orig = mlx5_glue->dv_create_flow_action_aso
+                       (priv->sh->rx_domain, pool->devx_obj->obj,
+                        ct->offset,
+                        MLX5DV_DR_ACTION_FLAGS_ASO_CT_DIRECTION_INITIATOR,
+                        reg_c - REG_C_0);
+#else
+               RTE_SET_USED(reg_c);
+#endif
+               if (!ct->dr_action_orig) {
+                       flow_dv_aso_ct_dev_release(dev, ct_idx);
+                       rte_flow_error_set(error, rte_errno,
+                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                          "failed to create ASO CT action");
+                       return 0;
+               }
+       }
+       if (!ct->dr_action_rply) {
+#ifdef HAVE_MLX5_DR_ACTION_ASO_CT
+               ct->dr_action_rply = mlx5_glue->dv_create_flow_action_aso
+                       (priv->sh->rx_domain, pool->devx_obj->obj,
+                        ct->offset,
+                        MLX5DV_DR_ACTION_FLAGS_ASO_CT_DIRECTION_RESPONDER,
+                        reg_c - REG_C_0);
+#endif
+               if (!ct->dr_action_rply) {
+                       flow_dv_aso_ct_dev_release(dev, ct_idx);
+                       rte_flow_error_set(error, rte_errno,
+                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                          "failed to create ASO CT action");
+                       return 0;
+               }
+       }
+       return ct_idx;
+}
+
+/*
+ * Create a conntrack object with context and actions by using ASO mechanism.
+ *
+ * @param[in] dev
+ *   Pointer to rte_eth_dev structure.
+ * @param[in] pro
+ *   Pointer to conntrack information profile.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   Index to conntrack object on success, 0 otherwise.
+ */
+static uint32_t
+flow_dv_translate_create_conntrack(struct rte_eth_dev *dev,
+                                  const struct rte_flow_action_conntrack *pro,
+                                  struct rte_flow_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_dev_ctx_shared *sh = priv->sh;
+       struct mlx5_aso_ct_action *ct;
+       uint32_t idx;
+
+       if (!sh->ct_aso_en)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "Connection is not supported");
+       idx = flow_dv_aso_ct_alloc(dev, error);
+       if (!idx)
+               return rte_flow_error_set(error, rte_errno,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "Failed to allocate CT object");
+       ct = flow_aso_ct_get_by_dev_idx(dev, idx);
+       if (mlx5_aso_ct_update_by_wqe(sh, ct, pro))
+               return rte_flow_error_set(error, EBUSY,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "Failed to update CT");
+       ct->is_original = !!pro->is_original_dir;
+       ct->peer = pro->peer_port;
+       return idx;
+}
+
+/**
+ * Fill the flow with DV spec, lock free
+ * (mutex should be acquired by caller).
+ *
+ * @param[in] dev
+ *   Pointer to rte_eth_dev structure.
+ * @param[in, out] dev_flow
+ *   Pointer to the sub flow.
+ * @param[in] attr
+ *   Pointer to the flow attributes.
+ * @param[in] items
+ *   Pointer to the list of items.
+ * @param[in] actions
+ *   Pointer to the list of actions.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_dv_translate(struct rte_eth_dev *dev,
+                 struct mlx5_flow *dev_flow,
+                 const struct rte_flow_attr *attr,
+                 const struct rte_flow_item items[],
+                 const struct rte_flow_action actions[],
+                 struct rte_flow_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_dev_config *dev_conf = &priv->config;
+       struct rte_flow *flow = dev_flow->flow;
+       struct mlx5_flow_handle *handle = dev_flow->handle;
+       struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace();
+       struct mlx5_flow_rss_desc *rss_desc;
+       uint64_t item_flags = 0;
+       uint64_t last_item = 0;
+       uint64_t action_flags = 0;
+       struct mlx5_flow_dv_matcher matcher = {
+               .mask = {
+                       .size = sizeof(matcher.mask.buf) -
+                               MLX5_ST_SZ_BYTES(fte_match_set_misc4),
+               },
+       };
+       int actions_n = 0;
+       bool actions_end = false;
+       union {
+               struct mlx5_flow_dv_modify_hdr_resource res;
+               uint8_t len[sizeof(struct mlx5_flow_dv_modify_hdr_resource) +
+                           sizeof(struct mlx5_modification_cmd) *
+                           (MLX5_MAX_MODIFY_NUM + 1)];
+       } mhdr_dummy;
+       struct mlx5_flow_dv_modify_hdr_resource *mhdr_res = &mhdr_dummy.res;
+       const struct rte_flow_action_count *count = NULL;
+       const struct rte_flow_action_age *non_shared_age = NULL;
+       union flow_dv_attr flow_attr = { .attr = 0 };
+       uint32_t tag_be;
+       union mlx5_flow_tbl_key tbl_key;
+       uint32_t modify_action_position = UINT32_MAX;
+       void *match_mask = matcher.mask.buf;
+       void *match_value = dev_flow->dv.value.buf;
+       uint8_t next_protocol = 0xff;
+       struct rte_vlan_hdr vlan = { 0 };
+       struct mlx5_flow_dv_dest_array_resource mdest_res;
+       struct mlx5_flow_dv_sample_resource sample_res;
+       void *sample_actions[MLX5_DV_MAX_NUMBER_OF_ACTIONS] = {0};
+       const struct rte_flow_action_sample *sample = NULL;
+       struct mlx5_flow_sub_actions_list *sample_act;
+       uint32_t sample_act_pos = UINT32_MAX;
+       uint32_t age_act_pos = UINT32_MAX;
+       uint32_t num_of_dest = 0;
+       int tmp_actions_n = 0;
+       uint32_t table;
+       int ret = 0;
+       const struct mlx5_flow_tunnel *tunnel = NULL;
+       struct flow_grp_info grp_info = {
+               .external = !!dev_flow->external,
+               .transfer = !!attr->transfer,
+               .fdb_def_rule = !!priv->fdb_def_rule,
+               .skip_scale = dev_flow->skip_scale &
+                       (1 << MLX5_SCALE_FLOW_GROUP_BIT),
+               .std_tbl_fix = true,
+       };
+       const struct rte_flow_item *head_item = items;
+
+       if (!wks)
+               return rte_flow_error_set(error, ENOMEM,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                         NULL,
+                                         "failed to push flow workspace");
+       rss_desc = &wks->rss_desc;
+       memset(&mdest_res, 0, sizeof(struct mlx5_flow_dv_dest_array_resource));
+       memset(&sample_res, 0, sizeof(struct mlx5_flow_dv_sample_resource));
+       mhdr_res->ft_type = attr->egress ? MLX5DV_FLOW_TABLE_TYPE_NIC_TX :
+                                          MLX5DV_FLOW_TABLE_TYPE_NIC_RX;
+       /* update normal path action resource into last index of array */
+       sample_act = &mdest_res.sample_act[MLX5_MAX_DEST_NUM - 1];
+       if (is_tunnel_offload_active(dev)) {
+               if (dev_flow->tunnel) {
+                       RTE_VERIFY(dev_flow->tof_type ==
+                                  MLX5_TUNNEL_OFFLOAD_MISS_RULE);
+                       tunnel = dev_flow->tunnel;
+               } else {
+                       tunnel = mlx5_get_tof(items, actions,
+                                             &dev_flow->tof_type);
+                       dev_flow->tunnel = tunnel;
+               }
+               grp_info.std_tbl_fix = tunnel_use_standard_attr_group_translate
+                                       (dev, attr, tunnel, dev_flow->tof_type);
+       }
+       mhdr_res->ft_type = attr->egress ? MLX5DV_FLOW_TABLE_TYPE_NIC_TX :
+                                          MLX5DV_FLOW_TABLE_TYPE_NIC_RX;
+       ret = mlx5_flow_group_to_table(dev, tunnel, attr->group, &table,
+                                      &grp_info, error);
+       if (ret)
+               return ret;
+       dev_flow->dv.group = table;
+       if (attr->transfer)
+               mhdr_res->ft_type = MLX5DV_FLOW_TABLE_TYPE_FDB;
+       /* number of actions must be set to 0 in case of dirty stack. */
+       mhdr_res->actions_num = 0;
+       if (is_flow_tunnel_match_rule(dev_flow->tof_type)) {
+               /*
+                * do not add decap action if match rule drops packet
+                * HW rejects rules with decap & drop
+                *
+                * if tunnel match rule was inserted before matching tunnel set
+                * rule flow table used in the match rule must be registered.
+                * current implementation handles that in the
+                * flow_dv_match_register() at the function end.
+                */
+               bool add_decap = true;
+               const struct rte_flow_action *ptr = actions;
+
+               for (; ptr->type != RTE_FLOW_ACTION_TYPE_END; ptr++) {
+                       if (ptr->type == RTE_FLOW_ACTION_TYPE_DROP) {
+                               add_decap = false;
+                               break;
+                       }
+               }
+               if (add_decap) {
+                       if (flow_dv_create_action_l2_decap(dev, dev_flow,
+                                                          attr->transfer,
+                                                          error))
+                               return -rte_errno;
+                       dev_flow->dv.actions[actions_n++] =
+                                       dev_flow->dv.encap_decap->action;
+                       action_flags |= MLX5_FLOW_ACTION_DECAP;
+               }
+       }
+       for (; !actions_end ; actions++) {
+               const struct rte_flow_action_queue *queue;
+               const struct rte_flow_action_rss *rss;
+               const struct rte_flow_action *action = actions;
+               const uint8_t *rss_key;
+               struct mlx5_flow_tbl_resource *tbl;
+               struct mlx5_aso_age_action *age_act;
+               struct mlx5_flow_counter *cnt_act;
+               uint32_t port_id = 0;
+               struct mlx5_flow_dv_port_id_action_resource port_id_resource;
+               int action_type = actions->type;
+               const struct rte_flow_action *found_action = NULL;
+               uint32_t jump_group = 0;
+               uint32_t owner_idx;
+               struct mlx5_aso_ct_action *ct;
+
+               if (!mlx5_flow_os_action_supported(action_type))
+                       return rte_flow_error_set(error, ENOTSUP,
+                                                 RTE_FLOW_ERROR_TYPE_ACTION,
+                                                 actions,
+                                                 "action not supported");
+               switch (action_type) {
+               case MLX5_RTE_FLOW_ACTION_TYPE_TUNNEL_SET:
+                       action_flags |= MLX5_FLOW_ACTION_TUNNEL_SET;
+                       break;
+               case RTE_FLOW_ACTION_TYPE_VOID:
+                       break;
+               case RTE_FLOW_ACTION_TYPE_PORT_ID:
+                       if (flow_dv_translate_action_port_id(dev, action,
+                                                            &port_id, error))
+                               return -rte_errno;
+                       port_id_resource.port_id = port_id;
+                       MLX5_ASSERT(!handle->rix_port_id_action);
                        if (flow_dv_port_id_action_resource_register
                            (dev, &port_id_resource, dev_flow, error))
                                return -rte_errno;
@@ -11306,34 +12251,23 @@ flow_dv_translate(struct rte_eth_dev *dev,
                        age_act = flow_aso_age_get_by_idx(dev, flow->age);
                        __atomic_fetch_add(&age_act->refcnt, 1,
                                           __ATOMIC_RELAXED);
-                       dev_flow->dv.actions[actions_n++] = age_act->dr_action;
+                       age_act_pos = actions_n++;
                        action_flags |= MLX5_FLOW_ACTION_AGE;
                        break;
                case RTE_FLOW_ACTION_TYPE_AGE:
-                       if (priv->sh->flow_hit_aso_en && attr->group) {
-                               /*
-                                * Create one shared age action, to be used
-                                * by all sub-flows.
-                                */
-                               if (!flow->age) {
-                                       flow->age =
-                                               flow_dv_translate_create_aso_age
-                                                       (dev, action->conf,
-                                                        error);
-                                       if (!flow->age)
-                                               return rte_flow_error_set
-                                               (error, rte_errno,
-                                                RTE_FLOW_ERROR_TYPE_ACTION,
-                                                NULL,
-                                                "can't create ASO age action");
-                               }
-                               dev_flow->dv.actions[actions_n++] =
-                                         (flow_aso_age_get_by_idx
-                                               (dev, flow->age))->dr_action;
-                               action_flags |= MLX5_FLOW_ACTION_AGE;
-                               break;
-                       }
-                       /* Fall-through */
+                       non_shared_age = action->conf;
+                       age_act_pos = actions_n++;
+                       action_flags |= MLX5_FLOW_ACTION_AGE;
+                       break;
+               case MLX5_RTE_FLOW_ACTION_TYPE_COUNT:
+                       flow->counter = (uint32_t)(uintptr_t)(action->conf);
+                       cnt_act = flow_dv_counter_get_by_idx(dev, flow->counter,
+                                                            NULL);
+                       __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) {
                                return rte_flow_error_set
@@ -11343,10 +12277,7 @@ flow_dv_translate(struct rte_eth_dev *dev,
                                               "count action not supported");
                        }
                        /* Save information first, will apply later. */
-                       if (actions->type == RTE_FLOW_ACTION_TYPE_COUNT)
-                               count = action->conf;
-                       else
-                               age = action->conf;
+                       count = action->conf;
                        action_flags |= MLX5_FLOW_ACTION_COUNT;
                        break;
                case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN:
@@ -11453,6 +12384,11 @@ flow_dv_translate(struct rte_eth_dev *dev,
                        /* If decap is followed by encap, handle it at encap. */
                        action_flags |= MLX5_FLOW_ACTION_DECAP;
                        break;
+               case MLX5_RTE_FLOW_ACTION_TYPE_JUMP:
+                       dev_flow->dv.actions[actions_n++] =
+                               (void *)(uintptr_t)action->conf;
+                       action_flags |= MLX5_FLOW_ACTION_JUMP;
+                       break;
                case RTE_FLOW_ACTION_TYPE_JUMP:
                        jump_group = ((const struct rte_flow_action_jump *)
                                                        action->conf)->group;
@@ -11631,6 +12567,31 @@ flow_dv_translate(struct rte_eth_dev *dev,
                                return -rte_errno;
                        action_flags |= MLX5_FLOW_ACTION_MODIFY_FIELD;
                        break;
+               case RTE_FLOW_ACTION_TYPE_CONNTRACK:
+                       owner_idx = (uint32_t)(uintptr_t)action->conf;
+                       ct = flow_aso_ct_get_by_idx(dev, owner_idx);
+                       if (!ct)
+                               return rte_flow_error_set(error, EINVAL,
+                                               RTE_FLOW_ERROR_TYPE_ACTION,
+                                               NULL,
+                                               "Failed to get CT object.");
+                       if (mlx5_aso_ct_available(priv->sh, ct))
+                               return rte_flow_error_set(error, rte_errno,
+                                               RTE_FLOW_ERROR_TYPE_ACTION,
+                                               NULL,
+                                               "CT is unavailable.");
+                       if (ct->is_original)
+                               dev_flow->dv.actions[actions_n] =
+                                                       ct->dr_action_orig;
+                       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);
+                       actions_n++;
+                       action_flags |= MLX5_FLOW_ACTION_CT;
+                       break;
                case RTE_FLOW_ACTION_TYPE_END:
                        actions_end = true;
                        if (mhdr_res->actions_num) {
@@ -11641,27 +12602,57 @@ flow_dv_translate(struct rte_eth_dev *dev,
                                dev_flow->dv.actions[modify_action_position] =
                                        handle->dvh.modify_hdr->action;
                        }
+                       /*
+                        * Handle AGE and COUNT action by single HW counter
+                        * when they are not shared.
+                        */
+                       if (action_flags & MLX5_FLOW_ACTION_AGE) {
+                               if ((non_shared_age &&
+                                    count && !count->shared) ||
+                                   !(priv->sh->flow_hit_aso_en &&
+                                     (attr->group || attr->transfer))) {
+                                       /* Creates age by counters. */
+                                       cnt_act = flow_dv_prepare_counter
+                                                               (dev, dev_flow,
+                                                                flow, count,
+                                                                non_shared_age,
+                                                                error);
+                                       if (!cnt_act)
+                                               return -rte_errno;
+                                       dev_flow->dv.actions[age_act_pos] =
+                                                               cnt_act->action;
+                                       break;
+                               }
+                               if (!flow->age && non_shared_age) {
+                                       flow->age = flow_dv_aso_age_alloc
+                                                               (dev, error);
+                                       if (!flow->age)
+                                               return -rte_errno;
+                                       flow_dv_aso_age_params_init
+                                                   (dev, flow->age,
+                                                    non_shared_age->context ?
+                                                    non_shared_age->context :
+                                                    (void *)(uintptr_t)
+                                                    (dev_flow->flow_idx),
+                                                    non_shared_age->timeout);
+                               }
+                               age_act = flow_aso_age_get_by_idx(dev,
+                                                                 flow->age);
+                               dev_flow->dv.actions[age_act_pos] =
+                                                            age_act->dr_action;
+                       }
                        if (action_flags & MLX5_FLOW_ACTION_COUNT) {
                                /*
                                 * Create one count action, to be used
                                 * by all sub-flows.
                                 */
-                               if (!flow->counter) {
-                                       flow->counter =
-                                               flow_dv_translate_create_counter
-                                                       (dev, dev_flow, count,
-                                                        age);
-                                       if (!flow->counter)
-                                               return rte_flow_error_set
-                                               (error, rte_errno,
-                                                RTE_FLOW_ERROR_TYPE_ACTION,
-                                                NULL, "cannot create counter"
-                                                " object.");
-                               }
-                               dev_flow->dv.actions[actions_n] =
-                                         (flow_dv_counter_get_by_idx(dev,
-                                         flow->counter, NULL))->action;
-                               actions_n++;
+                               cnt_act = flow_dv_prepare_counter(dev, dev_flow,
+                                                                 flow, count,
+                                                                 NULL, error);
+                               if (!cnt_act)
+                                       return -rte_errno;
+                               dev_flow->dv.actions[actions_n++] =
+                                                               cnt_act->action;
                        }
                default:
                        break;
@@ -11913,6 +12904,15 @@ flow_dv_translate(struct rte_eth_dev *dev,
                        /* 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);
+                       break;
+               case RTE_FLOW_ITEM_TYPE_CONNTRACK:
+                       flow_dv_translate_item_aso_ct(dev, match_mask,
+                                                     match_value, items);
+                       break;
                default:
                        break;
                }
@@ -12008,6 +13008,8 @@ flow_dv_translate(struct rte_eth_dev *dev,
        }
        dev_flow->dv.actions_n = actions_n;
        dev_flow->act_flags = action_flags;
+       if (wks->skip_matcher_reg)
+               return 0;
        /* Register matcher. */
        matcher.crc = rte_raw_cksum((const void *)matcher.mask.buf,
                                    matcher.mask.size);
@@ -12764,7 +13766,10 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)
                        mlx5_flow_meter_detach(priv, fm);
                flow->meter = 0;
        }
-       if (flow->age)
+       /* 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);
+       else if (flow->age)
                flow_dv_aso_age_release(dev, flow->age);
        if (flow->geneve_tlv_option) {
                flow_dv_geneve_tlv_option_resource_release(dev);
@@ -13191,6 +14196,8 @@ flow_dv_action_create(struct rte_eth_dev *dev,
                      const struct rte_flow_action *action,
                      struct rte_flow_error *err)
 {
+       struct mlx5_priv *priv = dev->data->dev_private;
+       uint32_t age_idx = 0;
        uint32_t idx = 0;
        uint32_t ret = 0;
 
@@ -13201,17 +14208,32 @@ flow_dv_action_create(struct rte_eth_dev *dev,
                       MLX5_INDIRECT_ACTION_TYPE_OFFSET) | ret;
                break;
        case RTE_FLOW_ACTION_TYPE_AGE:
-               ret = flow_dv_translate_create_aso_age(dev, action->conf, err);
+               age_idx = flow_dv_aso_age_alloc(dev, err);
+               if (!age_idx) {
+                       ret = -rte_errno;
+                       break;
+               }
                idx = (MLX5_INDIRECT_ACTION_TYPE_AGE <<
+                      MLX5_INDIRECT_ACTION_TYPE_OFFSET) | age_idx;
+               flow_dv_aso_age_params_init(dev, age_idx,
+                                       ((const struct rte_flow_action_age *)
+                                               action->conf)->context ?
+                                       ((const struct rte_flow_action_age *)
+                                               action->conf)->context :
+                                       (void *)(uintptr_t)idx,
+                                       ((const struct rte_flow_action_age *)
+                                               action->conf)->timeout);
+               ret = age_idx;
+               break;
+       case RTE_FLOW_ACTION_TYPE_COUNT:
+               ret = flow_dv_translate_create_counter(dev, NULL, NULL, NULL);
+               idx = (MLX5_INDIRECT_ACTION_TYPE_COUNT <<
                       MLX5_INDIRECT_ACTION_TYPE_OFFSET) | ret;
-               if (ret) {
-                       struct mlx5_aso_age_action *aso_age =
-                                             flow_aso_age_get_by_idx(dev, ret);
-
-                       if (!aso_age->age_params.context)
-                               aso_age->age_params.context =
-                                                        (void *)(uintptr_t)idx;
-               }
+               break;
+       case RTE_FLOW_ACTION_TYPE_CONNTRACK:
+               ret = flow_dv_translate_create_conntrack(dev, action->conf,
+                                                        err);
+               idx = MLX5_INDIRECT_ACT_CT_GEN_IDX(PORT_ID(priv), ret);
                break;
        default:
                rte_flow_error_set(err, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
@@ -13246,11 +14268,25 @@ flow_dv_action_destroy(struct rte_eth_dev *dev,
        uint32_t act_idx = (uint32_t)(uintptr_t)handle;
        uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;
        uint32_t idx = act_idx & ((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1);
+       struct mlx5_flow_counter *cnt;
+       uint32_t no_flow_refcnt = 1;
        int ret;
 
        switch (type) {
        case MLX5_INDIRECT_ACTION_TYPE_RSS:
                return __flow_dv_action_rss_release(dev, idx, error);
+       case MLX5_INDIRECT_ACTION_TYPE_COUNT:
+               cnt = flow_dv_counter_get_by_idx(dev, idx, NULL);
+               if (!__atomic_compare_exchange_n(&cnt->shared_info.refcnt,
+                                                &no_flow_refcnt, 1, false,
+                                                __ATOMIC_ACQUIRE,
+                                                __ATOMIC_RELAXED))
+                       return rte_flow_error_set(error, EBUSY,
+                                                 RTE_FLOW_ERROR_TYPE_ACTION,
+                                                 NULL,
+                                                 "Indirect count action has references");
+               flow_dv_counter_free(dev, idx);
+               return 0;
        case MLX5_INDIRECT_ACTION_TYPE_AGE:
                ret = flow_dv_aso_age_release(dev, idx);
                if (ret)
@@ -13261,6 +14297,14 @@ flow_dv_action_destroy(struct rte_eth_dev *dev,
                        DRV_LOG(DEBUG, "Indirect age action %" PRIu32 " was"
                                " released with references %d.", idx, ret);
                return 0;
+       case MLX5_INDIRECT_ACTION_TYPE_CT:
+               ret = flow_dv_aso_ct_release(dev, idx);
+               if (ret < 0)
+                       return ret;
+               if (ret > 0)
+                       DRV_LOG(DEBUG, "Connection tracking object %u still "
+                               "has references %d.", idx, ret);
+               return 0;
        default:
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_ACTION,
@@ -13335,6 +14379,72 @@ __flow_dv_action_rss_update(struct rte_eth_dev *dev, uint32_t idx,
        return ret;
 }
 
+/*
+ * Updates in place conntrack context or direction.
+ * Context update should be synchronized.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[in] idx
+ *   The conntrack object ID to be updated.
+ * @param[in] update
+ *   Pointer to the structure of information to update.
+ * @param[out] error
+ *   Perform verbose error reporting if not NULL. Initialized in case of
+ *   error only.
+ *
+ * @return
+ *   0 on success, otherwise negative errno value.
+ */
+static int
+__flow_dv_action_ct_update(struct rte_eth_dev *dev, uint32_t idx,
+                          const struct rte_flow_modify_conntrack *update,
+                          struct rte_flow_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_aso_ct_action *ct;
+       const struct rte_flow_action_conntrack *new_prf;
+       int ret = 0;
+       uint16_t owner = (uint16_t)MLX5_INDIRECT_ACT_CT_GET_OWNER(idx);
+       uint32_t dev_idx;
+
+       if (PORT_ID(priv) != owner)
+               return rte_flow_error_set(error, EACCES,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                         NULL,
+                                         "CT object owned by another port");
+       dev_idx = MLX5_INDIRECT_ACT_CT_GET_IDX(idx);
+       ct = flow_aso_ct_get_by_dev_idx(dev, dev_idx);
+       if (!ct->refcnt)
+               return rte_flow_error_set(error, ENOMEM,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                         NULL,
+                                         "CT object is inactive");
+       new_prf = &update->new_ct;
+       if (update->direction)
+               ct->is_original = !!new_prf->is_original_dir;
+       if (update->state) {
+               /* Only validate the profile when it needs to be updated. */
+               ret = mlx5_validate_action_ct(dev, new_prf, error);
+               if (ret)
+                       return ret;
+               ret = mlx5_aso_ct_update_by_wqe(priv->sh, ct, new_prf);
+               if (ret)
+                       return rte_flow_error_set(error, EIO,
+                                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                       NULL,
+                                       "Failed to send CT context update WQE");
+               /* Block until ready or a failure. */
+               ret = mlx5_aso_ct_available(priv->sh, ct);
+               if (ret)
+                       rte_flow_error_set(error, rte_errno,
+                                          RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                          NULL,
+                                          "Timeout to get the CT update");
+       }
+       return ret;
+}
+
 /**
  * Updates in place shared action configuration, lock free,
  * (mutex should be acquired by caller).
@@ -13370,12 +14480,617 @@ flow_dv_action_update(struct rte_eth_dev *dev,
        case MLX5_INDIRECT_ACTION_TYPE_RSS:
                action_conf = ((const struct rte_flow_action *)update)->conf;
                return __flow_dv_action_rss_update(dev, idx, action_conf, err);
+       case MLX5_INDIRECT_ACTION_TYPE_CT:
+               return __flow_dv_action_ct_update(dev, idx, update, err);
        default:
                return rte_flow_error_set(err, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_ACTION,
                                          NULL,
-                                         "action type update not supported");
+                                         "action type update not supported");
+       }
+}
+
+/**
+ * Destroy the meter sub policy table rules.
+ * Lock free, (mutex should be acquired by caller).
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ * @param[in] sub_policy
+ *   Pointer to meter sub policy table.
+ */
+static void
+__flow_dv_destroy_sub_policy_rules(struct rte_eth_dev *dev,
+                            struct mlx5_flow_meter_sub_policy *sub_policy)
+{
+       struct mlx5_flow_tbl_data_entry *tbl;
+       int i;
+
+       for (i = 0; i < RTE_COLORS; i++) {
+               if (sub_policy->color_rule[i]) {
+                       claim_zero(mlx5_flow_os_destroy_flow
+                               (sub_policy->color_rule[i]));
+                       sub_policy->color_rule[i] = NULL;
+               }
+               if (sub_policy->color_matcher[i]) {
+                       tbl = container_of(sub_policy->color_matcher[i]->tbl,
+                               typeof(*tbl), tbl);
+                       mlx5_cache_unregister(&tbl->matchers,
+                                     &sub_policy->color_matcher[i]->entry);
+                       sub_policy->color_matcher[i] = NULL;
+               }
+       }
+       for (i = 0; i < MLX5_MTR_RTE_COLORS; i++) {
+               if (sub_policy->rix_hrxq[i]) {
+                       mlx5_hrxq_release(dev, sub_policy->rix_hrxq[i]);
+                       sub_policy->rix_hrxq[i] = 0;
+               }
+               if (sub_policy->jump_tbl[i]) {
+                       flow_dv_tbl_resource_release(MLX5_SH(dev),
+                       sub_policy->jump_tbl[i]);
+                       sub_policy->jump_tbl[i] = NULL;
+               }
+       }
+       if (sub_policy->tbl_rsc) {
+               flow_dv_tbl_resource_release(MLX5_SH(dev),
+                       sub_policy->tbl_rsc);
+               sub_policy->tbl_rsc = NULL;
+       }
+}
+
+/**
+ * Destroy policy rules, lock free,
+ * (mutex should be acquired by caller).
+ * Dispatcher for action type specific call.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[in] mtr_policy
+ *   Meter policy struct.
+ */
+static void
+flow_dv_destroy_policy_rules(struct rte_eth_dev *dev,
+                     struct mlx5_flow_meter_policy *mtr_policy)
+{
+       uint32_t i, j;
+       struct mlx5_flow_meter_sub_policy *sub_policy;
+       uint16_t sub_policy_num;
+
+       for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) {
+               sub_policy_num = (mtr_policy->sub_policy_num >>
+                       (MLX5_MTR_SUB_POLICY_NUM_SHIFT * i)) &
+                       MLX5_MTR_SUB_POLICY_NUM_MASK;
+               for (j = 0; j < sub_policy_num; j++) {
+                       sub_policy = mtr_policy->sub_policys[i][j];
+                       if (sub_policy)
+                               __flow_dv_destroy_sub_policy_rules
+                                               (dev, sub_policy);
+               }
+       }
+}
+
+/**
+ * Destroy policy action, lock free,
+ * (mutex should be acquired by caller).
+ * Dispatcher for action type specific call.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[in] mtr_policy
+ *   Meter policy struct.
+ */
+static void
+flow_dv_destroy_mtr_policy_acts(struct rte_eth_dev *dev,
+                     struct mlx5_flow_meter_policy *mtr_policy)
+{
+       struct rte_flow_action *rss_action;
+       struct mlx5_flow_handle dev_handle;
+       uint32_t i, j;
+
+       for (i = 0; i < MLX5_MTR_RTE_COLORS; i++) {
+               if (mtr_policy->act_cnt[i].rix_mark) {
+                       flow_dv_tag_release(dev,
+                               mtr_policy->act_cnt[i].rix_mark);
+                       mtr_policy->act_cnt[i].rix_mark = 0;
+               }
+               if (mtr_policy->act_cnt[i].modify_hdr) {
+                       dev_handle.dvh.modify_hdr =
+                               mtr_policy->act_cnt[i].modify_hdr;
+                       flow_dv_modify_hdr_resource_release(dev, &dev_handle);
+               }
+               switch (mtr_policy->act_cnt[i].fate_action) {
+               case MLX5_FLOW_FATE_SHARED_RSS:
+                       rss_action = mtr_policy->act_cnt[i].rss;
+                       mlx5_free(rss_action);
+                       break;
+               case MLX5_FLOW_FATE_PORT_ID:
+                       if (mtr_policy->act_cnt[i].rix_port_id_action) {
+                               flow_dv_port_id_action_resource_release(dev,
+                               mtr_policy->act_cnt[i].rix_port_id_action);
+                               mtr_policy->act_cnt[i].rix_port_id_action = 0;
+                       }
+                       break;
+               case MLX5_FLOW_FATE_DROP:
+               case MLX5_FLOW_FATE_JUMP:
+                       for (j = 0; j < MLX5_MTR_DOMAIN_MAX; j++)
+                               mtr_policy->act_cnt[i].dr_jump_action[j] =
+                                               NULL;
+                       break;
+               default:
+                       /*Queue action do nothing*/
+                       break;
+               }
+       }
+       for (j = 0; j < MLX5_MTR_DOMAIN_MAX; j++)
+               mtr_policy->dr_drop_action[j] = NULL;
+}
+
+/**
+ * Create policy action per domain, lock free,
+ * (mutex should be acquired by caller).
+ * Dispatcher for action type specific call.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[in] mtr_policy
+ *   Meter policy struct.
+ * @param[in] action
+ *   Action specification used to create meter actions.
+ * @param[out] error
+ *   Perform verbose error reporting if not NULL. Initialized in case of
+ *   error only.
+ *
+ * @return
+ *   0 on success, otherwise negative errno value.
+ */
+static int
+__flow_dv_create_domain_policy_acts(struct rte_eth_dev *dev,
+                       struct mlx5_flow_meter_policy *mtr_policy,
+                       const struct rte_flow_action *actions[RTE_COLORS],
+                       enum mlx5_meter_domain domain,
+                       struct rte_mtr_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct rte_flow_error flow_err;
+       const struct rte_flow_action *act;
+       uint64_t action_flags = 0;
+       struct mlx5_flow_handle dh;
+       struct mlx5_flow dev_flow;
+       struct mlx5_flow_dv_port_id_action_resource port_id_action;
+       int i, ret;
+       uint8_t egress, transfer;
+       struct mlx5_meter_policy_action_container *act_cnt = NULL;
+       union {
+               struct mlx5_flow_dv_modify_hdr_resource res;
+               uint8_t len[sizeof(struct mlx5_flow_dv_modify_hdr_resource) +
+                           sizeof(struct mlx5_modification_cmd) *
+                           (MLX5_MAX_MODIFY_NUM + 1)];
+       } mhdr_dummy;
+
+       egress = (domain == MLX5_MTR_DOMAIN_EGRESS) ? 1 : 0;
+       transfer = (domain == MLX5_MTR_DOMAIN_TRANSFER) ? 1 : 0;
+       memset(&dh, 0, sizeof(struct mlx5_flow_handle));
+       memset(&dev_flow, 0, sizeof(struct mlx5_flow));
+       memset(&port_id_action, 0,
+               sizeof(struct mlx5_flow_dv_port_id_action_resource));
+       dev_flow.handle = &dh;
+       dev_flow.dv.port_id_action = &port_id_action;
+       dev_flow.external = true;
+       for (i = 0; i < RTE_COLORS; i++) {
+               if (i < MLX5_MTR_RTE_COLORS)
+                       act_cnt = &mtr_policy->act_cnt[i];
+               for (act = actions[i];
+                       act && act->type != RTE_FLOW_ACTION_TYPE_END;
+                       act++) {
+                       switch (act->type) {
+                       case RTE_FLOW_ACTION_TYPE_MARK:
+                       {
+                               uint32_t tag_be = mlx5_flow_mark_set
+                                       (((const struct rte_flow_action_mark *)
+                                       (act->conf))->id);
+
+                               if (i >= MLX5_MTR_RTE_COLORS)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL,
+                                         "cannot create policy "
+                                         "mark action for this color");
+                               dev_flow.handle->mark = 1;
+                               if (flow_dv_tag_resource_register(dev, tag_be,
+                                                 &dev_flow, &flow_err))
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL,
+                                       "cannot setup policy mark action");
+                               MLX5_ASSERT(dev_flow.dv.tag_resource);
+                               act_cnt->rix_mark =
+                                       dev_flow.handle->dvh.rix_tag;
+                               if (action_flags & MLX5_FLOW_ACTION_QUEUE) {
+                                       dev_flow.handle->rix_hrxq =
+                       mtr_policy->sub_policys[domain][0]->rix_hrxq[i];
+                                       flow_drv_rxq_flags_set(dev,
+                                               dev_flow.handle);
+                               }
+                               action_flags |= MLX5_FLOW_ACTION_MARK;
+                               break;
+                       }
+                       case RTE_FLOW_ACTION_TYPE_SET_TAG:
+                       {
+                               struct mlx5_flow_dv_modify_hdr_resource
+                                       *mhdr_res = &mhdr_dummy.res;
+
+                               if (i >= MLX5_MTR_RTE_COLORS)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL,
+                                         "cannot create policy "
+                                         "set tag action for this color");
+                               memset(mhdr_res, 0, sizeof(*mhdr_res));
+                               mhdr_res->ft_type = transfer ?
+                                       MLX5DV_FLOW_TABLE_TYPE_FDB :
+                                       egress ?
+                                       MLX5DV_FLOW_TABLE_TYPE_NIC_TX :
+                                       MLX5DV_FLOW_TABLE_TYPE_NIC_RX;
+                               if (flow_dv_convert_action_set_tag
+                               (dev, mhdr_res,
+                               (const struct rte_flow_action_set_tag *)
+                               act->conf,  &flow_err))
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot convert policy "
+                                       "set tag action");
+                               if (!mhdr_res->actions_num)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot find policy "
+                                       "set tag action");
+                               /* create modify action if needed. */
+                               dev_flow.dv.group = 1;
+                               if (flow_dv_modify_hdr_resource_register
+                                       (dev, mhdr_res, &dev_flow, &flow_err))
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot register policy "
+                                       "set tag action");
+                               act_cnt->modify_hdr =
+                               dev_flow.handle->dvh.modify_hdr;
+                               if (action_flags & MLX5_FLOW_ACTION_QUEUE) {
+                                       dev_flow.handle->rix_hrxq =
+                               mtr_policy->sub_policys[domain][0]->rix_hrxq[i];
+                                       flow_drv_rxq_flags_set(dev,
+                                               dev_flow.handle);
+                               }
+                               action_flags |= MLX5_FLOW_ACTION_SET_TAG;
+                               break;
+                       }
+                       case RTE_FLOW_ACTION_TYPE_DROP:
+                       {
+                               struct mlx5_flow_mtr_mng *mtrmng =
+                                               priv->sh->mtrmng;
+                               struct mlx5_flow_tbl_data_entry *tbl_data;
+
+                               /*
+                                * Create the drop table with
+                                * METER DROP level.
+                                */
+                               if (!mtrmng->drop_tbl[domain]) {
+                                       mtrmng->drop_tbl[domain] =
+                                       flow_dv_tbl_resource_get(dev,
+                                       MLX5_FLOW_TABLE_LEVEL_METER,
+                                       egress, transfer, false, NULL, 0,
+                                       0, MLX5_MTR_TABLE_ID_DROP, &flow_err);
+                                       if (!mtrmng->drop_tbl[domain])
+                                               return -rte_mtr_error_set
+                                       (error, ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL,
+                                       "Failed to create meter drop table");
+                               }
+                               tbl_data = container_of
+                               (mtrmng->drop_tbl[domain],
+                               struct mlx5_flow_tbl_data_entry, tbl);
+                               if (i < MLX5_MTR_RTE_COLORS) {
+                                       act_cnt->dr_jump_action[domain] =
+                                               tbl_data->jump.action;
+                                       act_cnt->fate_action =
+                                               MLX5_FLOW_FATE_DROP;
+                               }
+                               if (i == RTE_COLOR_RED)
+                                       mtr_policy->dr_drop_action[domain] =
+                                               tbl_data->jump.action;
+                               action_flags |= MLX5_FLOW_ACTION_DROP;
+                               break;
+                       }
+                       case RTE_FLOW_ACTION_TYPE_QUEUE:
+                       {
+                               struct mlx5_hrxq *hrxq;
+                               uint32_t hrxq_idx;
+                               struct mlx5_flow_rss_desc rss_desc;
+                               struct mlx5_flow_meter_sub_policy *sub_policy =
+                               mtr_policy->sub_policys[domain][0];
+
+                               if (i >= MLX5_MTR_RTE_COLORS)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot create policy "
+                                       "fate queue for this color");
+                               memset(&rss_desc, 0,
+                                       sizeof(struct mlx5_flow_rss_desc));
+                               rss_desc.queue_num = 1;
+                               rss_desc.const_q = act->conf;
+                               hrxq = flow_dv_hrxq_prepare(dev, &dev_flow,
+                                                   &rss_desc, &hrxq_idx);
+                               if (!hrxq)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL,
+                                       "cannot create policy fate queue");
+                               sub_policy->rix_hrxq[i] = hrxq_idx;
+                               act_cnt->fate_action =
+                                       MLX5_FLOW_FATE_QUEUE;
+                               dev_flow.handle->fate_action =
+                                       MLX5_FLOW_FATE_QUEUE;
+                               if (action_flags & MLX5_FLOW_ACTION_MARK ||
+                                   action_flags & MLX5_FLOW_ACTION_SET_TAG) {
+                                       dev_flow.handle->rix_hrxq = hrxq_idx;
+                                       flow_drv_rxq_flags_set(dev,
+                                               dev_flow.handle);
+                               }
+                               action_flags |= MLX5_FLOW_ACTION_QUEUE;
+                               break;
+                       }
+                       case RTE_FLOW_ACTION_TYPE_RSS:
+                       {
+                               int rss_size;
+
+                               if (i >= MLX5_MTR_RTE_COLORS)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL,
+                                         "cannot create policy "
+                                         "rss action for this color");
+                               /*
+                                * Save RSS conf into policy struct
+                                * for translate stage.
+                                */
+                               rss_size = (int)rte_flow_conv
+                                       (RTE_FLOW_CONV_OP_ACTION,
+                                       NULL, 0, act, &flow_err);
+                               if (rss_size <= 0)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, "Get the wrong "
+                                         "rss action struct size");
+                               act_cnt->rss = mlx5_malloc(MLX5_MEM_ZERO,
+                                               rss_size, 0, SOCKET_ID_ANY);
+                               if (!act_cnt->rss)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL,
+                                         "Fail to malloc rss action memory");
+                               ret = rte_flow_conv(RTE_FLOW_CONV_OP_ACTION,
+                                       act_cnt->rss, rss_size,
+                                       act, &flow_err);
+                               if (ret < 0)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, "Fail to save "
+                                         "rss action into policy struct");
+                               act_cnt->fate_action =
+                                       MLX5_FLOW_FATE_SHARED_RSS;
+                               action_flags |= MLX5_FLOW_ACTION_RSS;
+                               break;
+                       }
+                       case RTE_FLOW_ACTION_TYPE_PORT_ID:
+                       {
+                               struct mlx5_flow_dv_port_id_action_resource
+                                       port_id_resource;
+                               uint32_t port_id = 0;
+
+                               if (i >= MLX5_MTR_RTE_COLORS)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot create policy "
+                                       "port action for this color");
+                               memset(&port_id_resource, 0,
+                                       sizeof(port_id_resource));
+                               if (flow_dv_translate_action_port_id(dev, act,
+                                               &port_id, &flow_err))
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot translate "
+                                       "policy port action");
+                               port_id_resource.port_id = port_id;
+                               if (flow_dv_port_id_action_resource_register
+                                       (dev, &port_id_resource,
+                                       &dev_flow, &flow_err))
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot setup "
+                                       "policy port action");
+                               act_cnt->rix_port_id_action =
+                                       dev_flow.handle->rix_port_id_action;
+                               act_cnt->fate_action =
+                                       MLX5_FLOW_FATE_PORT_ID;
+                               action_flags |= MLX5_FLOW_ACTION_PORT_ID;
+                               break;
+                       }
+                       case RTE_FLOW_ACTION_TYPE_JUMP:
+                       {
+                               uint32_t jump_group = 0;
+                               uint32_t table = 0;
+                               struct mlx5_flow_tbl_data_entry *tbl_data;
+                               struct flow_grp_info grp_info = {
+                                       .external = !!dev_flow.external,
+                                       .transfer = !!transfer,
+                                       .fdb_def_rule = !!priv->fdb_def_rule,
+                                       .std_tbl_fix = 0,
+                                       .skip_scale = dev_flow.skip_scale &
+                                       (1 << MLX5_SCALE_FLOW_GROUP_BIT),
+                               };
+                               struct mlx5_flow_meter_sub_policy *sub_policy =
+                               mtr_policy->sub_policys[domain][0];
+
+                               if (i >= MLX5_MTR_RTE_COLORS)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL,
+                                         "cannot create policy "
+                                         "jump action for this color");
+                               jump_group =
+                               ((const struct rte_flow_action_jump *)
+                                                       act->conf)->group;
+                               if (mlx5_flow_group_to_table(dev, NULL,
+                                                      jump_group,
+                                                      &table,
+                                                      &grp_info, &flow_err))
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot setup "
+                                       "policy jump action");
+                               sub_policy->jump_tbl[i] =
+                               flow_dv_tbl_resource_get(dev,
+                                       table, egress,
+                                       transfer,
+                                       !!dev_flow.external,
+                                       NULL, jump_group, 0,
+                                       0, &flow_err);
+                               if
+                               (!sub_policy->jump_tbl[i])
+                                       return  -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "cannot create jump action.");
+                               tbl_data = container_of
+                               (sub_policy->jump_tbl[i],
+                               struct mlx5_flow_tbl_data_entry, tbl);
+                               act_cnt->dr_jump_action[domain] =
+                                       tbl_data->jump.action;
+                               act_cnt->fate_action =
+                                       MLX5_FLOW_FATE_JUMP;
+                               action_flags |= MLX5_FLOW_ACTION_JUMP;
+                               break;
+                       }
+                       default:
+                               return -rte_mtr_error_set(error, ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, "action type not supported");
+                       }
+               }
+       }
+       return 0;
+}
+
+/**
+ * Create policy action per domain, lock free,
+ * (mutex should be acquired by caller).
+ * Dispatcher for action type specific call.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[in] mtr_policy
+ *   Meter policy struct.
+ * @param[in] action
+ *   Action specification used to create meter actions.
+ * @param[out] error
+ *   Perform verbose error reporting if not NULL. Initialized in case of
+ *   error only.
+ *
+ * @return
+ *   0 on success, otherwise negative errno value.
+ */
+static int
+flow_dv_create_mtr_policy_acts(struct rte_eth_dev *dev,
+                     struct mlx5_flow_meter_policy *mtr_policy,
+                     const struct rte_flow_action *actions[RTE_COLORS],
+                     struct rte_mtr_error *error)
+{
+       int ret, i;
+       uint16_t sub_policy_num;
+
+       for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) {
+               sub_policy_num = (mtr_policy->sub_policy_num >>
+                       (MLX5_MTR_SUB_POLICY_NUM_SHIFT * i)) &
+                       MLX5_MTR_SUB_POLICY_NUM_MASK;
+               if (sub_policy_num) {
+                       ret = __flow_dv_create_domain_policy_acts(dev,
+                               mtr_policy, actions,
+                               (enum mlx5_meter_domain)i, error);
+                       if (ret)
+                               return ret;
+               }
+       }
+       return 0;
+}
+
+/**
+ * Query a DV flow rule for its statistics via DevX.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ * @param[in] cnt_idx
+ *   Index to the flow counter.
+ * @param[out] data
+ *   Data retrieved by the query.
+ * @param[out] error
+ *   Perform verbose error reporting if not NULL.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static 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)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                         NULL,
+                                         "counters are not supported");
+       if (cnt_idx) {
+               uint64_t pkts, bytes;
+               struct mlx5_flow_counter *cnt;
+               int err = _flow_dv_query_count(dev, cnt_idx, &pkts, &bytes);
+
+               if (err)
+                       return rte_flow_error_set(error, -err,
+                                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                       NULL, "cannot read counters");
+               cnt = flow_dv_counter_get_by_idx(dev, cnt_idx, NULL);
+               qc->hits_set = 1;
+               qc->bytes_set = 1;
+               qc->hits = pkts - cnt->hits;
+               qc->bytes = bytes - cnt->bytes;
+               if (qc->reset) {
+                       cnt->hits = pkts;
+                       cnt->bytes = bytes;
+               }
+               return 0;
        }
+       return rte_flow_error_set(error, EINVAL,
+                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                 NULL,
+                                 "counters are not available");
 }
 
 static int
@@ -13388,6 +15103,10 @@ flow_dv_action_query(struct rte_eth_dev *dev,
        uint32_t act_idx = (uint32_t)(uintptr_t)handle;
        uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;
        uint32_t idx = act_idx & ((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1);
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_aso_ct_action *ct;
+       uint16_t owner;
+       uint32_t dev_idx;
 
        switch (type) {
        case MLX5_INDIRECT_ACTION_TYPE_AGE:
@@ -13401,16 +15120,42 @@ flow_dv_action_query(struct rte_eth_dev *dev,
                        resp->sec_since_last_hit = __atomic_load_n
                             (&age_param->sec_since_last_hit, __ATOMIC_RELAXED);
                return 0;
+       case MLX5_INDIRECT_ACTION_TYPE_COUNT:
+               return flow_dv_query_count(dev, idx, data, error);
+       case MLX5_INDIRECT_ACTION_TYPE_CT:
+               owner = (uint16_t)MLX5_INDIRECT_ACT_CT_GET_OWNER(idx);
+               if (owner != PORT_ID(priv))
+                       return rte_flow_error_set(error, EACCES,
+                                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                       NULL,
+                                       "CT object owned by another port");
+               dev_idx = MLX5_INDIRECT_ACT_CT_GET_IDX(idx);
+               ct = flow_aso_ct_get_by_dev_idx(dev, dev_idx);
+               MLX5_ASSERT(ct);
+               if (!ct->refcnt)
+                       return rte_flow_error_set(error, EFAULT,
+                                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                       NULL,
+                                       "CT object is inactive");
+               ((struct rte_flow_action_conntrack *)data)->peer_port =
+                                                       ct->peer;
+               ((struct rte_flow_action_conntrack *)data)->is_original_dir =
+                                                       ct->is_original;
+               if (mlx5_aso_ct_query_by_wqe(priv->sh, ct, data))
+                       return rte_flow_error_set(error, EIO,
+                                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                       NULL,
+                                       "Failed to query CT context");
+               return 0;
        default:
                return rte_flow_error_set(error, ENOTSUP,
-                                         RTE_FLOW_ERROR_TYPE_ACTION,
-                                         NULL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
                                          "action type query not supported");
        }
 }
 
 /**
- * Query a dv flow  rule for its statistics via devx.
+ * Query a flow rule AGE action for aging information.
  *
  * @param[in] dev
  *   Pointer to Ethernet device.
@@ -13425,271 +15170,890 @@ flow_dv_action_query(struct rte_eth_dev *dev,
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-flow_dv_query_count(struct rte_eth_dev *dev, struct rte_flow *flow,
-                   void *data, struct rte_flow_error *error)
+flow_dv_query_age(struct rte_eth_dev *dev, struct rte_flow *flow,
+                 void *data, struct rte_flow_error *error)
 {
-       struct mlx5_priv *priv = dev->data->dev_private;
-       struct rte_flow_query_count *qc = data;
+       struct rte_flow_query_age *resp = data;
+       struct mlx5_age_param *age_param;
 
-       if (!priv->config.devx)
-               return rte_flow_error_set(error, ENOTSUP,
+       if (flow->age) {
+               struct mlx5_aso_age_action *act =
+                                    flow_aso_age_get_by_idx(dev, flow->age);
+
+               age_param = &act->age_params;
+       } else if (flow->counter) {
+               age_param = flow_dv_counter_idx_get_age(dev, flow->counter);
+
+               if (!age_param || !age_param->timeout)
+                       return rte_flow_error_set
+                                       (error, EINVAL,
+                                        RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                        NULL, "cannot read age data");
+       } else {
+               return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                         NULL,
-                                         "counters are not supported");
-       if (flow->counter) {
-               uint64_t pkts, bytes;
-               struct mlx5_flow_counter *cnt;
+                                         NULL, "age data not available");
+       }
+       resp->aged = __atomic_load_n(&age_param->state, __ATOMIC_RELAXED) ==
+                                    AGE_TMOUT ? 1 : 0;
+       resp->sec_since_last_hit_valid = !resp->aged;
+       if (resp->sec_since_last_hit_valid)
+               resp->sec_since_last_hit = __atomic_load_n
+                            (&age_param->sec_since_last_hit, __ATOMIC_RELAXED);
+       return 0;
+}
 
-               cnt = flow_dv_counter_get_by_idx(dev, flow->counter,
-                                                NULL);
-               int err = _flow_dv_query_count(dev, flow->counter, &pkts,
-                                              &bytes);
+/**
+ * Query a flow.
+ *
+ * @see rte_flow_query()
+ * @see rte_flow_ops
+ */
+static int
+flow_dv_query(struct rte_eth_dev *dev,
+             struct rte_flow *flow __rte_unused,
+             const struct rte_flow_action *actions __rte_unused,
+             void *data __rte_unused,
+             struct rte_flow_error *error __rte_unused)
+{
+       int ret = -EINVAL;
 
-               if (err)
-                       return rte_flow_error_set(error, -err,
-                                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                       NULL, "cannot read counters");
-               qc->hits_set = 1;
-               qc->bytes_set = 1;
-               qc->hits = pkts - cnt->hits;
-               qc->bytes = bytes - cnt->bytes;
-               if (qc->reset) {
-                       cnt->hits = pkts;
-                       cnt->bytes = bytes;
+       for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
+               switch (actions->type) {
+               case RTE_FLOW_ACTION_TYPE_VOID:
+                       break;
+               case RTE_FLOW_ACTION_TYPE_COUNT:
+                       ret = flow_dv_query_count(dev, flow->counter, data,
+                                                 error);
+                       break;
+               case RTE_FLOW_ACTION_TYPE_AGE:
+                       ret = flow_dv_query_age(dev, flow, data, error);
+                       break;
+               default:
+                       return rte_flow_error_set(error, ENOTSUP,
+                                                 RTE_FLOW_ERROR_TYPE_ACTION,
+                                                 actions,
+                                                 "action not supported");
+               }
+       }
+       return ret;
+}
+
+/**
+ * Destroy the meter table set.
+ * Lock free, (mutex should be acquired by caller).
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ * @param[in] fm
+ *   Meter information table.
+ */
+static void
+flow_dv_destroy_mtr_tbls(struct rte_eth_dev *dev,
+                       struct mlx5_flow_meter_info *fm)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       int i;
+
+       if (!fm || !priv->config.dv_flow_en)
+               return;
+       for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) {
+               if (fm->drop_rule[i]) {
+                       claim_zero(mlx5_flow_os_destroy_flow(fm->drop_rule[i]));
+                       fm->drop_rule[i] = NULL;
+               }
+       }
+}
+
+static void
+flow_dv_destroy_mtr_drop_tbls(struct rte_eth_dev *dev)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_flow_mtr_mng *mtrmng = priv->sh->mtrmng;
+       struct mlx5_flow_tbl_data_entry *tbl;
+       int i, j;
+
+       for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) {
+               if (mtrmng->def_rule[i]) {
+                       claim_zero(mlx5_flow_os_destroy_flow
+                                       (mtrmng->def_rule[i]));
+                       mtrmng->def_rule[i] = NULL;
+               }
+               if (mtrmng->def_matcher[i]) {
+                       tbl = container_of(mtrmng->def_matcher[i]->tbl,
+                               struct mlx5_flow_tbl_data_entry, tbl);
+                       mlx5_cache_unregister(&tbl->matchers,
+                                     &mtrmng->def_matcher[i]->entry);
+                       mtrmng->def_matcher[i] = NULL;
+               }
+               for (j = 0; j < MLX5_REG_BITS; j++) {
+                       if (mtrmng->drop_matcher[i][j]) {
+                               tbl =
+                               container_of(mtrmng->drop_matcher[i][j]->tbl,
+                                            struct mlx5_flow_tbl_data_entry,
+                                            tbl);
+                               mlx5_cache_unregister(&tbl->matchers,
+                                       &mtrmng->drop_matcher[i][j]->entry);
+                               mtrmng->drop_matcher[i][j] = NULL;
+                       }
+               }
+               if (mtrmng->drop_tbl[i]) {
+                       flow_dv_tbl_resource_release(MLX5_SH(dev),
+                               mtrmng->drop_tbl[i]);
+                       mtrmng->drop_tbl[i] = NULL;
+               }
+       }
+}
+
+/* Number of meter flow actions, count and jump or count and drop. */
+#define METER_ACTIONS 2
+
+static void
+__flow_dv_destroy_domain_def_policy(struct rte_eth_dev *dev,
+                             enum mlx5_meter_domain domain)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_flow_meter_def_policy *def_policy =
+                       priv->sh->mtrmng->def_policy[domain];
+
+       __flow_dv_destroy_sub_policy_rules(dev, &def_policy->sub_policy);
+       mlx5_free(def_policy);
+       priv->sh->mtrmng->def_policy[domain] = NULL;
+}
+
+/**
+ * Destroy the default policy table set.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ */
+static void
+flow_dv_destroy_def_policy(struct rte_eth_dev *dev)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       int i;
+
+       for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++)
+               if (priv->sh->mtrmng->def_policy[i])
+                       __flow_dv_destroy_domain_def_policy(dev,
+                                       (enum mlx5_meter_domain)i);
+       priv->sh->mtrmng->def_policy_id = MLX5_INVALID_POLICY_ID;
+}
+
+static int
+__flow_dv_create_policy_flow(struct rte_eth_dev *dev,
+                       uint32_t color_reg_c_idx,
+                       enum rte_color color, void *matcher_object,
+                       int actions_n, void *actions,
+                       bool is_default_policy, void **rule,
+                       const struct rte_flow_attr *attr)
+{
+       int ret;
+       struct mlx5_flow_dv_match_params value = {
+               .size = sizeof(value.buf) -
+                       MLX5_ST_SZ_BYTES(fte_match_set_misc4),
+       };
+       struct mlx5_flow_dv_match_params matcher = {
+               .size = sizeof(matcher.buf) -
+                       MLX5_ST_SZ_BYTES(fte_match_set_misc4),
+       };
+       struct mlx5_priv *priv = dev->data->dev_private;
+
+       if (!is_default_policy && (priv->representor || priv->master)) {
+               if (flow_dv_translate_item_port_id(dev, matcher.buf,
+                                                  value.buf, NULL, attr)) {
+                       DRV_LOG(ERR,
+                       "Failed to create meter policy flow with port.");
+                       return -1;
+               }
+       }
+       flow_dv_match_meta_reg(matcher.buf, value.buf,
+                               (enum modify_reg)color_reg_c_idx,
+                               rte_col_2_mlx5_col(color),
+                               UINT32_MAX);
+       ret = mlx5_flow_os_create_flow(matcher_object,
+                       (void *)&value, actions_n, actions, rule);
+       if (ret) {
+               DRV_LOG(ERR, "Failed to create meter policy flow.");
+               return -1;
+       }
+       return 0;
+}
+
+static int
+__flow_dv_create_policy_matcher(struct rte_eth_dev *dev,
+                       uint32_t color_reg_c_idx,
+                       uint16_t priority,
+                       struct mlx5_flow_meter_sub_policy *sub_policy,
+                       const struct rte_flow_attr *attr,
+                       bool is_default_policy,
+                       struct rte_flow_error *error)
+{
+       struct mlx5_cache_entry *entry;
+       struct mlx5_flow_tbl_resource *tbl_rsc = sub_policy->tbl_rsc;
+       struct mlx5_flow_dv_matcher matcher = {
+               .mask = {
+                       .size = sizeof(matcher.mask.buf) -
+                               MLX5_ST_SZ_BYTES(fte_match_set_misc4),
+               },
+               .tbl = tbl_rsc,
+       };
+       struct mlx5_flow_dv_match_params value = {
+               .size = sizeof(value.buf) -
+                       MLX5_ST_SZ_BYTES(fte_match_set_misc4),
+       };
+       struct mlx5_flow_cb_ctx ctx = {
+               .error = error,
+               .data = &matcher,
+       };
+       struct mlx5_flow_tbl_data_entry *tbl_data;
+       struct mlx5_priv *priv = dev->data->dev_private;
+       uint32_t color_mask = (UINT32_C(1) << MLX5_MTR_COLOR_BITS) - 1;
+
+       if (!is_default_policy && (priv->representor || priv->master)) {
+               if (flow_dv_translate_item_port_id(dev, matcher.mask.buf,
+                                                  value.buf, NULL, attr)) {
+                       DRV_LOG(ERR,
+                       "Failed to register meter drop matcher with port.");
+                       return -1;
+               }
+       }
+       tbl_data = container_of(tbl_rsc, struct mlx5_flow_tbl_data_entry, tbl);
+       if (priority < RTE_COLOR_RED)
+               flow_dv_match_meta_reg(matcher.mask.buf, value.buf,
+                       (enum modify_reg)color_reg_c_idx, 0, color_mask);
+       matcher.priority = priority;
+       matcher.crc = rte_raw_cksum((const void *)matcher.mask.buf,
+                                       matcher.mask.size);
+       entry = mlx5_cache_register(&tbl_data->matchers, &ctx);
+       if (!entry) {
+               DRV_LOG(ERR, "Failed to register meter drop matcher.");
+               return -1;
+       }
+       sub_policy->color_matcher[priority] =
+               container_of(entry, struct mlx5_flow_dv_matcher, entry);
+       return 0;
+}
+
+/**
+ * Create the policy rules per domain.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ * @param[in] sub_policy
+ *    Pointer to sub policy table..
+ * @param[in] egress
+ *   Direction of the table.
+ * @param[in] transfer
+ *   E-Switch or NIC flow.
+ * @param[in] acts
+ *   Pointer to policy action list per color.
+ *
+ * @return
+ *   0 on success, -1 otherwise.
+ */
+static int
+__flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev,
+               struct mlx5_flow_meter_sub_policy *sub_policy,
+               uint8_t egress, uint8_t transfer, bool is_default_policy,
+               struct mlx5_meter_policy_acts acts[RTE_COLORS])
+{
+       struct rte_flow_error flow_err;
+       uint32_t color_reg_c_idx;
+       struct rte_flow_attr attr = {
+               .group = MLX5_FLOW_TABLE_LEVEL_POLICY,
+               .priority = 0,
+               .ingress = 0,
+               .egress = !!egress,
+               .transfer = !!transfer,
+               .reserved = 0,
+       };
+       int i;
+       int ret = mlx5_flow_get_reg_id(dev, MLX5_MTR_COLOR, 0, &flow_err);
+
+       if (ret < 0)
+               return -1;
+       /* Create policy table with POLICY level. */
+       if (!sub_policy->tbl_rsc)
+               sub_policy->tbl_rsc = flow_dv_tbl_resource_get(dev,
+                               MLX5_FLOW_TABLE_LEVEL_POLICY,
+                               egress, transfer, false, NULL, 0, 0,
+                               sub_policy->idx, &flow_err);
+       if (!sub_policy->tbl_rsc) {
+               DRV_LOG(ERR,
+                       "Failed to create meter sub policy table.");
+               return -1;
+       }
+       /* Prepare matchers. */
+       color_reg_c_idx = ret;
+       for (i = 0; i < RTE_COLORS; i++) {
+               if (i == RTE_COLOR_YELLOW || !acts[i].actions_n)
+                       continue;
+               attr.priority = i;
+               if (!sub_policy->color_matcher[i]) {
+                       /* Create matchers for Color. */
+                       if (__flow_dv_create_policy_matcher(dev,
+                               color_reg_c_idx, i, sub_policy,
+                               &attr, is_default_policy, &flow_err))
+                               return -1;
+               }
+               /* Create flow, matching color. */
+               if (acts[i].actions_n)
+                       if (__flow_dv_create_policy_flow(dev,
+                               color_reg_c_idx, (enum rte_color)i,
+                               sub_policy->color_matcher[i]->matcher_object,
+                               acts[i].actions_n,
+                               acts[i].dv_actions,
+                               is_default_policy,
+                               &sub_policy->color_rule[i],
+                               &attr))
+                               return -1;
+       }
+       return 0;
+}
+
+static int
+__flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev,
+                       struct mlx5_flow_meter_policy *mtr_policy,
+                       struct mlx5_flow_meter_sub_policy *sub_policy,
+                       uint32_t domain)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_meter_policy_acts acts[RTE_COLORS];
+       struct mlx5_flow_dv_tag_resource *tag;
+       struct mlx5_flow_dv_port_id_action_resource *port_action;
+       struct mlx5_hrxq *hrxq;
+       uint8_t egress, transfer;
+       int i;
+
+       for (i = 0; i < RTE_COLORS; i++) {
+               acts[i].actions_n = 0;
+               if (i == RTE_COLOR_YELLOW)
+                       continue;
+               if (i == RTE_COLOR_RED) {
+                       /* Only support drop on red. */
+                       acts[i].dv_actions[0] =
+                       mtr_policy->dr_drop_action[domain];
+                       acts[i].actions_n = 1;
+                       continue;
+               }
+               if (mtr_policy->act_cnt[i].rix_mark) {
+                       tag = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_TAG],
+                                       mtr_policy->act_cnt[i].rix_mark);
+                       if (!tag) {
+                               DRV_LOG(ERR, "Failed to find "
+                               "mark action for policy.");
+                               return -1;
+                       }
+                       acts[i].dv_actions[acts[i].actions_n] =
+                                               tag->action;
+                       acts[i].actions_n++;
+               }
+               if (mtr_policy->act_cnt[i].modify_hdr) {
+                       acts[i].dv_actions[acts[i].actions_n] =
+                       mtr_policy->act_cnt[i].modify_hdr->action;
+                       acts[i].actions_n++;
+               }
+               if (mtr_policy->act_cnt[i].fate_action) {
+                       switch (mtr_policy->act_cnt[i].fate_action) {
+                       case MLX5_FLOW_FATE_PORT_ID:
+                               port_action = mlx5_ipool_get
+                                       (priv->sh->ipool[MLX5_IPOOL_PORT_ID],
+                               mtr_policy->act_cnt[i].rix_port_id_action);
+                               if (!port_action) {
+                                       DRV_LOG(ERR, "Failed to find "
+                                               "port action for policy.");
+                                       return -1;
+                               }
+                               acts[i].dv_actions[acts[i].actions_n] =
+                               port_action->action;
+                               acts[i].actions_n++;
+                               break;
+                       case MLX5_FLOW_FATE_DROP:
+                       case MLX5_FLOW_FATE_JUMP:
+                               acts[i].dv_actions[acts[i].actions_n] =
+                               mtr_policy->act_cnt[i].dr_jump_action[domain];
+                               acts[i].actions_n++;
+                               break;
+                       case MLX5_FLOW_FATE_SHARED_RSS:
+                       case MLX5_FLOW_FATE_QUEUE:
+                               hrxq = mlx5_ipool_get
+                               (priv->sh->ipool[MLX5_IPOOL_HRXQ],
+                               sub_policy->rix_hrxq[i]);
+                               if (!hrxq) {
+                                       DRV_LOG(ERR, "Failed to find "
+                                               "queue action for policy.");
+                                       return -1;
+                               }
+                               acts[i].dv_actions[acts[i].actions_n] =
+                               hrxq->action;
+                               acts[i].actions_n++;
+                               break;
+                       default:
+                               /*Queue action do nothing*/
+                               break;
+                       }
                }
-               return 0;
        }
-       return rte_flow_error_set(error, EINVAL,
-                                 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                 NULL,
-                                 "counters are not available");
+       egress = (domain == MLX5_MTR_DOMAIN_EGRESS) ? 1 : 0;
+       transfer = (domain == MLX5_MTR_DOMAIN_TRANSFER) ? 1 : 0;
+       if (__flow_dv_create_domain_policy_rules(dev, sub_policy,
+                               egress, transfer, false, acts)) {
+               DRV_LOG(ERR,
+               "Failed to create policy rules per domain.");
+               return -1;
+       }
+       return 0;
 }
 
 /**
- * Query a flow rule AGE action for aging information.
+ * Create the policy rules.
  *
  * @param[in] dev
  *   Pointer to Ethernet device.
- * @param[in] flow
- *   Pointer to the sub flow.
- * @param[out] data
- *   data retrieved by the query.
- * @param[out] error
- *   Perform verbose error reporting if not NULL.
+ * @param[in,out] mtr_policy
+ *   Pointer to meter policy table.
  *
  * @return
- *   0 on success, a negative errno value otherwise and rte_errno is set.
+ *   0 on success, -1 otherwise.
  */
 static int
-flow_dv_query_age(struct rte_eth_dev *dev, struct rte_flow *flow,
-                 void *data, struct rte_flow_error *error)
+flow_dv_create_policy_rules(struct rte_eth_dev *dev,
+                            struct mlx5_flow_meter_policy *mtr_policy)
 {
-       struct rte_flow_query_age *resp = data;
-       struct mlx5_age_param *age_param;
-
-       if (flow->age) {
-               struct mlx5_aso_age_action *act =
-                                    flow_aso_age_get_by_idx(dev, flow->age);
-
-               age_param = &act->age_params;
-       } else if (flow->counter) {
-               age_param = flow_dv_counter_idx_get_age(dev, flow->counter);
+       int i;
+       uint16_t sub_policy_num;
 
-               if (!age_param || !age_param->timeout)
-                       return rte_flow_error_set
-                                       (error, EINVAL,
-                                        RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                        NULL, "cannot read age data");
-       } else {
-               return rte_flow_error_set(error, EINVAL,
-                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                         NULL, "age data not available");
+       for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) {
+               sub_policy_num = (mtr_policy->sub_policy_num >>
+                       (MLX5_MTR_SUB_POLICY_NUM_SHIFT * i)) &
+                       MLX5_MTR_SUB_POLICY_NUM_MASK;
+               if (!sub_policy_num)
+                       continue;
+               /* Prepare actions list and create policy rules. */
+               if (__flow_dv_create_policy_acts_rules(dev, mtr_policy,
+                       mtr_policy->sub_policys[i][0], i)) {
+                       DRV_LOG(ERR,
+                       "Failed to create policy action list per domain.");
+                       return -1;
+               }
        }
-       resp->aged = __atomic_load_n(&age_param->state, __ATOMIC_RELAXED) ==
-                                    AGE_TMOUT ? 1 : 0;
-       resp->sec_since_last_hit_valid = !resp->aged;
-       if (resp->sec_since_last_hit_valid)
-               resp->sec_since_last_hit = __atomic_load_n
-                            (&age_param->sec_since_last_hit, __ATOMIC_RELAXED);
        return 0;
 }
 
-/**
- * Query a flow.
- *
- * @see rte_flow_query()
- * @see rte_flow_ops
- */
 static int
-flow_dv_query(struct rte_eth_dev *dev,
-             struct rte_flow *flow __rte_unused,
-             const struct rte_flow_action *actions __rte_unused,
-             void *data __rte_unused,
-             struct rte_flow_error *error __rte_unused)
+__flow_dv_create_domain_def_policy(struct rte_eth_dev *dev, uint32_t domain)
 {
-       int ret = -EINVAL;
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_flow_mtr_mng *mtrmng = priv->sh->mtrmng;
+       struct mlx5_flow_meter_def_policy *def_policy;
+       struct mlx5_flow_tbl_resource *jump_tbl;
+       struct mlx5_flow_tbl_data_entry *tbl_data;
+       uint8_t egress, transfer;
+       struct rte_flow_error error;
+       struct mlx5_meter_policy_acts acts[RTE_COLORS];
+       int ret;
 
-       for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
-               switch (actions->type) {
-               case RTE_FLOW_ACTION_TYPE_VOID:
-                       break;
-               case RTE_FLOW_ACTION_TYPE_COUNT:
-                       ret = flow_dv_query_count(dev, flow, data, error);
-                       break;
-               case RTE_FLOW_ACTION_TYPE_AGE:
-                       ret = flow_dv_query_age(dev, flow, data, error);
-                       break;
-               default:
-                       return rte_flow_error_set(error, ENOTSUP,
-                                                 RTE_FLOW_ERROR_TYPE_ACTION,
-                                                 actions,
-                                                 "action not supported");
+       egress = (domain == MLX5_MTR_DOMAIN_EGRESS) ? 1 : 0;
+       transfer = (domain == MLX5_MTR_DOMAIN_TRANSFER) ? 1 : 0;
+       def_policy = mtrmng->def_policy[domain];
+       if (!def_policy) {
+               def_policy = mlx5_malloc(MLX5_MEM_ZERO,
+                       sizeof(struct mlx5_flow_meter_def_policy),
+                       RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+               if (!def_policy) {
+                       DRV_LOG(ERR, "Failed to alloc "
+                                       "default policy table.");
+                       goto def_policy_error;
+               }
+               mtrmng->def_policy[domain] = def_policy;
+               /* Create the meter suffix table with SUFFIX level. */
+               jump_tbl = flow_dv_tbl_resource_get(dev,
+                               MLX5_FLOW_TABLE_LEVEL_METER,
+                               egress, transfer, false, NULL, 0,
+                               0, MLX5_MTR_TABLE_ID_SUFFIX, &error);
+               if (!jump_tbl) {
+                       DRV_LOG(ERR,
+                               "Failed to create meter suffix table.");
+                       goto def_policy_error;
+               }
+               def_policy->sub_policy.jump_tbl[RTE_COLOR_GREEN] = jump_tbl;
+               tbl_data = container_of(jump_tbl,
+                               struct mlx5_flow_tbl_data_entry, tbl);
+               def_policy->dr_jump_action[RTE_COLOR_GREEN] =
+                                               tbl_data->jump.action;
+               acts[RTE_COLOR_GREEN].dv_actions[0] =
+                                               tbl_data->jump.action;
+               acts[RTE_COLOR_GREEN].actions_n = 1;
+               /* Create jump action to the drop table. */
+               if (!mtrmng->drop_tbl[domain]) {
+                       mtrmng->drop_tbl[domain] = flow_dv_tbl_resource_get
+                               (dev, MLX5_FLOW_TABLE_LEVEL_METER,
+                               egress, transfer, false, NULL, 0,
+                               0, MLX5_MTR_TABLE_ID_DROP, &error);
+                       if (!mtrmng->drop_tbl[domain]) {
+                               DRV_LOG(ERR, "Failed to create "
+                               "meter drop table for default policy.");
+                               goto def_policy_error;
+                       }
+               }
+               tbl_data = container_of(mtrmng->drop_tbl[domain],
+                               struct mlx5_flow_tbl_data_entry, tbl);
+               def_policy->dr_jump_action[RTE_COLOR_RED] =
+                                               tbl_data->jump.action;
+               acts[RTE_COLOR_RED].dv_actions[0] = tbl_data->jump.action;
+               acts[RTE_COLOR_RED].actions_n = 1;
+               /* Create default policy rules. */
+               ret = __flow_dv_create_domain_policy_rules(dev,
+                                       &def_policy->sub_policy,
+                                       egress, transfer, true, acts);
+               if (ret) {
+                       DRV_LOG(ERR, "Failed to create "
+                               "default policy rules.");
+                               goto def_policy_error;
                }
        }
-       return ret;
+       return 0;
+def_policy_error:
+       __flow_dv_destroy_domain_def_policy(dev,
+                       (enum mlx5_meter_domain)domain);
+       return -1;
 }
 
 /**
- * Destroy the meter table set.
- * Lock free, (mutex should be acquired by caller).
+ * Create the default policy table set.
  *
  * @param[in] dev
  *   Pointer to Ethernet device.
- * @param[in] tbl
- *   Pointer to the meter table set.
- *
  * @return
- *   Always 0.
+ *   0 on success, -1 otherwise.
  */
 static int
-flow_dv_destroy_mtr_tbl(struct rte_eth_dev *dev,
-                       struct mlx5_meter_domains_infos *tbl)
+flow_dv_create_def_policy(struct rte_eth_dev *dev)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_meter_domains_infos *mtd =
-                               (struct mlx5_meter_domains_infos *)tbl;
+       int i;
 
-       if (!mtd || !priv->config.dv_flow_en)
-               return 0;
-       if (mtd->egress.tbl)
-               flow_dv_tbl_resource_release(MLX5_SH(dev), mtd->egress.tbl);
-       if (mtd->egress.sfx_tbl)
-               flow_dv_tbl_resource_release(MLX5_SH(dev), mtd->egress.sfx_tbl);
-       if (mtd->ingress.tbl)
-               flow_dv_tbl_resource_release(MLX5_SH(dev), mtd->ingress.tbl);
-       if (mtd->ingress.sfx_tbl)
-               flow_dv_tbl_resource_release(MLX5_SH(dev),
-                                            mtd->ingress.sfx_tbl);
-       if (mtd->transfer.tbl)
-               flow_dv_tbl_resource_release(MLX5_SH(dev), mtd->transfer.tbl);
-       if (mtd->transfer.sfx_tbl)
-               flow_dv_tbl_resource_release(MLX5_SH(dev),
-                                            mtd->transfer.sfx_tbl);
-       mlx5_free(mtd);
+       /* Non-termination policy table. */
+       for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) {
+               if (!priv->config.dv_esw_en && i == MLX5_MTR_DOMAIN_TRANSFER)
+                       continue;
+               if (__flow_dv_create_domain_def_policy(dev, i)) {
+                       DRV_LOG(ERR,
+                       "Failed to create default policy");
+                       return -1;
+               }
+       }
        return 0;
 }
 
-/* Number of meter flow actions, count and jump or count and drop. */
-#define METER_ACTIONS 2
-
 /**
- * Create specify domain meter table and suffix table.
+ * Create the needed meter tables.
+ * Lock free, (mutex should be acquired by caller).
  *
  * @param[in] dev
  *   Pointer to Ethernet device.
- * @param[in,out] mtb
- *   Pointer to DV meter table set.
- * @param[in] egress
- *   Table attribute.
- * @param[in] transfer
- *   Table attribute.
- *
+ * @param[in] fm
+ *   Meter information table.
+ * @param[in] mtr_idx
+ *   Meter index.
+ * @param[in] domain_bitmap
+ *   Domain bitmap.
  * @return
  *   0 on success, -1 otherwise.
  */
 static int
-flow_dv_prepare_mtr_tables(struct rte_eth_dev *dev,
-                          struct mlx5_meter_domains_infos *mtb,
-                          uint8_t egress, uint8_t transfer)
+flow_dv_create_mtr_tbls(struct rte_eth_dev *dev,
+                       struct mlx5_flow_meter_info *fm,
+                       uint32_t mtr_idx,
+                       uint8_t domain_bitmap)
 {
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_flow_mtr_mng *mtrmng = priv->sh->mtrmng;
        struct rte_flow_error error;
-       struct mlx5_meter_domain_info *dtb;
+       struct mlx5_flow_tbl_data_entry *tbl_data;
+       uint8_t egress, transfer;
+       void *actions[METER_ACTIONS];
+       int domain, ret, i;
+       struct mlx5_flow_counter *cnt;
+       struct mlx5_flow_dv_match_params value = {
+               .size = sizeof(value.buf) -
+               MLX5_ST_SZ_BYTES(fte_match_set_misc4),
+       };
+       struct mlx5_flow_dv_match_params matcher_para = {
+               .size = sizeof(matcher_para.buf) -
+               MLX5_ST_SZ_BYTES(fte_match_set_misc4),
+       };
+       int mtr_id_reg_c = mlx5_flow_get_reg_id(dev, MLX5_MTR_ID,
+                                                    0, &error);
+       uint32_t mtr_id_mask = (UINT32_C(1) << mtrmng->max_mtr_bits) - 1;
+       uint8_t mtr_id_offset = priv->mtr_reg_share ? MLX5_MTR_COLOR_BITS : 0;
+       struct mlx5_cache_entry *entry;
+       struct mlx5_flow_dv_matcher matcher = {
+               .mask = {
+                       .size = sizeof(matcher.mask.buf) -
+                       MLX5_ST_SZ_BYTES(fte_match_set_misc4),
+               },
+       };
+       struct mlx5_flow_dv_matcher *drop_matcher;
+       struct mlx5_flow_cb_ctx ctx = {
+               .error = &error,
+               .data = &matcher,
+       };
 
-       if (transfer)
-               dtb = &mtb->transfer;
-       else if (egress)
-               dtb = &mtb->egress;
-       else
-               dtb = &mtb->ingress;
-       /* Create the meter table with METER level. */
-       dtb->tbl = flow_dv_tbl_resource_get(dev, MLX5_FLOW_TABLE_LEVEL_METER,
-                                           egress, transfer, false, NULL, 0,
-                                           0, 0, &error);
-       if (!dtb->tbl) {
-               DRV_LOG(ERR, "Failed to create meter policer table.");
+       if (!priv->mtr_en || mtr_id_reg_c < 0) {
+               rte_errno = ENOTSUP;
                return -1;
        }
-       /* Create the meter suffix table with SUFFIX level. */
-       dtb->sfx_tbl = flow_dv_tbl_resource_get(dev,
-                                           MLX5_FLOW_TABLE_LEVEL_SUFFIX,
-                                           egress, transfer, false, NULL, 0,
-                                           0, 0, &error);
-       if (!dtb->sfx_tbl) {
-               DRV_LOG(ERR, "Failed to create meter suffix table.");
-               return -1;
+       for (domain = 0; domain < MLX5_MTR_DOMAIN_MAX; domain++) {
+               if (!(domain_bitmap & (1 << domain)) ||
+                       (mtrmng->def_rule[domain] && !fm->drop_cnt))
+                       continue;
+               egress = (domain == MLX5_MTR_DOMAIN_EGRESS) ? 1 : 0;
+               transfer = (domain == MLX5_MTR_DOMAIN_TRANSFER) ? 1 : 0;
+               /* Create the drop table with METER DROP level. */
+               if (!mtrmng->drop_tbl[domain]) {
+                       mtrmng->drop_tbl[domain] = flow_dv_tbl_resource_get(dev,
+                                       MLX5_FLOW_TABLE_LEVEL_METER,
+                                       egress, transfer, false, NULL, 0,
+                                       0, MLX5_MTR_TABLE_ID_DROP, &error);
+                       if (!mtrmng->drop_tbl[domain]) {
+                               DRV_LOG(ERR, "Failed to create meter drop table.");
+                               goto policy_error;
+                       }
+               }
+               /* Create default matcher in drop table. */
+               matcher.tbl = mtrmng->drop_tbl[domain],
+               tbl_data = container_of(mtrmng->drop_tbl[domain],
+                               struct mlx5_flow_tbl_data_entry, tbl);
+               if (!mtrmng->def_matcher[domain]) {
+                       flow_dv_match_meta_reg(matcher.mask.buf, value.buf,
+                                      (enum modify_reg)mtr_id_reg_c,
+                                      0, 0);
+                       matcher.priority = MLX5_MTRS_DEFAULT_RULE_PRIORITY;
+                       matcher.crc = rte_raw_cksum
+                                       ((const void *)matcher.mask.buf,
+                                       matcher.mask.size);
+                       entry = mlx5_cache_register(&tbl_data->matchers, &ctx);
+                       if (!entry) {
+                               DRV_LOG(ERR, "Failed to register meter "
+                               "drop default matcher.");
+                               goto policy_error;
+                       }
+                       mtrmng->def_matcher[domain] = container_of(entry,
+                       struct mlx5_flow_dv_matcher, entry);
+               }
+               /* Create default rule in drop table. */
+               if (!mtrmng->def_rule[domain]) {
+                       i = 0;
+                       actions[i++] = priv->sh->dr_drop_action;
+                       flow_dv_match_meta_reg(matcher_para.buf, value.buf,
+                               (enum modify_reg)mtr_id_reg_c, 0, 0);
+                       ret = mlx5_flow_os_create_flow
+                               (mtrmng->def_matcher[domain]->matcher_object,
+                               (void *)&value, i, actions,
+                               &mtrmng->def_rule[domain]);
+                       if (ret) {
+                               DRV_LOG(ERR, "Failed to create meter "
+                               "default drop rule for drop table.");
+                               goto policy_error;
+                       }
+               }
+               if (!fm->drop_cnt)
+                       continue;
+               MLX5_ASSERT(mtrmng->max_mtr_bits);
+               if (!mtrmng->drop_matcher[domain][mtrmng->max_mtr_bits - 1]) {
+                       /* Create matchers for Drop. */
+                       flow_dv_match_meta_reg(matcher.mask.buf, value.buf,
+                                       (enum modify_reg)mtr_id_reg_c, 0,
+                                       (mtr_id_mask << mtr_id_offset));
+                       matcher.priority = MLX5_REG_BITS - mtrmng->max_mtr_bits;
+                       matcher.crc = rte_raw_cksum
+                                       ((const void *)matcher.mask.buf,
+                                       matcher.mask.size);
+                       entry = mlx5_cache_register(&tbl_data->matchers, &ctx);
+                       if (!entry) {
+                               DRV_LOG(ERR,
+                               "Failed to register meter drop matcher.");
+                               goto policy_error;
+                       }
+                       mtrmng->drop_matcher[domain][mtrmng->max_mtr_bits - 1] =
+                               container_of(entry, struct mlx5_flow_dv_matcher,
+                                            entry);
+               }
+               drop_matcher =
+                       mtrmng->drop_matcher[domain][mtrmng->max_mtr_bits - 1];
+               /* Create drop rule, matching meter_id only. */
+               flow_dv_match_meta_reg(matcher_para.buf, value.buf,
+                               (enum modify_reg)mtr_id_reg_c,
+                               (mtr_idx << mtr_id_offset), UINT32_MAX);
+               i = 0;
+               cnt = flow_dv_counter_get_by_idx(dev,
+                                       fm->drop_cnt, NULL);
+               actions[i++] = cnt->action;
+               actions[i++] = priv->sh->dr_drop_action;
+               ret = mlx5_flow_os_create_flow(drop_matcher->matcher_object,
+                                              (void *)&value, i, actions,
+                                              &fm->drop_rule[domain]);
+               if (ret) {
+                       DRV_LOG(ERR, "Failed to create meter "
+                               "drop rule for drop table.");
+                               goto policy_error;
+               }
        }
        return 0;
+policy_error:
+       for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) {
+               if (fm->drop_rule[i]) {
+                       claim_zero(mlx5_flow_os_destroy_flow
+                               (fm->drop_rule[i]));
+                       fm->drop_rule[i] = NULL;
+               }
+       }
+       return -1;
 }
 
 /**
- * Create the needed meter and suffix tables.
- * Lock free, (mutex should be acquired by caller).
+ * Find the policy table for prefix table with RSS.
  *
  * @param[in] dev
  *   Pointer to Ethernet device.
- *
+ * @param[in] mtr_policy
+ *   Pointer to meter policy table.
+ * @param[in] rss_desc
+ *   Pointer to rss_desc
  * @return
  *   Pointer to table set on success, NULL otherwise and rte_errno is set.
  */
-static struct mlx5_meter_domains_infos *
-flow_dv_create_mtr_tbl(struct rte_eth_dev *dev)
+static struct mlx5_flow_meter_sub_policy *
+flow_dv_meter_sub_policy_rss_prepare(struct rte_eth_dev *dev,
+               struct mlx5_flow_meter_policy *mtr_policy,
+               struct mlx5_flow_rss_desc *rss_desc[MLX5_MTR_RTE_COLORS])
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_meter_domains_infos *mtb;
-       int ret;
-
-       if (!priv->mtr_en) {
-               rte_errno = ENOTSUP;
-               return NULL;
+       struct mlx5_flow_meter_sub_policy *sub_policy = NULL;
+       uint32_t sub_policy_idx = 0;
+       uint32_t hrxq_idx[MLX5_MTR_RTE_COLORS] = {0};
+       uint32_t i, j;
+       struct mlx5_hrxq *hrxq;
+       struct mlx5_flow_handle dh;
+       struct mlx5_meter_policy_action_container *act_cnt;
+       uint32_t domain = MLX5_MTR_DOMAIN_INGRESS;
+       uint16_t sub_policy_num;
+
+       rte_spinlock_lock(&mtr_policy->sl);
+       for (i = 0; i < MLX5_MTR_RTE_COLORS; i++) {
+               if (!rss_desc[i])
+                       continue;
+               hrxq_idx[i] = mlx5_hrxq_get(dev, rss_desc[i]);
+               if (!hrxq_idx[i]) {
+                       rte_spinlock_unlock(&mtr_policy->sl);
+                       return NULL;
+               }
        }
-       mtb = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mtb), 0, SOCKET_ID_ANY);
-       if (!mtb) {
-               DRV_LOG(ERR, "Failed to allocate memory for meter.");
-               return NULL;
+       sub_policy_num = (mtr_policy->sub_policy_num >>
+                       (MLX5_MTR_SUB_POLICY_NUM_SHIFT * domain)) &
+                       MLX5_MTR_SUB_POLICY_NUM_MASK;
+       for (i = 0; i < sub_policy_num;
+               i++) {
+               for (j = 0; j < MLX5_MTR_RTE_COLORS; j++) {
+                       if (rss_desc[j] &&
+                               hrxq_idx[j] !=
+                       mtr_policy->sub_policys[domain][i]->rix_hrxq[j])
+                               break;
+               }
+               if (j >= MLX5_MTR_RTE_COLORS) {
+                       /*
+                        * Found the sub policy table with
+                        * the same queue per color
+                        */
+                       rte_spinlock_unlock(&mtr_policy->sl);
+                       for (j = 0; j < MLX5_MTR_RTE_COLORS; j++)
+                               mlx5_hrxq_release(dev, hrxq_idx[j]);
+                       return mtr_policy->sub_policys[domain][i];
+               }
        }
-       /* Egress meter table. */
-       ret = flow_dv_prepare_mtr_tables(dev, mtb, 1, 0);
-       if (ret) {
-               DRV_LOG(ERR, "Failed to prepare egress meter table.");
-               goto error_exit;
+       /* Create sub policy. */
+       if (!mtr_policy->sub_policys[domain][0]->rix_hrxq[0]) {
+               /* Reuse the first dummy sub_policy*/
+               sub_policy = mtr_policy->sub_policys[domain][0];
+               sub_policy_idx = sub_policy->idx;
+       } else {
+               sub_policy = mlx5_ipool_zmalloc
+                               (priv->sh->ipool[MLX5_IPOOL_MTR_POLICY],
+                               &sub_policy_idx);
+               if (!sub_policy ||
+                       sub_policy_idx > MLX5_MAX_SUB_POLICY_TBL_NUM) {
+                       for (i = 0; i < MLX5_MTR_RTE_COLORS; i++)
+                               mlx5_hrxq_release(dev, hrxq_idx[i]);
+                       goto rss_sub_policy_error;
+               }
+               sub_policy->idx = sub_policy_idx;
+               sub_policy->main_policy = mtr_policy;
        }
-       /* Ingress meter table. */
-       ret = flow_dv_prepare_mtr_tables(dev, mtb, 0, 0);
-       if (ret) {
-               DRV_LOG(ERR, "Failed to prepare ingress meter table.");
-               goto error_exit;
+       for (i = 0; i < MLX5_MTR_RTE_COLORS; i++) {
+               if (!rss_desc[i])
+                       continue;
+               sub_policy->rix_hrxq[i] = hrxq_idx[i];
+               /*
+                * Overwrite the last action from
+                * RSS action to Queue action.
+                */
+               hrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ],
+                             hrxq_idx[i]);
+               if (!hrxq) {
+                       DRV_LOG(ERR, "Failed to create policy hrxq");
+                       goto rss_sub_policy_error;
+               }
+               act_cnt = &mtr_policy->act_cnt[i];
+               if (act_cnt->rix_mark || act_cnt->modify_hdr) {
+                       memset(&dh, 0, sizeof(struct mlx5_flow_handle));
+                       if (act_cnt->rix_mark)
+                               dh.mark = 1;
+                       dh.fate_action = MLX5_FLOW_FATE_QUEUE;
+                       dh.rix_hrxq = hrxq_idx[i];
+                       flow_drv_rxq_flags_set(dev, &dh);
+               }
        }
-       /* FDB meter table. */
-       if (priv->config.dv_esw_en) {
-               ret = flow_dv_prepare_mtr_tables(dev, mtb, 0, 1);
-               if (ret) {
-                       DRV_LOG(ERR, "Failed to prepare fdb meter table.");
-                       goto error_exit;
+       if (__flow_dv_create_policy_acts_rules(dev, mtr_policy,
+               sub_policy, domain)) {
+               DRV_LOG(ERR, "Failed to create policy "
+                       "rules per domain.");
+               goto rss_sub_policy_error;
+       }
+       if (sub_policy != mtr_policy->sub_policys[domain][0]) {
+               i = (mtr_policy->sub_policy_num >>
+                       (MLX5_MTR_SUB_POLICY_NUM_SHIFT * domain)) &
+                       MLX5_MTR_SUB_POLICY_NUM_MASK;
+               mtr_policy->sub_policys[domain][i] = sub_policy;
+               i++;
+               if (i > MLX5_MTR_RSS_MAX_SUB_POLICY)
+                       goto rss_sub_policy_error;
+               mtr_policy->sub_policy_num &= ~(MLX5_MTR_SUB_POLICY_NUM_MASK <<
+                       (MLX5_MTR_SUB_POLICY_NUM_SHIFT * domain));
+               mtr_policy->sub_policy_num |=
+                       (i & MLX5_MTR_SUB_POLICY_NUM_MASK) <<
+                       (MLX5_MTR_SUB_POLICY_NUM_SHIFT * domain);
+       }
+       rte_spinlock_unlock(&mtr_policy->sl);
+       return sub_policy;
+rss_sub_policy_error:
+       if (sub_policy) {
+               __flow_dv_destroy_sub_policy_rules(dev, sub_policy);
+               if (sub_policy != mtr_policy->sub_policys[domain][0]) {
+                       i = (mtr_policy->sub_policy_num >>
+                       (MLX5_MTR_SUB_POLICY_NUM_SHIFT * domain)) &
+                       MLX5_MTR_SUB_POLICY_NUM_MASK;
+                       mtr_policy->sub_policys[domain][i] = NULL;
+                       mlx5_ipool_free
+                       (priv->sh->ipool[MLX5_IPOOL_MTR_POLICY],
+                                       sub_policy->idx);
                }
        }
-       return mtb;
-error_exit:
-       flow_dv_destroy_mtr_tbl(dev, mtb);
+       if (sub_policy_idx)
+               mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MTR_POLICY],
+                       sub_policy_idx);
+       rte_spinlock_unlock(&mtr_policy->sl);
        return NULL;
 }
 
@@ -13901,7 +16265,7 @@ flow_dv_counter_allocate(struct rte_eth_dev *dev)
  * @param[in] dev
  *   Pointer to the Ethernet device structure.
  * @param[in] conf
- *   Shared action configuration.
+ *   Indirect action configuration.
  * @param[in] action
  *   The indirect action object to validate.
  * @param[out] error
@@ -13928,22 +16292,42 @@ flow_dv_action_validate(struct rte_eth_dev *dev,
                 * sufficient, it is set to devx_obj_ops.
                 * Otherwise, it is set to ibv_obj_ops.
                 * ibv_obj_ops doesn't support ind_table_modify operation.
-                * In this case the shared RSS action can't be used.
+                * In this case the indirect RSS action can't be used.
                 */
                if (priv->obj_ops.ind_table_modify == NULL)
                        return rte_flow_error_set
                                        (err, ENOTSUP,
                                         RTE_FLOW_ERROR_TYPE_ACTION,
                                         NULL,
-                                        "shared RSS action not supported");
+                                        "Indirect RSS action not supported");
                return mlx5_validate_action_rss(dev, action, err);
        case RTE_FLOW_ACTION_TYPE_AGE:
                if (!priv->sh->aso_age_mng)
                        return rte_flow_error_set(err, ENOTSUP,
                                                RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
                                                NULL,
-                                            "shared age action not supported");
+                                               "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)
+                       return rte_flow_error_set(err, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                       "ASO CT is not supported");
+               return mlx5_validate_action_ct(dev, action->conf, err);
        default:
                return rte_flow_error_set(err, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_ACTION,
@@ -13952,6 +16336,292 @@ flow_dv_action_validate(struct rte_eth_dev *dev,
        }
 }
 
+/**
+ * Validate meter policy actions.
+ * Dispatcher for action type specific validation.
+ *
+ * @param[in] dev
+ *   Pointer to the Ethernet device structure.
+ * @param[in] action
+ *   The meter policy action object to validate.
+ * @param[in] attr
+ *   Attributes of flow to determine steering domain.
+ * @param[out] error
+ *   Perform verbose error reporting if not NULL. Initialized in case of
+ *   error only.
+ *
+ * @return
+ *   0 on success, otherwise negative errno value.
+ */
+static int
+flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev,
+                       const struct rte_flow_action *actions[RTE_COLORS],
+                       struct rte_flow_attr *attr,
+                       bool *is_rss,
+                       uint8_t *domain_bitmap,
+                       bool *is_def_policy,
+                       struct rte_mtr_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_dev_config *dev_conf = &priv->config;
+       const struct rte_flow_action *act;
+       uint64_t action_flags = 0;
+       int actions_n;
+       int i, ret;
+       struct rte_flow_error flow_err;
+       uint8_t domain_color[RTE_COLORS] = {0};
+       uint8_t def_domain = MLX5_MTR_ALL_DOMAIN_BIT;
+
+       if (!priv->config.dv_esw_en)
+               def_domain &= ~MLX5_MTR_DOMAIN_TRANSFER_BIT;
+       *domain_bitmap = def_domain;
+       if (actions[RTE_COLOR_YELLOW] &&
+               actions[RTE_COLOR_YELLOW]->type != RTE_FLOW_ACTION_TYPE_END)
+               return -rte_mtr_error_set(error, ENOTSUP,
+                               RTE_MTR_ERROR_TYPE_METER_POLICY,
+                               NULL,
+                               "Yellow color does not support any action.");
+       if (actions[RTE_COLOR_YELLOW] &&
+               actions[RTE_COLOR_YELLOW]->type != RTE_FLOW_ACTION_TYPE_DROP)
+               return -rte_mtr_error_set(error, ENOTSUP,
+                               RTE_MTR_ERROR_TYPE_METER_POLICY,
+                               NULL, "Red color only supports drop action.");
+       /*
+        * Check default policy actions:
+        * Green/Yellow: no action, Red: drop action
+        */
+       if ((!actions[RTE_COLOR_GREEN] ||
+               actions[RTE_COLOR_GREEN]->type == RTE_FLOW_ACTION_TYPE_END)) {
+               *is_def_policy = true;
+               return 0;
+       }
+       flow_err.message = NULL;
+       for (i = 0; i < RTE_COLORS; i++) {
+               act = actions[i];
+               for (action_flags = 0, actions_n = 0;
+                       act && act->type != RTE_FLOW_ACTION_TYPE_END;
+                       act++) {
+                       if (actions_n == MLX5_DV_MAX_NUMBER_OF_ACTIONS)
+                               return -rte_mtr_error_set(error, ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, "too many actions");
+                       switch (act->type) {
+                       case RTE_FLOW_ACTION_TYPE_PORT_ID:
+                               if (!priv->config.dv_esw_en)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "PORT action validate check"
+                                       " fail for ESW disable");
+                               ret = flow_dv_validate_action_port_id(dev,
+                                               action_flags,
+                                               act, attr, &flow_err);
+                               if (ret)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, flow_err.message ?
+                                       flow_err.message :
+                                       "PORT action validate check fail");
+                               ++actions_n;
+                               action_flags |= MLX5_FLOW_ACTION_PORT_ID;
+                               break;
+                       case RTE_FLOW_ACTION_TYPE_MARK:
+                               ret = flow_dv_validate_action_mark(dev, act,
+                                                          action_flags,
+                                                          attr, &flow_err);
+                               if (ret < 0)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, flow_err.message ?
+                                       flow_err.message :
+                                       "Mark action validate check fail");
+                               if (dev_conf->dv_xmeta_en !=
+                                       MLX5_XMETA_MODE_LEGACY)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "Extend MARK action is "
+                                       "not supported. Please try use "
+                                       "default policy for meter.");
+                               action_flags |= MLX5_FLOW_ACTION_MARK;
+                               ++actions_n;
+                               break;
+                       case RTE_FLOW_ACTION_TYPE_SET_TAG:
+                               ret = flow_dv_validate_action_set_tag(dev,
+                                                       act, action_flags,
+                                                       attr, &flow_err);
+                               if (ret)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, flow_err.message ?
+                                       flow_err.message :
+                                       "Set tag action validate check fail");
+                               /*
+                                * Count all modify-header actions
+                                * as one action.
+                                */
+                               if (!(action_flags &
+                                       MLX5_FLOW_MODIFY_HDR_ACTIONS))
+                                       ++actions_n;
+                               action_flags |= MLX5_FLOW_ACTION_SET_TAG;
+                               break;
+                       case RTE_FLOW_ACTION_TYPE_DROP:
+                               ret = mlx5_flow_validate_action_drop
+                                       (action_flags,
+                                       attr, &flow_err);
+                               if (ret < 0)
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, flow_err.message ?
+                                       flow_err.message :
+                                       "Drop action validate check fail");
+                               action_flags |= MLX5_FLOW_ACTION_DROP;
+                               ++actions_n;
+                               break;
+                       case RTE_FLOW_ACTION_TYPE_QUEUE:
+                               /*
+                                * Check whether extensive
+                                * metadata feature is engaged.
+                                */
+                               if (dev_conf->dv_flow_en &&
+                                       (dev_conf->dv_xmeta_en !=
+                                       MLX5_XMETA_MODE_LEGACY) &&
+                                       mlx5_flow_ext_mreg_supported(dev))
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, "Queue action with meta "
+                                         "is not supported. Please try use "
+                                         "default policy for meter.");
+                               ret = mlx5_flow_validate_action_queue(act,
+                                                       action_flags, dev,
+                                                       attr, &flow_err);
+                               if (ret < 0)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, flow_err.message ?
+                                         flow_err.message :
+                                         "Queue action validate check fail");
+                               action_flags |= MLX5_FLOW_ACTION_QUEUE;
+                               ++actions_n;
+                               break;
+                       case RTE_FLOW_ACTION_TYPE_RSS:
+                               if (dev_conf->dv_flow_en &&
+                                       (dev_conf->dv_xmeta_en !=
+                                       MLX5_XMETA_MODE_LEGACY) &&
+                                       mlx5_flow_ext_mreg_supported(dev))
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, "RSS action with meta "
+                                         "is not supported. Please try use "
+                                         "default policy for meter.");
+                               ret = mlx5_validate_action_rss(dev, act,
+                                               &flow_err);
+                               if (ret < 0)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, flow_err.message ?
+                                         flow_err.message :
+                                         "RSS action validate check fail");
+                               action_flags |= MLX5_FLOW_ACTION_RSS;
+                               ++actions_n;
+                               *is_rss = true;
+                               break;
+                       case RTE_FLOW_ACTION_TYPE_JUMP:
+                               ret = flow_dv_validate_action_jump(dev,
+                                       NULL, act, action_flags,
+                                       attr, true, &flow_err);
+                               if (ret)
+                                       return -rte_mtr_error_set(error,
+                                         ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                         NULL, flow_err.message ?
+                                         flow_err.message :
+                                         "Jump action validate check fail");
+                               ++actions_n;
+                               action_flags |= MLX5_FLOW_ACTION_JUMP;
+                               break;
+                       default:
+                               return -rte_mtr_error_set(error, ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL,
+                                       "Doesn't support optional action");
+                       }
+               }
+               /* Yellow is not supported, just skip. */
+               if (i == RTE_COLOR_YELLOW)
+                       continue;
+               if (action_flags & MLX5_FLOW_ACTION_PORT_ID)
+                       domain_color[i] = MLX5_MTR_DOMAIN_TRANSFER_BIT;
+               else if ((action_flags &
+                       (MLX5_FLOW_ACTION_RSS | MLX5_FLOW_ACTION_QUEUE)) ||
+                       (action_flags & MLX5_FLOW_ACTION_MARK))
+                       /*
+                        * Only support MLX5_XMETA_MODE_LEGACY
+                        * so MARK action only in ingress domain.
+                        */
+                       domain_color[i] = MLX5_MTR_DOMAIN_INGRESS_BIT;
+               else
+                       domain_color[i] = def_domain;
+               /*
+                * Validate the drop action mutual exclusion
+                * with other actions. Drop action is mutually-exclusive
+                * with any other action, except for Count action.
+                */
+               if ((action_flags & MLX5_FLOW_ACTION_DROP) &&
+                       (action_flags & ~MLX5_FLOW_ACTION_DROP)) {
+                       return -rte_mtr_error_set(error, ENOTSUP,
+                               RTE_MTR_ERROR_TYPE_METER_POLICY,
+                               NULL, "Drop action is mutually-exclusive "
+                               "with any other action");
+               }
+               /* Eswitch has few restrictions on using items and actions */
+               if (domain_color[i] & MLX5_MTR_DOMAIN_TRANSFER_BIT) {
+                       if (!mlx5_flow_ext_mreg_supported(dev) &&
+                               action_flags & MLX5_FLOW_ACTION_MARK)
+                               return -rte_mtr_error_set(error, ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "unsupported action MARK");
+                       if (action_flags & MLX5_FLOW_ACTION_QUEUE)
+                               return -rte_mtr_error_set(error, ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "unsupported action QUEUE");
+                       if (action_flags & MLX5_FLOW_ACTION_RSS)
+                               return -rte_mtr_error_set(error, ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "unsupported action RSS");
+                       if (!(action_flags & MLX5_FLOW_FATE_ESWITCH_ACTIONS))
+                               return -rte_mtr_error_set(error, ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "no fate action is found");
+               } else {
+                       if (!(action_flags & MLX5_FLOW_FATE_ACTIONS) &&
+                               (domain_color[i] &
+                               MLX5_MTR_DOMAIN_INGRESS_BIT)) {
+                               if ((domain_color[i] &
+                                       MLX5_MTR_DOMAIN_EGRESS_BIT))
+                                       domain_color[i] =
+                                       MLX5_MTR_DOMAIN_EGRESS_BIT;
+                               else
+                                       return -rte_mtr_error_set(error,
+                                       ENOTSUP,
+                                       RTE_MTR_ERROR_TYPE_METER_POLICY,
+                                       NULL, "no fate action is found");
+                       }
+               }
+               if (domain_color[i] != def_domain)
+                       *domain_bitmap = domain_color[i];
+       }
+       return 0;
+}
+
 static int
 flow_dv_sync_domain(struct rte_eth_dev *dev, uint32_t domains, uint32_t flags)
 {
@@ -13985,10 +16655,19 @@ const struct mlx5_flow_driver_ops mlx5_flow_dv_drv_ops = {
        .remove = flow_dv_remove,
        .destroy = flow_dv_destroy,
        .query = flow_dv_query,
-       .create_mtr_tbls = flow_dv_create_mtr_tbl,
-       .destroy_mtr_tbls = flow_dv_destroy_mtr_tbl,
+       .create_mtr_tbls = flow_dv_create_mtr_tbls,
+       .destroy_mtr_tbls = flow_dv_destroy_mtr_tbls,
+       .destroy_mtr_drop_tbls = flow_dv_destroy_mtr_drop_tbls,
        .create_meter = flow_dv_mtr_alloc,
        .free_meter = flow_dv_aso_mtr_release_to_pool,
+       .validate_mtr_acts = flow_dv_validate_mtr_policy_acts,
+       .create_mtr_acts = flow_dv_create_mtr_policy_acts,
+       .destroy_mtr_acts = flow_dv_destroy_mtr_policy_acts,
+       .create_policy_rules = flow_dv_create_policy_rules,
+       .destroy_policy_rules = flow_dv_destroy_policy_rules,
+       .create_def_policy = flow_dv_create_def_policy,
+       .destroy_def_policy = flow_dv_destroy_def_policy,
+       .meter_sub_policy_rss_prepare = flow_dv_meter_sub_policy_rss_prepare,
        .counter_alloc = flow_dv_counter_allocate,
        .counter_free = flow_dv_counter_free,
        .counter_query = flow_dv_counter_query,