common/mlx5: add functions for single flow dump
[dpdk.git] / drivers / common / mlx5 / mlx5_devx_cmds.c
index ec92eb6..ec6069b 100644 (file)
@@ -5,12 +5,75 @@
 
 #include <rte_errno.h>
 #include <rte_malloc.h>
+#include <rte_eal_paging.h>
 
 #include "mlx5_prm.h"
 #include "mlx5_devx_cmds.h"
 #include "mlx5_common_utils.h"
+#include "mlx5_malloc.h"
 
 
+/**
+ * Perform read access to the registers. Reads data from register
+ * and writes ones to the specified buffer.
+ *
+ * @param[in] ctx
+ *   Context returned from mlx5 open_device() glue function.
+ * @param[in] reg_id
+ *   Register identifier according to the PRM.
+ * @param[in] arg
+ *   Register access auxiliary parameter according to the PRM.
+ * @param[out] data
+ *   Pointer to the buffer to store read data.
+ * @param[in] dw_cnt
+ *   Buffer size in double words.
+ *
+ * @return
+ *   0 on success, a negative value otherwise.
+ */
+int
+mlx5_devx_cmd_register_read(void *ctx, uint16_t reg_id, uint32_t arg,
+                           uint32_t *data, uint32_t dw_cnt)
+{
+       uint32_t in[MLX5_ST_SZ_DW(access_register_in)]   = {0};
+       uint32_t out[MLX5_ST_SZ_DW(access_register_out) +
+                    MLX5_ACCESS_REGISTER_DATA_DWORD_MAX] = {0};
+       int status, rc;
+
+       MLX5_ASSERT(data && dw_cnt);
+       MLX5_ASSERT(dw_cnt <= MLX5_ACCESS_REGISTER_DATA_DWORD_MAX);
+       if (dw_cnt  > MLX5_ACCESS_REGISTER_DATA_DWORD_MAX) {
+               DRV_LOG(ERR, "Not enough  buffer for register read data");
+               return -1;
+       }
+       MLX5_SET(access_register_in, in, opcode,
+                MLX5_CMD_OP_ACCESS_REGISTER_USER);
+       MLX5_SET(access_register_in, in, op_mod,
+                                       MLX5_ACCESS_REGISTER_IN_OP_MOD_READ);
+       MLX5_SET(access_register_in, in, register_id, reg_id);
+       MLX5_SET(access_register_in, in, argument, arg);
+       rc = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out,
+                                        MLX5_ST_SZ_BYTES(access_register_out) +
+                                        sizeof(uint32_t) * dw_cnt);
+       if (rc)
+               goto error;
+       status = MLX5_GET(access_register_out, out, status);
+       if (status) {
+               int syndrome = MLX5_GET(access_register_out, out, syndrome);
+
+               DRV_LOG(DEBUG, "Failed to access NIC register 0x%X, "
+                              "status %x, syndrome = %x",
+                              reg_id, status, syndrome);
+               return -1;
+       }
+       memcpy(data, &out[MLX5_ST_SZ_DW(access_register_out)],
+              dw_cnt * sizeof(uint32_t));
+       return 0;
+error:
+       rc = (rc > 0) ? -rc : rc;
+       return rc;
+}
+
 /**
  * Allocate flow counters via devx interface.
  *
@@ -28,7 +91,8 @@
 struct mlx5_devx_obj *
 mlx5_devx_cmd_flow_counter_alloc(void *ctx, uint32_t bulk_n_128)
 {
-       struct mlx5_devx_obj *dcs = rte_zmalloc("dcs", sizeof(*dcs), 0);
+       struct mlx5_devx_obj *dcs = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*dcs),
+                                               0, SOCKET_ID_ANY);
        uint32_t in[MLX5_ST_SZ_DW(alloc_flow_counter_in)]   = {0};
        uint32_t out[MLX5_ST_SZ_DW(alloc_flow_counter_out)] = {0};
 
@@ -44,7 +108,7 @@ mlx5_devx_cmd_flow_counter_alloc(void *ctx, uint32_t bulk_n_128)
        if (!dcs->obj) {
                DRV_LOG(ERR, "Can't allocate counters - error %d", errno);
                rte_errno = errno;
-               rte_free(dcs);
+               mlx5_free(dcs);
                return NULL;
        }
        dcs->id = MLX5_GET(alloc_flow_counter_out, out, flow_counter_id);
@@ -149,7 +213,8 @@ mlx5_devx_cmd_mkey_create(void *ctx,
        uint32_t in[in_size_dw];
        uint32_t out[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
        void *mkc;
-       struct mlx5_devx_obj *mkey = rte_zmalloc("mkey", sizeof(*mkey), 0);
+       struct mlx5_devx_obj *mkey = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mkey),
+                                                0, SOCKET_ID_ANY);
        size_t pgsize;
        uint32_t translation_size;
 
@@ -158,7 +223,13 @@ mlx5_devx_cmd_mkey_create(void *ctx,
                return NULL;
        }
        memset(in, 0, in_size_dw * 4);
-       pgsize = sysconf(_SC_PAGESIZE);
+       pgsize = rte_mem_page_size();
+       if (pgsize == (size_t)-1) {
+               mlx5_free(mkey);
+               DRV_LOG(ERR, "Failed to get page size");
+               rte_errno = ENOMEM;
+               return NULL;
+       }
        MLX5_SET(create_mkey_in, in, opcode, MLX5_CMD_OP_CREATE_MKEY);
        mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);
        if (klm_num > 0) {
@@ -195,20 +266,20 @@ mlx5_devx_cmd_mkey_create(void *ctx,
        MLX5_SET(mkc, mkc, qpn, 0xffffff);
        MLX5_SET(mkc, mkc, pd, attr->pd);
        MLX5_SET(mkc, mkc, mkey_7_0, attr->umem_id & 0xFF);
+       MLX5_SET(mkc, mkc, umr_en, attr->umr_en);
        MLX5_SET(mkc, mkc, translations_octword_size, translation_size);
-       if (attr->relaxed_ordering == 1) {
-               MLX5_SET(mkc, mkc, relaxed_ordering_write, 0x1);
-               MLX5_SET(mkc, mkc, relaxed_ordering_read, 0x1);
-       }
+       MLX5_SET(mkc, mkc, relaxed_ordering_write,
+                attr->relaxed_ordering_write);
+       MLX5_SET(mkc, mkc, relaxed_ordering_read, attr->relaxed_ordering_read);
        MLX5_SET64(mkc, mkc, start_addr, attr->addr);
        MLX5_SET64(mkc, mkc, len, attr->size);
        mkey->obj = mlx5_glue->devx_obj_create(ctx, in, in_size_dw * 4, out,
                                               sizeof(out));
        if (!mkey->obj) {
-               DRV_LOG(ERR, "Can't create %sdirect mkey - error %d\n",
+               DRV_LOG(ERR, "Can't create %sdirect mkey - error %d",
                        klm_num ? "an in" : "a ", errno);
                rte_errno = errno;
-               rte_free(mkey);
+               mlx5_free(mkey);
                return NULL;
        }
        mkey->id = MLX5_GET(create_mkey_out, out, mkey_index);
@@ -237,7 +308,7 @@ mlx5_devx_get_out_command_status(void *out)
        if (status) {
                int syndrome = MLX5_GET(query_flow_counter_out, out, syndrome);
 
-               DRV_LOG(ERR, "Bad devX status %x, syndrome = %x", status,
+               DRV_LOG(ERR, "Bad DevX status %x, syndrome = %x", status,
                        syndrome);
        }
        return status;
@@ -260,7 +331,7 @@ mlx5_devx_cmd_destroy(struct mlx5_devx_obj *obj)
        if (!obj)
                return 0;
        ret =  mlx5_glue->devx_obj_destroy(obj->obj);
-       rte_free(obj);
+       mlx5_free(obj);
        return ret;
 }
 
@@ -303,8 +374,7 @@ mlx5_devx_cmd_query_nic_vport_context(void *ctx,
        syndrome = MLX5_GET(query_nic_vport_context_out, out, syndrome);
        if (status) {
                DRV_LOG(DEBUG, "Failed to query NIC vport context, "
-                       "status %x, syndrome = %x",
-                       status, syndrome);
+                       "status %x, syndrome = %x", status, syndrome);
                return -1;
        }
        vctx = MLX5_ADDR_OF(query_nic_vport_context_out, out,
@@ -396,6 +466,166 @@ mlx5_devx_cmd_query_hca_vdpa_attr(void *ctx,
        }
 }
 
+int
+mlx5_devx_cmd_query_parse_samples(struct mlx5_devx_obj *flex_obj,
+                                 uint32_t ids[], uint32_t num)
+{
+       uint32_t in[MLX5_ST_SZ_DW(general_obj_in_cmd_hdr)] = {0};
+       uint32_t out[MLX5_ST_SZ_DW(create_flex_parser_out)] = {0};
+       void *hdr = MLX5_ADDR_OF(create_flex_parser_out, in, hdr);
+       void *flex = MLX5_ADDR_OF(create_flex_parser_out, out, flex);
+       void *sample = MLX5_ADDR_OF(parse_graph_flex, flex, sample_table);
+       int ret;
+       uint32_t idx = 0;
+       uint32_t i;
+
+       if (num > MLX5_GRAPH_NODE_SAMPLE_NUM) {
+               rte_errno = EINVAL;
+               DRV_LOG(ERR, "Too many sample IDs to be fetched.");
+               return -rte_errno;
+       }
+       MLX5_SET(general_obj_in_cmd_hdr, hdr, opcode,
+                MLX5_CMD_OP_QUERY_GENERAL_OBJECT);
+       MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_type,
+                MLX5_GENERAL_OBJ_TYPE_FLEX_PARSE_GRAPH);
+       MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_id, flex_obj->id);
+       ret = mlx5_glue->devx_obj_query(flex_obj->obj, in, sizeof(in),
+                                       out, sizeof(out));
+       if (ret) {
+               rte_errno = ret;
+               DRV_LOG(ERR, "Failed to query sample IDs with object %p.",
+                       (void *)flex_obj);
+               return -rte_errno;
+       }
+       for (i = 0; i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) {
+               void *s_off = (void *)((char *)sample + i *
+                             MLX5_ST_SZ_BYTES(parse_graph_flow_match_sample));
+               uint32_t en;
+
+               en = MLX5_GET(parse_graph_flow_match_sample, s_off,
+                             flow_match_sample_en);
+               if (!en)
+                       continue;
+               ids[idx++] = MLX5_GET(parse_graph_flow_match_sample, s_off,
+                                 flow_match_sample_field_id);
+       }
+       if (num != idx) {
+               rte_errno = EINVAL;
+               DRV_LOG(ERR, "Number of sample IDs are not as expected.");
+               return -rte_errno;
+       }
+       return ret;
+}
+
+
+struct mlx5_devx_obj *
+mlx5_devx_cmd_create_flex_parser(void *ctx,
+                             struct mlx5_devx_graph_node_attr *data)
+{
+       uint32_t in[MLX5_ST_SZ_DW(create_flex_parser_in)] = {0};
+       uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
+       void *hdr = MLX5_ADDR_OF(create_flex_parser_in, in, hdr);
+       void *flex = MLX5_ADDR_OF(create_flex_parser_in, in, flex);
+       void *sample = MLX5_ADDR_OF(parse_graph_flex, flex, sample_table);
+       void *in_arc = MLX5_ADDR_OF(parse_graph_flex, flex, input_arc);
+       void *out_arc = MLX5_ADDR_OF(parse_graph_flex, flex, output_arc);
+       struct mlx5_devx_obj *parse_flex_obj = mlx5_malloc
+                    (MLX5_MEM_ZERO, sizeof(*parse_flex_obj), 0, SOCKET_ID_ANY);
+       uint32_t i;
+
+       if (!parse_flex_obj) {
+               DRV_LOG(ERR, "Failed to allocate flex parser data.");
+               rte_errno = ENOMEM;
+               return NULL;
+       }
+       MLX5_SET(general_obj_in_cmd_hdr, hdr, opcode,
+                MLX5_CMD_OP_CREATE_GENERAL_OBJECT);
+       MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_type,
+                MLX5_GENERAL_OBJ_TYPE_FLEX_PARSE_GRAPH);
+       MLX5_SET(parse_graph_flex, flex, header_length_mode,
+                data->header_length_mode);
+       MLX5_SET(parse_graph_flex, flex, header_length_base_value,
+                data->header_length_base_value);
+       MLX5_SET(parse_graph_flex, flex, header_length_field_offset,
+                data->header_length_field_offset);
+       MLX5_SET(parse_graph_flex, flex, header_length_field_shift,
+                data->header_length_field_shift);
+       MLX5_SET(parse_graph_flex, flex, header_length_field_mask,
+                data->header_length_field_mask);
+       for (i = 0; i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) {
+               struct mlx5_devx_match_sample_attr *s = &data->sample[i];
+               void *s_off = (void *)((char *)sample + i *
+                             MLX5_ST_SZ_BYTES(parse_graph_flow_match_sample));
+
+               if (!s->flow_match_sample_en)
+                       continue;
+               MLX5_SET(parse_graph_flow_match_sample, s_off,
+                        flow_match_sample_en, !!s->flow_match_sample_en);
+               MLX5_SET(parse_graph_flow_match_sample, s_off,
+                        flow_match_sample_field_offset,
+                        s->flow_match_sample_field_offset);
+               MLX5_SET(parse_graph_flow_match_sample, s_off,
+                        flow_match_sample_offset_mode,
+                        s->flow_match_sample_offset_mode);
+               MLX5_SET(parse_graph_flow_match_sample, s_off,
+                        flow_match_sample_field_offset_mask,
+                        s->flow_match_sample_field_offset_mask);
+               MLX5_SET(parse_graph_flow_match_sample, s_off,
+                        flow_match_sample_field_offset_shift,
+                        s->flow_match_sample_field_offset_shift);
+               MLX5_SET(parse_graph_flow_match_sample, s_off,
+                        flow_match_sample_field_base_offset,
+                        s->flow_match_sample_field_base_offset);
+               MLX5_SET(parse_graph_flow_match_sample, s_off,
+                        flow_match_sample_tunnel_mode,
+                        s->flow_match_sample_tunnel_mode);
+       }
+       for (i = 0; i < MLX5_GRAPH_NODE_ARC_NUM; i++) {
+               struct mlx5_devx_graph_arc_attr *ia = &data->in[i];
+               struct mlx5_devx_graph_arc_attr *oa = &data->out[i];
+               void *in_off = (void *)((char *)in_arc + i *
+                             MLX5_ST_SZ_BYTES(parse_graph_arc));
+               void *out_off = (void *)((char *)out_arc + i *
+                             MLX5_ST_SZ_BYTES(parse_graph_arc));
+
+               if (ia->arc_parse_graph_node != 0) {
+                       MLX5_SET(parse_graph_arc, in_off,
+                                compare_condition_value,
+                                ia->compare_condition_value);
+                       MLX5_SET(parse_graph_arc, in_off, start_inner_tunnel,
+                                ia->start_inner_tunnel);
+                       MLX5_SET(parse_graph_arc, in_off, arc_parse_graph_node,
+                                ia->arc_parse_graph_node);
+                       MLX5_SET(parse_graph_arc, in_off,
+                                parse_graph_node_handle,
+                                ia->parse_graph_node_handle);
+               }
+               if (oa->arc_parse_graph_node != 0) {
+                       MLX5_SET(parse_graph_arc, out_off,
+                                compare_condition_value,
+                                oa->compare_condition_value);
+                       MLX5_SET(parse_graph_arc, out_off, start_inner_tunnel,
+                                oa->start_inner_tunnel);
+                       MLX5_SET(parse_graph_arc, out_off, arc_parse_graph_node,
+                                oa->arc_parse_graph_node);
+                       MLX5_SET(parse_graph_arc, out_off,
+                                parse_graph_node_handle,
+                                oa->parse_graph_node_handle);
+               }
+       }
+       parse_flex_obj->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in),
+                                                        out, sizeof(out));
+       if (!parse_flex_obj->obj) {
+               rte_errno = errno;
+               DRV_LOG(ERR, "Failed to create FLEX PARSE GRAPH object "
+                       "by using DevX.");
+               mlx5_free(parse_flex_obj);
+               return NULL;
+       }
+       parse_flex_obj->id = MLX5_GET(general_obj_out_cmd_hdr, out, obj_id);
+       return parse_flex_obj;
+}
+
 /**
  * Query HCA attributes.
  * Using those attributes we can check on run time if the device
@@ -416,7 +646,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        uint32_t in[MLX5_ST_SZ_DW(query_hca_cap_in)] = {0};
        uint32_t out[MLX5_ST_SZ_DW(query_hca_cap_out)] = {0};
        void *hcattr;
-       int status, syndrome, rc;
+       int status, syndrome, rc, i;
 
        MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP);
        MLX5_SET(query_hca_cap_in, in, op_mod,
@@ -431,8 +661,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        syndrome = MLX5_GET(query_hca_cap_out, out, syndrome);
        if (status) {
                DRV_LOG(DEBUG, "Failed to query devx HCA capabilities, "
-                       "status %x, syndrome = %x",
-                       status, syndrome);
+                       "status %x, syndrome = %x", status, syndrome);
                return -1;
        }
        hcattr = MLX5_ADDR_OF(query_hca_cap_out, out, capability);
@@ -452,14 +681,20 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
                (cmd_hca_cap, hcattr, log_min_hairpin_wq_data_sz);
        attr->vhca_id = MLX5_GET(cmd_hca_cap, hcattr, vhca_id);
        attr->relaxed_ordering_write = MLX5_GET(cmd_hca_cap, hcattr,
-                       relaxed_ordering_write);
+                                               relaxed_ordering_write);
        attr->relaxed_ordering_read = MLX5_GET(cmd_hca_cap, hcattr,
-                       relaxed_ordering_read);
+                                              relaxed_ordering_read);
+       attr->access_register_user = MLX5_GET(cmd_hca_cap, hcattr,
+                                             access_register_user);
        attr->eth_net_offloads = MLX5_GET(cmd_hca_cap, hcattr,
                                          eth_net_offloads);
        attr->eth_virt = MLX5_GET(cmd_hca_cap, hcattr, eth_virt);
        attr->flex_parser_protocols = MLX5_GET(cmd_hca_cap, hcattr,
                                               flex_parser_protocols);
+       attr->max_geneve_tlv_options = MLX5_GET(cmd_hca_cap, hcattr,
+                       max_geneve_tlv_options);
+       attr->max_geneve_tlv_option_data_len = MLX5_GET(cmd_hca_cap, hcattr,
+                       max_geneve_tlv_option_data_len);
        attr->qos.sup = MLX5_GET(cmd_hca_cap, hcattr, qos);
        attr->vdpa.valid = !!(MLX5_GET64(cmd_hca_cap, hcattr,
                                         general_obj_types) &
@@ -467,6 +702,61 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        attr->vdpa.queue_counters_valid = !!(MLX5_GET64(cmd_hca_cap, hcattr,
                                                        general_obj_types) &
                                  MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_Q_COUNTERS);
+       attr->parse_graph_flex_node = !!(MLX5_GET64(cmd_hca_cap, hcattr,
+                                        general_obj_types) &
+                             MLX5_GENERAL_OBJ_TYPES_CAP_PARSE_GRAPH_FLEX_NODE);
+       attr->wqe_index_ignore = MLX5_GET(cmd_hca_cap, hcattr,
+                                         wqe_index_ignore_cap);
+       attr->cross_channel = MLX5_GET(cmd_hca_cap, hcattr, cd);
+       attr->non_wire_sq = MLX5_GET(cmd_hca_cap, hcattr, non_wire_sq);
+       attr->log_max_static_sq_wq = MLX5_GET(cmd_hca_cap, hcattr,
+                                             log_max_static_sq_wq);
+       attr->num_lag_ports = MLX5_GET(cmd_hca_cap, hcattr, num_lag_ports);
+       attr->dev_freq_khz = MLX5_GET(cmd_hca_cap, hcattr,
+                                     device_frequency_khz);
+       attr->scatter_fcs_w_decap_disable =
+               MLX5_GET(cmd_hca_cap, hcattr, scatter_fcs_w_decap_disable);
+       attr->roce = MLX5_GET(cmd_hca_cap, hcattr, roce);
+       attr->rq_ts_format = MLX5_GET(cmd_hca_cap, hcattr, rq_ts_format);
+       attr->sq_ts_format = MLX5_GET(cmd_hca_cap, hcattr, sq_ts_format);
+       attr->regex = MLX5_GET(cmd_hca_cap, hcattr, regexp);
+       attr->regexp_num_of_engines = MLX5_GET(cmd_hca_cap, hcattr,
+                                              regexp_num_of_engines);
+       attr->flow_hit_aso = !!(MLX5_GET64(cmd_hca_cap, hcattr,
+                                          general_obj_types) &
+                               MLX5_GENERAL_OBJ_TYPES_CAP_FLOW_HIT_ASO);
+       attr->geneve_tlv_opt = !!(MLX5_GET64(cmd_hca_cap, hcattr,
+                                          general_obj_types) &
+                               MLX5_GENERAL_OBJ_TYPES_CAP_GENEVE_TLV_OPT);
+       attr->log_max_cq = MLX5_GET(cmd_hca_cap, hcattr, log_max_cq);
+       attr->log_max_qp = MLX5_GET(cmd_hca_cap, hcattr, log_max_qp);
+       attr->log_max_cq_sz = MLX5_GET(cmd_hca_cap, hcattr, log_max_cq_sz);
+       attr->log_max_qp_sz = MLX5_GET(cmd_hca_cap, hcattr, log_max_qp_sz);
+       attr->log_max_mrw_sz = MLX5_GET(cmd_hca_cap, hcattr, log_max_mrw_sz);
+       attr->log_max_pd = MLX5_GET(cmd_hca_cap, hcattr, log_max_pd);
+       attr->log_max_srq = MLX5_GET(cmd_hca_cap, hcattr, log_max_srq);
+       attr->log_max_srq_sz = MLX5_GET(cmd_hca_cap, hcattr, log_max_srq_sz);
+       attr->reg_c_preserve =
+               MLX5_GET(cmd_hca_cap, hcattr, reg_c_preserve);
+       attr->mmo_dma_en = MLX5_GET(cmd_hca_cap, hcattr, dma_mmo);
+       attr->mmo_compress_en = MLX5_GET(cmd_hca_cap, hcattr, compress);
+       attr->mmo_decompress_en = MLX5_GET(cmd_hca_cap, hcattr, decompress);
+       attr->compress_min_block_size = MLX5_GET(cmd_hca_cap, hcattr,
+                                                compress_min_block_size);
+       attr->log_max_mmo_dma = MLX5_GET(cmd_hca_cap, hcattr, log_dma_mmo_size);
+       attr->log_max_mmo_compress = MLX5_GET(cmd_hca_cap, hcattr,
+                                             log_compress_mmo_size);
+       attr->log_max_mmo_decompress = MLX5_GET(cmd_hca_cap, hcattr,
+                                               log_decompress_mmo_size);
+       attr->cqe_compression = MLX5_GET(cmd_hca_cap, hcattr, cqe_compression);
+       attr->mini_cqe_resp_flow_tag = MLX5_GET(cmd_hca_cap, hcattr,
+                                               mini_cqe_resp_flow_tag);
+       attr->mini_cqe_resp_l3_l4_tag = MLX5_GET(cmd_hca_cap, hcattr,
+                                                mini_cqe_resp_l3_l4_tag);
+       attr->umr_indirect_mkey_disabled =
+               MLX5_GET(cmd_hca_cap, hcattr, umr_indirect_mkey_disabled);
+       attr->umr_modify_entity_size_disabled =
+               MLX5_GET(cmd_hca_cap, hcattr, umr_modify_entity_size_disabled);
        if (attr->qos.sup) {
                MLX5_SET(query_hca_cap_in, in, op_mod,
                         MLX5_GET_HCA_CAP_OP_MOD_QOS_CAP |
@@ -477,25 +767,52 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
                        goto error;
                if (status) {
                        DRV_LOG(DEBUG, "Failed to query devx QOS capabilities,"
-                               " status %x, syndrome = %x",
-                               status, syndrome);
+                               " status %x, syndrome = %x", status, syndrome);
                        return -1;
                }
                hcattr = MLX5_ADDR_OF(query_hca_cap_out, out, capability);
-               attr->qos.srtcm_sup =
-                               MLX5_GET(qos_cap, hcattr, flow_meter_srtcm);
+               attr->qos.flow_meter_old =
+                               MLX5_GET(qos_cap, hcattr, flow_meter_old);
                attr->qos.log_max_flow_meter =
                                MLX5_GET(qos_cap, hcattr, log_max_flow_meter);
                attr->qos.flow_meter_reg_c_ids =
-                       MLX5_GET(qos_cap, hcattr, flow_meter_reg_id);
-               attr->qos.flow_meter_reg_share =
-                       MLX5_GET(qos_cap, hcattr, flow_meter_reg_share);
+                               MLX5_GET(qos_cap, hcattr, flow_meter_reg_id);
+               attr->qos.flow_meter =
+                               MLX5_GET(qos_cap, hcattr, flow_meter);
+               attr->qos.packet_pacing =
+                               MLX5_GET(qos_cap, hcattr, packet_pacing);
+               attr->qos.wqe_rate_pp =
+                               MLX5_GET(qos_cap, hcattr, wqe_rate_pp);
        }
        if (attr->vdpa.valid)
                mlx5_devx_cmd_query_hca_vdpa_attr(ctx, &attr->vdpa);
        if (!attr->eth_net_offloads)
                return 0;
 
+       /* Query Flow Sampler Capability From FLow Table Properties Layout. */
+       memset(in, 0, sizeof(in));
+       memset(out, 0, sizeof(out));
+       MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP);
+       MLX5_SET(query_hca_cap_in, in, op_mod,
+                MLX5_GET_HCA_CAP_OP_MOD_NIC_FLOW_TABLE |
+                MLX5_HCA_CAP_OPMOD_GET_CUR);
+
+       rc = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out, sizeof(out));
+       if (rc)
+               goto error;
+       status = MLX5_GET(query_hca_cap_out, out, status);
+       syndrome = MLX5_GET(query_hca_cap_out, out, syndrome);
+       if (status) {
+               DRV_LOG(DEBUG, "Failed to query devx HCA capabilities, "
+                       "status %x, syndrome = %x", status, syndrome);
+               attr->log_max_ft_sampler_num = 0;
+               return -1;
+       }
+       hcattr = MLX5_ADDR_OF(query_hca_cap_out, out, capability);
+       attr->log_max_ft_sampler_num =
+                       MLX5_GET(flow_table_nic_cap,
+                       hcattr, flow_table_properties.log_max_ft_sampler_num);
+
        /* Query HCA offloads for Ethernet protocol. */
        memset(in, 0, sizeof(in));
        memset(out, 0, sizeof(out));
@@ -504,9 +821,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
                 MLX5_GET_HCA_CAP_OP_MOD_ETHERNET_OFFLOAD_CAPS |
                 MLX5_HCA_CAP_OPMOD_GET_CUR);
 
-       rc = mlx5_glue->devx_general_cmd(ctx,
-                                        in, sizeof(in),
-                                        out, sizeof(out));
+       rc = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out, sizeof(out));
        if (rc) {
                attr->eth_net_offloads = 0;
                goto error;
@@ -515,8 +830,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        syndrome = MLX5_GET(query_hca_cap_out, out, syndrome);
        if (status) {
                DRV_LOG(DEBUG, "Failed to query devx HCA capabilities, "
-                       "status %x, syndrome = %x",
-                       status, syndrome);
+                       "status %x, syndrome = %x", status, syndrome);
                attr->eth_net_offloads = 0;
                return -1;
        }
@@ -532,11 +846,13 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        attr->lro_max_msg_sz_mode = MLX5_GET
                                        (per_protocol_networking_offload_caps,
                                         hcattr, lro_max_msg_sz_mode);
-       for (int i = 0 ; i < MLX5_LRO_NUM_SUPP_PERIODS ; i++) {
+       for (i = 0 ; i < MLX5_LRO_NUM_SUPP_PERIODS ; i++) {
                attr->lro_timer_supported_periods[i] =
                        MLX5_GET(per_protocol_networking_offload_caps, hcattr,
                                 lro_timer_supported_periods[i]);
        }
+       attr->lro_min_mss_size = MLX5_GET(per_protocol_networking_offload_caps,
+                                         hcattr, lro_min_mss_size);
        attr->tunnel_stateless_geneve_rx =
                            MLX5_GET(per_protocol_networking_offload_caps,
                                     hcattr, tunnel_stateless_geneve_rx);
@@ -548,9 +864,35 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        attr->tunnel_stateless_gtp = MLX5_GET
                                        (per_protocol_networking_offload_caps,
                                         hcattr, tunnel_stateless_gtp);
-       if (attr->wqe_inline_mode != MLX5_CAP_INLINE_MODE_VPORT_CONTEXT)
-               return 0;
-       if (attr->eth_virt) {
+       attr->rss_ind_tbl_cap = MLX5_GET
+                                       (per_protocol_networking_offload_caps,
+                                        hcattr, rss_ind_tbl_cap);
+       /* Query HCA attribute for ROCE. */
+       if (attr->roce) {
+               memset(in, 0, sizeof(in));
+               memset(out, 0, sizeof(out));
+               MLX5_SET(query_hca_cap_in, in, opcode,
+                        MLX5_CMD_OP_QUERY_HCA_CAP);
+               MLX5_SET(query_hca_cap_in, in, op_mod,
+                        MLX5_GET_HCA_CAP_OP_MOD_ROCE |
+                        MLX5_HCA_CAP_OPMOD_GET_CUR);
+               rc = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in),
+                                                out, sizeof(out));
+               if (rc)
+                       goto error;
+               status = MLX5_GET(query_hca_cap_out, out, status);
+               syndrome = MLX5_GET(query_hca_cap_out, out, syndrome);
+               if (status) {
+                       DRV_LOG(DEBUG,
+                               "Failed to query devx HCA ROCE capabilities, "
+                               "status %x, syndrome = %x", status, syndrome);
+                       return -1;
+               }
+               hcattr = MLX5_ADDR_OF(query_hca_cap_out, out, capability);
+               attr->qp_ts_format = MLX5_GET(roce_caps, hcattr, qp_ts_format);
+       }
+       if (attr->eth_virt &&
+           attr->wqe_inline_mode == MLX5_CAP_INLINE_MODE_VPORT_CONTEXT) {
                rc = mlx5_devx_cmd_query_nic_vport_context(ctx, 0, attr);
                if (rc) {
                        attr->eth_virt = 0;
@@ -630,7 +972,9 @@ devx_cmd_fill_wq_data(void *wq_ctx, struct mlx5_devx_wq_attr *wq_attr)
        MLX5_SET(wq, wq_ctx, hw_counter, wq_attr->hw_counter);
        MLX5_SET(wq, wq_ctx, sw_counter, wq_attr->sw_counter);
        MLX5_SET(wq, wq_ctx, log_wq_stride, wq_attr->log_wq_stride);
-       MLX5_SET(wq, wq_ctx, log_wq_pg_sz, wq_attr->log_wq_pg_sz);
+       if (wq_attr->log_wq_pg_sz > MLX5_ADAPTER_PAGE_SHIFT)
+               MLX5_SET(wq, wq_ctx, log_wq_pg_sz,
+                        wq_attr->log_wq_pg_sz - MLX5_ADAPTER_PAGE_SHIFT);
        MLX5_SET(wq, wq_ctx, log_wq_sz, wq_attr->log_wq_sz);
        MLX5_SET(wq, wq_ctx, dbr_umem_valid, wq_attr->dbr_umem_valid);
        MLX5_SET(wq, wq_ctx, wq_umem_valid, wq_attr->wq_umem_valid);
@@ -671,7 +1015,7 @@ mlx5_devx_cmd_create_rq(void *ctx,
        struct mlx5_devx_wq_attr *wq_attr;
        struct mlx5_devx_obj *rq = NULL;
 
-       rq = rte_calloc_socket(__func__, 1, sizeof(*rq), 0, socket);
+       rq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rq), 0, socket);
        if (!rq) {
                DRV_LOG(ERR, "Failed to allocate RQ data");
                rte_errno = ENOMEM;
@@ -691,6 +1035,7 @@ mlx5_devx_cmd_create_rq(void *ctx,
        MLX5_SET(rqc, rq_ctx, cqn, rq_attr->cqn);
        MLX5_SET(rqc, rq_ctx, counter_set_id, rq_attr->counter_set_id);
        MLX5_SET(rqc, rq_ctx, rmpn, rq_attr->rmpn);
+       MLX5_SET(sqc, rq_ctx, ts_format, rq_attr->ts_format);
        wq_ctx = MLX5_ADDR_OF(rqc, rq_ctx, wq);
        wq_attr = &rq_attr->wq_attr;
        devx_cmd_fill_wq_data(wq_ctx, wq_attr);
@@ -699,7 +1044,7 @@ mlx5_devx_cmd_create_rq(void *ctx,
        if (!rq->obj) {
                DRV_LOG(ERR, "Failed to create RQ using DevX");
                rte_errno = errno;
-               rte_free(rq);
+               mlx5_free(rq);
                return NULL;
        }
        rq->id = MLX5_GET(create_rq_out, out, rqn);
@@ -776,7 +1121,7 @@ mlx5_devx_cmd_create_tir(void *ctx,
        void *tir_ctx, *outer, *inner, *rss_key;
        struct mlx5_devx_obj *tir = NULL;
 
-       tir = rte_calloc(__func__, 1, sizeof(*tir), 0);
+       tir = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*tir), 0, SOCKET_ID_ANY);
        if (!tir) {
                DRV_LOG(ERR, "Failed to allocate TIR data");
                rte_errno = ENOMEM;
@@ -818,13 +1163,97 @@ mlx5_devx_cmd_create_tir(void *ctx,
        if (!tir->obj) {
                DRV_LOG(ERR, "Failed to create TIR using DevX");
                rte_errno = errno;
-               rte_free(tir);
+               mlx5_free(tir);
                return NULL;
        }
        tir->id = MLX5_GET(create_tir_out, out, tirn);
        return tir;
 }
 
+/**
+ * Modify TIR using DevX API.
+ *
+ * @param[in] tir
+ *   Pointer to TIR DevX object structure.
+ * @param [in] modify_tir_attr
+ *   Pointer to TIR modification attributes structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx5_devx_cmd_modify_tir(struct mlx5_devx_obj *tir,
+                        struct mlx5_devx_modify_tir_attr *modify_tir_attr)
+{
+       struct mlx5_devx_tir_attr *tir_attr = &modify_tir_attr->tir;
+       uint32_t in[MLX5_ST_SZ_DW(modify_tir_in)] = {0};
+       uint32_t out[MLX5_ST_SZ_DW(modify_tir_out)] = {0};
+       void *tir_ctx;
+       int ret;
+
+       MLX5_SET(modify_tir_in, in, opcode, MLX5_CMD_OP_MODIFY_TIR);
+       MLX5_SET(modify_tir_in, in, tirn, modify_tir_attr->tirn);
+       MLX5_SET64(modify_tir_in, in, modify_bitmask,
+                  modify_tir_attr->modify_bitmask);
+       tir_ctx = MLX5_ADDR_OF(modify_rq_in, in, ctx);
+       if (modify_tir_attr->modify_bitmask &
+                       MLX5_MODIFY_TIR_IN_MODIFY_BITMASK_LRO) {
+               MLX5_SET(tirc, tir_ctx, lro_timeout_period_usecs,
+                        tir_attr->lro_timeout_period_usecs);
+               MLX5_SET(tirc, tir_ctx, lro_enable_mask,
+                        tir_attr->lro_enable_mask);
+               MLX5_SET(tirc, tir_ctx, lro_max_msg_sz,
+                        tir_attr->lro_max_msg_sz);
+       }
+       if (modify_tir_attr->modify_bitmask &
+                       MLX5_MODIFY_TIR_IN_MODIFY_BITMASK_INDIRECT_TABLE)
+               MLX5_SET(tirc, tir_ctx, indirect_table,
+                        tir_attr->indirect_table);
+       if (modify_tir_attr->modify_bitmask &
+                       MLX5_MODIFY_TIR_IN_MODIFY_BITMASK_HASH) {
+               int i;
+               void *outer, *inner;
+
+               MLX5_SET(tirc, tir_ctx, rx_hash_symmetric,
+                        tir_attr->rx_hash_symmetric);
+               MLX5_SET(tirc, tir_ctx, rx_hash_fn, tir_attr->rx_hash_fn);
+               for (i = 0; i < 10; i++) {
+                       MLX5_SET(tirc, tir_ctx, rx_hash_toeplitz_key[i],
+                                tir_attr->rx_hash_toeplitz_key[i]);
+               }
+               outer = MLX5_ADDR_OF(tirc, tir_ctx,
+                                    rx_hash_field_selector_outer);
+               MLX5_SET(rx_hash_field_select, outer, l3_prot_type,
+                        tir_attr->rx_hash_field_selector_outer.l3_prot_type);
+               MLX5_SET(rx_hash_field_select, outer, l4_prot_type,
+                        tir_attr->rx_hash_field_selector_outer.l4_prot_type);
+               MLX5_SET
+               (rx_hash_field_select, outer, selected_fields,
+                tir_attr->rx_hash_field_selector_outer.selected_fields);
+               inner = MLX5_ADDR_OF(tirc, tir_ctx,
+                                    rx_hash_field_selector_inner);
+               MLX5_SET(rx_hash_field_select, inner, l3_prot_type,
+                        tir_attr->rx_hash_field_selector_inner.l3_prot_type);
+               MLX5_SET(rx_hash_field_select, inner, l4_prot_type,
+                        tir_attr->rx_hash_field_selector_inner.l4_prot_type);
+               MLX5_SET
+               (rx_hash_field_select, inner, selected_fields,
+                tir_attr->rx_hash_field_selector_inner.selected_fields);
+       }
+       if (modify_tir_attr->modify_bitmask &
+           MLX5_MODIFY_TIR_IN_MODIFY_BITMASK_SELF_LB_EN) {
+               MLX5_SET(tirc, tir_ctx, self_lb_block, tir_attr->self_lb_block);
+       }
+       ret = mlx5_glue->devx_obj_modify(tir->obj, in, sizeof(in),
+                                        out, sizeof(out));
+       if (ret) {
+               DRV_LOG(ERR, "Failed to modify TIR using DevX");
+               rte_errno = errno;
+               return -errno;
+       }
+       return ret;
+}
+
 /**
  * Create RQT using DevX API.
  *
@@ -848,17 +1277,17 @@ mlx5_devx_cmd_create_rqt(void *ctx,
        struct mlx5_devx_obj *rqt = NULL;
        int i;
 
-       in = rte_calloc(__func__, 1, inlen, 0);
+       in = mlx5_malloc(MLX5_MEM_ZERO, inlen, 0, SOCKET_ID_ANY);
        if (!in) {
                DRV_LOG(ERR, "Failed to allocate RQT IN data");
                rte_errno = ENOMEM;
                return NULL;
        }
-       rqt = rte_calloc(__func__, 1, sizeof(*rqt), 0);
+       rqt = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*rqt), 0, SOCKET_ID_ANY);
        if (!rqt) {
                DRV_LOG(ERR, "Failed to allocate RQT data");
                rte_errno = ENOMEM;
-               rte_free(in);
+               mlx5_free(in);
                return NULL;
        }
        MLX5_SET(create_rqt_in, in, opcode, MLX5_CMD_OP_CREATE_RQT);
@@ -869,11 +1298,11 @@ mlx5_devx_cmd_create_rqt(void *ctx,
        for (i = 0; i < rqt_attr->rqt_actual_size; i++)
                MLX5_SET(rqtc, rqt_ctx, rq_num[i], rqt_attr->rq_list[i]);
        rqt->obj = mlx5_glue->devx_obj_create(ctx, in, inlen, out, sizeof(out));
-       rte_free(in);
+       mlx5_free(in);
        if (!rqt->obj) {
                DRV_LOG(ERR, "Failed to create RQT using DevX");
                rte_errno = errno;
-               rte_free(rqt);
+               mlx5_free(rqt);
                return NULL;
        }
        rqt->id = MLX5_GET(create_rqt_out, out, rqtn);
@@ -898,7 +1327,7 @@ mlx5_devx_cmd_modify_rqt(struct mlx5_devx_obj *rqt,
        uint32_t inlen = MLX5_ST_SZ_BYTES(modify_rqt_in) +
                         rqt_attr->rqt_actual_size * sizeof(uint32_t);
        uint32_t out[MLX5_ST_SZ_DW(modify_rqt_out)] = {0};
-       uint32_t *in = rte_calloc(__func__, 1, inlen, 0);
+       uint32_t *in = mlx5_malloc(MLX5_MEM_ZERO, inlen, 0, SOCKET_ID_ANY);
        void *rqt_ctx;
        int i;
        int ret;
@@ -918,7 +1347,7 @@ mlx5_devx_cmd_modify_rqt(struct mlx5_devx_obj *rqt,
        for (i = 0; i < rqt_attr->rqt_actual_size; i++)
                MLX5_SET(rqtc, rqt_ctx, rq_num[i], rqt_attr->rq_list[i]);
        ret = mlx5_glue->devx_obj_modify(rqt->obj, in, inlen, out, sizeof(out));
-       rte_free(in);
+       mlx5_free(in);
        if (ret) {
                DRV_LOG(ERR, "Failed to modify RQT using DevX.");
                rte_errno = errno;
@@ -951,7 +1380,7 @@ mlx5_devx_cmd_create_sq(void *ctx,
        struct mlx5_devx_wq_attr *wq_attr;
        struct mlx5_devx_obj *sq = NULL;
 
-       sq = rte_calloc(__func__, 1, sizeof(*sq), 0);
+       sq = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*sq), 0, SOCKET_ID_ANY);
        if (!sq) {
                DRV_LOG(ERR, "Failed to allocate SQ data");
                rte_errno = ENOMEM;
@@ -964,19 +1393,22 @@ mlx5_devx_cmd_create_sq(void *ctx,
        MLX5_SET(sqc, sq_ctx, fre, sq_attr->fre);
        MLX5_SET(sqc, sq_ctx, flush_in_error_en, sq_attr->flush_in_error_en);
        MLX5_SET(sqc, sq_ctx, allow_multi_pkt_send_wqe,
-                sq_attr->flush_in_error_en);
+                sq_attr->allow_multi_pkt_send_wqe);
        MLX5_SET(sqc, sq_ctx, min_wqe_inline_mode,
                 sq_attr->min_wqe_inline_mode);
        MLX5_SET(sqc, sq_ctx, state, sq_attr->state);
        MLX5_SET(sqc, sq_ctx, reg_umr, sq_attr->reg_umr);
        MLX5_SET(sqc, sq_ctx, allow_swp, sq_attr->allow_swp);
        MLX5_SET(sqc, sq_ctx, hairpin, sq_attr->hairpin);
+       MLX5_SET(sqc, sq_ctx, non_wire, sq_attr->non_wire);
+       MLX5_SET(sqc, sq_ctx, static_sq_wq, sq_attr->static_sq_wq);
        MLX5_SET(sqc, sq_ctx, user_index, sq_attr->user_index);
        MLX5_SET(sqc, sq_ctx, cqn, sq_attr->cqn);
        MLX5_SET(sqc, sq_ctx, packet_pacing_rate_limit_index,
                 sq_attr->packet_pacing_rate_limit_index);
        MLX5_SET(sqc, sq_ctx, tis_lst_sz, sq_attr->tis_lst_sz);
        MLX5_SET(sqc, sq_ctx, tis_num_0, sq_attr->tis_num);
+       MLX5_SET(sqc, sq_ctx, ts_format, sq_attr->ts_format);
        wq_ctx = MLX5_ADDR_OF(sqc, sq_ctx, wq);
        wq_attr = &sq_attr->wq_attr;
        devx_cmd_fill_wq_data(wq_ctx, wq_attr);
@@ -985,7 +1417,7 @@ mlx5_devx_cmd_create_sq(void *ctx,
        if (!sq->obj) {
                DRV_LOG(ERR, "Failed to create SQ using DevX");
                rte_errno = errno;
-               rte_free(sq);
+               mlx5_free(sq);
                return NULL;
        }
        sq->id = MLX5_GET(create_sq_out, out, sqn);
@@ -1024,7 +1456,7 @@ mlx5_devx_cmd_modify_sq(struct mlx5_devx_obj *sq,
        if (ret) {
                DRV_LOG(ERR, "Failed to modify SQ using DevX");
                rte_errno = errno;
-               return -errno;
+               return -rte_errno;
        }
        return ret;
 }
@@ -1049,7 +1481,7 @@ mlx5_devx_cmd_create_tis(void *ctx,
        struct mlx5_devx_obj *tis = NULL;
        void *tis_ctx;
 
-       tis = rte_calloc(__func__, 1, sizeof(*tis), 0);
+       tis = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*tis), 0, SOCKET_ID_ANY);
        if (!tis) {
                DRV_LOG(ERR, "Failed to allocate TIS object");
                rte_errno = ENOMEM;
@@ -1059,8 +1491,8 @@ mlx5_devx_cmd_create_tis(void *ctx,
        tis_ctx = MLX5_ADDR_OF(create_tis_in, in, ctx);
        MLX5_SET(tisc, tis_ctx, strict_lag_tx_port_affinity,
                 tis_attr->strict_lag_tx_port_affinity);
-       MLX5_SET(tisc, tis_ctx, strict_lag_tx_port_affinity,
-                tis_attr->strict_lag_tx_port_affinity);
+       MLX5_SET(tisc, tis_ctx, lag_tx_port_affinity,
+                tis_attr->lag_tx_port_affinity);
        MLX5_SET(tisc, tis_ctx, prio, tis_attr->prio);
        MLX5_SET(tisc, tis_ctx, transport_domain,
                 tis_attr->transport_domain);
@@ -1069,7 +1501,7 @@ mlx5_devx_cmd_create_tis(void *ctx,
        if (!tis->obj) {
                DRV_LOG(ERR, "Failed to create TIS using DevX");
                rte_errno = errno;
-               rte_free(tis);
+               mlx5_free(tis);
                return NULL;
        }
        tis->id = MLX5_GET(create_tis_out, out, tisn);
@@ -1091,7 +1523,7 @@ mlx5_devx_cmd_create_td(void *ctx)
        uint32_t out[MLX5_ST_SZ_DW(alloc_transport_domain_out)] = {0};
        struct mlx5_devx_obj *td = NULL;
 
-       td = rte_calloc(__func__, 1, sizeof(*td), 0);
+       td = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*td), 0, SOCKET_ID_ANY);
        if (!td) {
                DRV_LOG(ERR, "Failed to allocate TD object");
                rte_errno = ENOMEM;
@@ -1104,7 +1536,7 @@ mlx5_devx_cmd_create_td(void *ctx)
        if (!td->obj) {
                DRV_LOG(ERR, "Failed to create TIS using DevX");
                rte_errno = errno;
-               rte_free(td);
+               mlx5_free(td);
                return NULL;
        }
        td->id = MLX5_GET(alloc_transport_domain_out, out,
@@ -1152,6 +1584,20 @@ mlx5_devx_cmd_flow_dump(void *fdb_domain __rte_unused,
        return -ret;
 }
 
+int
+mlx5_devx_cmd_flow_single_dump(void *rule_info __rte_unused,
+                       FILE *file __rte_unused)
+{
+       int ret = 0;
+#ifdef HAVE_MLX5_DR_FLOW_DUMP_RULE
+       if (rule_info)
+               ret = mlx5_glue->dr_dump_rule(file, rule_info);
+#else
+       ret = ENOTSUP;
+#endif
+       return -ret;
+}
+
 /*
  * Create CQ using DevX API.
  *
@@ -1168,8 +1614,9 @@ mlx5_devx_cmd_create_cq(void *ctx, struct mlx5_devx_cq_attr *attr)
 {
        uint32_t in[MLX5_ST_SZ_DW(create_cq_in)] = {0};
        uint32_t out[MLX5_ST_SZ_DW(create_cq_out)] = {0};
-       struct mlx5_devx_obj *cq_obj = rte_zmalloc(__func__, sizeof(*cq_obj),
-                                                  0);
+       struct mlx5_devx_obj *cq_obj = mlx5_malloc(MLX5_MEM_ZERO,
+                                                  sizeof(*cq_obj),
+                                                  0, SOCKET_ID_ANY);
        void *cqctx = MLX5_ADDR_OF(create_cq_in, in, cq_context);
 
        if (!cq_obj) {
@@ -1185,13 +1632,20 @@ mlx5_devx_cmd_create_cq(void *ctx, struct mlx5_devx_cq_attr *attr)
        } else {
                MLX5_SET64(cqc, cqctx, dbr_addr, attr->db_addr);
        }
+       MLX5_SET(cqc, cqctx, cqe_sz, (RTE_CACHE_LINE_SIZE == 128) ?
+                                    MLX5_CQE_SIZE_128B : MLX5_CQE_SIZE_64B);
        MLX5_SET(cqc, cqctx, cc, attr->use_first_only);
        MLX5_SET(cqc, cqctx, oi, attr->overrun_ignore);
        MLX5_SET(cqc, cqctx, log_cq_size, attr->log_cq_size);
-       MLX5_SET(cqc, cqctx, log_page_size, attr->log_page_size -
-                MLX5_ADAPTER_PAGE_SHIFT);
+       if (attr->log_page_size > MLX5_ADAPTER_PAGE_SHIFT)
+               MLX5_SET(cqc, cqctx, log_page_size,
+                        attr->log_page_size - MLX5_ADAPTER_PAGE_SHIFT);
        MLX5_SET(cqc, cqctx, c_eqn, attr->eqn);
        MLX5_SET(cqc, cqctx, uar_page, attr->uar_page_id);
+       MLX5_SET(cqc, cqctx, cqe_comp_en, !!attr->cqe_comp_en);
+       MLX5_SET(cqc, cqctx, mini_cqe_res_format, attr->mini_cqe_res_format);
+       MLX5_SET(cqc, cqctx, mini_cqe_res_format_ext,
+                attr->mini_cqe_res_format_ext);
        if (attr->q_umem_valid) {
                MLX5_SET(create_cq_in, in, cq_umem_valid, attr->q_umem_valid);
                MLX5_SET(create_cq_in, in, cq_umem_id, attr->q_umem_id);
@@ -1203,7 +1657,7 @@ mlx5_devx_cmd_create_cq(void *ctx, struct mlx5_devx_cq_attr *attr)
        if (!cq_obj->obj) {
                rte_errno = errno;
                DRV_LOG(ERR, "Failed to create CQ using DevX errno=%d.", errno);
-               rte_free(cq_obj);
+               mlx5_free(cq_obj);
                return NULL;
        }
        cq_obj->id = MLX5_GET(create_cq_out, out, cqn);
@@ -1227,8 +1681,9 @@ mlx5_devx_cmd_create_virtq(void *ctx,
 {
        uint32_t in[MLX5_ST_SZ_DW(create_virtq_in)] = {0};
        uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
-       struct mlx5_devx_obj *virtq_obj = rte_zmalloc(__func__,
-                                                    sizeof(*virtq_obj), 0);
+       struct mlx5_devx_obj *virtq_obj = mlx5_malloc(MLX5_MEM_ZERO,
+                                                    sizeof(*virtq_obj),
+                                                    0, SOCKET_ID_ANY);
        void *virtq = MLX5_ADDR_OF(create_virtq_in, in, virtq);
        void *hdr = MLX5_ADDR_OF(create_virtq_in, in, hdr);
        void *virtctx = MLX5_ADDR_OF(virtio_net_q, virtq, virtio_q_context);
@@ -1270,13 +1725,16 @@ mlx5_devx_cmd_create_virtq(void *ctx,
        MLX5_SET64(virtio_q, virtctx, umem_3_offset, attr->umems[2].offset);
        MLX5_SET(virtio_q, virtctx, counter_set_id, attr->counters_obj_id);
        MLX5_SET(virtio_q, virtctx, pd, attr->pd);
+       MLX5_SET(virtio_q, virtctx, queue_period_mode, attr->hw_latency_mode);
+       MLX5_SET(virtio_q, virtctx, queue_period_us, attr->hw_max_latency_us);
+       MLX5_SET(virtio_q, virtctx, queue_max_count, attr->hw_max_pending_comp);
        MLX5_SET(virtio_net_q, virtq, tisn_or_qpn, attr->tis_id);
        virtq_obj->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in), out,
                                                    sizeof(out));
        if (!virtq_obj->obj) {
                rte_errno = errno;
                DRV_LOG(ERR, "Failed to create VIRTQ Obj using DevX.");
-               rte_free(virtq_obj);
+               mlx5_free(virtq_obj);
                return NULL;
        }
        virtq_obj->id = MLX5_GET(general_obj_out_cmd_hdr, out, obj_id);
@@ -1337,7 +1795,7 @@ mlx5_devx_cmd_modify_virtq(struct mlx5_devx_obj *virtq_obj,
        if (ret) {
                DRV_LOG(ERR, "Failed to modify VIRTQ using DevX.");
                rte_errno = errno;
-               return -errno;
+               return -rte_errno;
        }
        return ret;
 }
@@ -1378,6 +1836,9 @@ mlx5_devx_cmd_query_virtq(struct mlx5_devx_obj *virtq_obj,
        attr->hw_available_index = MLX5_GET16(virtio_net_q, virtq,
                                              hw_available_index);
        attr->hw_used_index = MLX5_GET16(virtio_net_q, virtq, hw_used_index);
+       attr->state = MLX5_GET16(virtio_net_q, virtq, state);
+       attr->error_type = MLX5_GET16(virtio_net_q, virtq,
+                                     virtio_q_context.error_type);
        return ret;
 }
 
@@ -1398,8 +1859,9 @@ mlx5_devx_cmd_create_qp(void *ctx,
 {
        uint32_t in[MLX5_ST_SZ_DW(create_qp_in)] = {0};
        uint32_t out[MLX5_ST_SZ_DW(create_qp_out)] = {0};
-       struct mlx5_devx_obj *qp_obj = rte_zmalloc(__func__, sizeof(*qp_obj),
-                                                  0);
+       struct mlx5_devx_obj *qp_obj = mlx5_malloc(MLX5_MEM_ZERO,
+                                                  sizeof(*qp_obj),
+                                                  0, SOCKET_ID_ANY);
        void *qpc = MLX5_ADDR_OF(create_qp_in, in, qpc);
 
        if (!qp_obj) {
@@ -1410,11 +1872,13 @@ mlx5_devx_cmd_create_qp(void *ctx,
        MLX5_SET(create_qp_in, in, opcode, MLX5_CMD_OP_CREATE_QP);
        MLX5_SET(qpc, qpc, st, MLX5_QP_ST_RC);
        MLX5_SET(qpc, qpc, pd, attr->pd);
+       MLX5_SET(qpc, qpc, ts_format, attr->ts_format);
        if (attr->uar_index) {
                MLX5_SET(qpc, qpc, pm_state, MLX5_QP_PM_MIGRATED);
                MLX5_SET(qpc, qpc, uar_page, attr->uar_index);
-               MLX5_SET(qpc, qpc, log_page_size, attr->log_page_size -
-                        MLX5_ADAPTER_PAGE_SHIFT);
+               if (attr->log_page_size > MLX5_ADAPTER_PAGE_SHIFT)
+                       MLX5_SET(qpc, qpc, log_page_size,
+                                attr->log_page_size - MLX5_ADAPTER_PAGE_SHIFT);
                if (attr->sq_size) {
                        MLX5_ASSERT(RTE_IS_POWER_OF_2(attr->sq_size));
                        MLX5_SET(qpc, qpc, cqn_snd, attr->cqn);
@@ -1454,7 +1918,7 @@ mlx5_devx_cmd_create_qp(void *ctx,
        if (!qp_obj->obj) {
                rte_errno = errno;
                DRV_LOG(ERR, "Failed to create QP Obj using DevX.");
-               rte_free(qp_obj);
+               mlx5_free(qp_obj);
                return NULL;
        }
        qp_obj->id = MLX5_GET(create_qp_out, out, qpn);
@@ -1540,7 +2004,7 @@ mlx5_devx_cmd_modify_qp_state(struct mlx5_devx_obj *qp, uint32_t qp_st_mod_op,
        if (ret) {
                DRV_LOG(ERR, "Failed to modify QP using DevX.");
                rte_errno = errno;
-               return -errno;
+               return -rte_errno;
        }
        return ret;
 }
@@ -1550,8 +2014,9 @@ mlx5_devx_cmd_create_virtio_q_counters(void *ctx)
 {
        uint32_t in[MLX5_ST_SZ_DW(create_virtio_q_counters_in)] = {0};
        uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
-       struct mlx5_devx_obj *couners_obj = rte_zmalloc(__func__,
-                                                      sizeof(*couners_obj), 0);
+       struct mlx5_devx_obj *couners_obj = mlx5_malloc(MLX5_MEM_ZERO,
+                                                      sizeof(*couners_obj), 0,
+                                                      SOCKET_ID_ANY);
        void *hdr = MLX5_ADDR_OF(create_virtio_q_counters_in, in, hdr);
 
        if (!couners_obj) {
@@ -1569,7 +2034,7 @@ mlx5_devx_cmd_create_virtio_q_counters(void *ctx)
                rte_errno = errno;
                DRV_LOG(ERR, "Failed to create virtio queue counters Obj using"
                        " DevX.");
-               rte_free(couners_obj);
+               mlx5_free(couners_obj);
                return NULL;
        }
        couners_obj->id = MLX5_GET(general_obj_out_cmd_hdr, out, obj_id);
@@ -1613,3 +2078,238 @@ mlx5_devx_cmd_query_virtio_q_counters(struct mlx5_devx_obj *couners_obj,
                                        invalid_buffer);
        return ret;
 }
+
+/**
+ * Create general object of type FLOW_HIT_ASO using DevX API.
+ *
+ * @param[in] ctx
+ *   Context returned from mlx5 open_device() glue function.
+ * @param [in] pd
+ *   PD value to associate the FLOW_HIT_ASO object with.
+ *
+ * @return
+ *   The DevX object created, NULL otherwise and rte_errno is set.
+ */
+struct mlx5_devx_obj *
+mlx5_devx_cmd_create_flow_hit_aso_obj(void *ctx, uint32_t pd)
+{
+       uint32_t in[MLX5_ST_SZ_DW(create_flow_hit_aso_in)] = {0};
+       uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
+       struct mlx5_devx_obj *flow_hit_aso_obj = NULL;
+       void *ptr = NULL;
+
+       flow_hit_aso_obj = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*flow_hit_aso_obj),
+                                      0, SOCKET_ID_ANY);
+       if (!flow_hit_aso_obj) {
+               DRV_LOG(ERR, "Failed to allocate FLOW_HIT_ASO object data");
+               rte_errno = ENOMEM;
+               return NULL;
+       }
+       ptr = MLX5_ADDR_OF(create_flow_hit_aso_in, in, hdr);
+       MLX5_SET(general_obj_in_cmd_hdr, ptr, opcode,
+                MLX5_CMD_OP_CREATE_GENERAL_OBJECT);
+       MLX5_SET(general_obj_in_cmd_hdr, ptr, obj_type,
+                MLX5_GENERAL_OBJ_TYPE_FLOW_HIT_ASO);
+       ptr = MLX5_ADDR_OF(create_flow_hit_aso_in, in, flow_hit_aso);
+       MLX5_SET(flow_hit_aso, ptr, access_pd, pd);
+       flow_hit_aso_obj->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in),
+                                                          out, sizeof(out));
+       if (!flow_hit_aso_obj->obj) {
+               rte_errno = errno;
+               DRV_LOG(ERR, "Failed to create FLOW_HIT_ASO obj using DevX.");
+               mlx5_free(flow_hit_aso_obj);
+               return NULL;
+       }
+       flow_hit_aso_obj->id = MLX5_GET(general_obj_out_cmd_hdr, out, obj_id);
+       return flow_hit_aso_obj;
+}
+
+/*
+ * Create PD using DevX API.
+ *
+ * @param[in] ctx
+ *   Context returned from mlx5 open_device() glue function.
+ *
+ * @return
+ *   The DevX object created, NULL otherwise and rte_errno is set.
+ */
+struct mlx5_devx_obj *
+mlx5_devx_cmd_alloc_pd(void *ctx)
+{
+       struct mlx5_devx_obj *ppd =
+               mlx5_malloc(MLX5_MEM_ZERO, sizeof(*ppd), 0, SOCKET_ID_ANY);
+       u32 in[MLX5_ST_SZ_DW(alloc_pd_in)] = {0};
+       u32 out[MLX5_ST_SZ_DW(alloc_pd_out)] = {0};
+
+       if (!ppd) {
+               DRV_LOG(ERR, "Failed to allocate PD data.");
+               rte_errno = ENOMEM;
+               return NULL;
+       }
+       MLX5_SET(alloc_pd_in, in, opcode, MLX5_CMD_OP_ALLOC_PD);
+       ppd->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in),
+                               out, sizeof(out));
+       if (!ppd->obj) {
+               mlx5_free(ppd);
+               DRV_LOG(ERR, "Failed to allocate PD Obj using DevX.");
+               rte_errno = errno;
+               return NULL;
+       }
+       ppd->id = MLX5_GET(alloc_pd_out, out, pd);
+       return ppd;
+}
+
+/**
+ * Create general object of type GENEVE TLV option using DevX API.
+ *
+ * @param[in] ctx
+ *   Context returned from mlx5 open_device() glue function.
+ * @param [in] class
+ *   TLV option variable value of class
+ * @param [in] type
+ *   TLV option variable value of type
+ * @param [in] len
+ *   TLV option variable value of len
+ *
+ * @return
+ *   The DevX object created, NULL otherwise and rte_errno is set.
+ */
+struct mlx5_devx_obj *
+mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
+               uint16_t class, uint8_t type, uint8_t len)
+{
+       uint32_t in[MLX5_ST_SZ_DW(create_geneve_tlv_option_in)] = {0};
+       uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
+       struct mlx5_devx_obj *geneve_tlv_opt_obj = mlx5_malloc(MLX5_MEM_ZERO,
+                                                  sizeof(*geneve_tlv_opt_obj),
+                                                  0, SOCKET_ID_ANY);
+
+       if (!geneve_tlv_opt_obj) {
+               DRV_LOG(ERR, "Failed to allocate geneve tlv option object.");
+               rte_errno = ENOMEM;
+               return NULL;
+       }
+       void *hdr = MLX5_ADDR_OF(create_geneve_tlv_option_in, in, hdr);
+       void *opt = MLX5_ADDR_OF(create_geneve_tlv_option_in, in,
+                       geneve_tlv_opt);
+       MLX5_SET(general_obj_in_cmd_hdr, hdr, opcode,
+                       MLX5_CMD_OP_CREATE_GENERAL_OBJECT);
+       MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_type,
+                       MLX5_OBJ_TYPE_GENEVE_TLV_OPT);
+       MLX5_SET(geneve_tlv_option, opt, option_class,
+                       rte_be_to_cpu_16(class));
+       MLX5_SET(geneve_tlv_option, opt, option_type, type);
+       MLX5_SET(geneve_tlv_option, opt, option_data_length, len);
+       geneve_tlv_opt_obj->obj = mlx5_glue->devx_obj_create(ctx, in,
+                                       sizeof(in), out, sizeof(out));
+       if (!geneve_tlv_opt_obj->obj) {
+               rte_errno = errno;
+               DRV_LOG(ERR, "Failed to create Geneve tlv option "
+                               "Obj using DevX.");
+               mlx5_free(geneve_tlv_opt_obj);
+               return NULL;
+       }
+       geneve_tlv_opt_obj->id = MLX5_GET(general_obj_out_cmd_hdr, out, obj_id);
+       return geneve_tlv_opt_obj;
+}
+
+int
+mlx5_devx_cmd_wq_query(void *wq, uint32_t *counter_set_id)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+       uint32_t in[MLX5_ST_SZ_DW(query_rq_in)] = {0};
+       uint32_t out[MLX5_ST_SZ_DW(query_rq_out)] = {0};
+       int rc;
+       void *rq_ctx;
+
+       MLX5_SET(query_rq_in, in, opcode, MLX5_CMD_OP_QUERY_RQ);
+       MLX5_SET(query_rq_in, in, rqn, ((struct ibv_wq *)wq)->wq_num);
+       rc = mlx5_glue->devx_wq_query(wq, in, sizeof(in), out, sizeof(out));
+       if (rc) {
+               rte_errno = errno;
+               DRV_LOG(ERR, "Failed to query WQ counter set ID using DevX - "
+                       "rc = %d, errno = %d.", rc, errno);
+               return -rc;
+       };
+       rq_ctx = MLX5_ADDR_OF(query_rq_out, out, rq_context);
+       *counter_set_id = MLX5_GET(rqc, rq_ctx, counter_set_id);
+       return 0;
+#else
+       (void)wq;
+       (void)counter_set_id;
+       return -ENOTSUP;
+#endif
+}
+
+/*
+ * Allocate queue counters via devx interface.
+ *
+ * @param[in] ctx
+ *   Context returned from mlx5 open_device() glue function.
+ *
+ * @return
+ *   Pointer to counter object on success, a NULL value otherwise and
+ *   rte_errno is set.
+ */
+struct mlx5_devx_obj *
+mlx5_devx_cmd_queue_counter_alloc(void *ctx)
+{
+       struct mlx5_devx_obj *dcs = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*dcs), 0,
+                                               SOCKET_ID_ANY);
+       uint32_t in[MLX5_ST_SZ_DW(alloc_q_counter_in)]   = {0};
+       uint32_t out[MLX5_ST_SZ_DW(alloc_q_counter_out)] = {0};
+
+       if (!dcs) {
+               rte_errno = ENOMEM;
+               return NULL;
+       }
+       MLX5_SET(alloc_q_counter_in, in, opcode, MLX5_CMD_OP_ALLOC_Q_COUNTER);
+       dcs->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in), out,
+                                             sizeof(out));
+       if (!dcs->obj) {
+               DRV_LOG(DEBUG, "Can't allocate q counter set by DevX - error "
+                       "%d.", errno);
+               rte_errno = errno;
+               mlx5_free(dcs);
+               return NULL;
+       }
+       dcs->id = MLX5_GET(alloc_q_counter_out, out, counter_set_id);
+       return dcs;
+}
+
+/**
+ * Query queue counters values.
+ *
+ * @param[in] dcs
+ *   devx object of the queue counter set.
+ * @param[in] clear
+ *   Whether hardware should clear the counters after the query or not.
+ *  @param[out] out_of_buffers
+ *   Number of dropped occurred due to lack of WQE for the associated QPs/RQs.
+ *
+ * @return
+ *   0 on success, a negative value otherwise.
+ */
+int
+mlx5_devx_cmd_queue_counter_query(struct mlx5_devx_obj *dcs, int clear,
+                                 uint32_t *out_of_buffers)
+{
+       uint32_t out[MLX5_ST_SZ_BYTES(query_q_counter_out)] = {0};
+       uint32_t in[MLX5_ST_SZ_DW(query_q_counter_in)] = {0};
+       int rc;
+
+       MLX5_SET(query_q_counter_in, in, opcode,
+                MLX5_CMD_OP_QUERY_Q_COUNTER);
+       MLX5_SET(query_q_counter_in, in, op_mod, 0);
+       MLX5_SET(query_q_counter_in, in, counter_set_id, dcs->id);
+       MLX5_SET(query_q_counter_in, in, clear, !!clear);
+       rc = mlx5_glue->devx_obj_query(dcs->obj, in, sizeof(in), out,
+                                      sizeof(out));
+       if (rc) {
+               DRV_LOG(ERR, "Failed to query devx q counter set - rc %d", rc);
+               rte_errno = rc;
+               return -rc;
+       }
+       *out_of_buffers = MLX5_GET(query_q_counter_out, out, out_of_buffer);
+       return 0;
+}