common/mlx5: wrap memory allocation on Linux
[dpdk.git] / drivers / common / mlx5 / mlx5_devx_cmds.c
index 1c88f44..9c1d188 100644 (file)
@@ -5,10 +5,12 @@
 
 #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"
 
 
 /**
@@ -89,7 +91,8 @@ error:
 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};
 
@@ -105,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);
@@ -210,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;
 
@@ -219,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) {
@@ -257,10 +267,10 @@ mlx5_devx_cmd_mkey_create(void *ctx,
        MLX5_SET(mkc, mkc, pd, attr->pd);
        MLX5_SET(mkc, mkc, mkey_7_0, attr->umem_id & 0xFF);
        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,
@@ -269,7 +279,7 @@ mlx5_devx_cmd_mkey_create(void *ctx,
                DRV_LOG(ERR, "Can't create %sdirect mkey - error %d\n",
                        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);
@@ -321,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;
 }
 
@@ -520,14 +530,13 @@ mlx5_devx_cmd_create_flex_parser(void *ctx,
        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 = NULL;
+       struct mlx5_devx_obj *parse_flex_obj = mlx5_malloc
+                    (MLX5_MEM_ZERO, sizeof(*parse_flex_obj), 0, SOCKET_ID_ANY);
        uint32_t i;
 
-       parse_flex_obj = rte_calloc(__func__, 1, sizeof(*parse_flex_obj), 0);
        if (!parse_flex_obj) {
-               DRV_LOG(ERR, "Failed to allocate flex parser data");
+               DRV_LOG(ERR, "Failed to allocate flex parser data.");
                rte_errno = ENOMEM;
-               rte_free(in);
                return NULL;
        }
        MLX5_SET(general_obj_in_cmd_hdr, hdr, opcode,
@@ -611,7 +620,7 @@ mlx5_devx_cmd_create_flex_parser(void *ctx,
                rte_errno = errno;
                DRV_LOG(ERR, "Failed to create FLEX PARSE GRAPH object "
                        "by using DevX.");
-               rte_free(parse_flex_obj);
+               mlx5_free(parse_flex_obj);
                return NULL;
        }
        parse_flex_obj->id = MLX5_GET(general_obj_out_cmd_hdr, out, obj_id);
@@ -677,6 +686,8 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
                        relaxed_ordering_write);
        attr->relaxed_ordering_read = MLX5_GET(cmd_hca_cap, hcattr,
                        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);
@@ -698,11 +709,17 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        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->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);
        if (attr->qos.sup) {
                MLX5_SET(query_hca_cap_in, in, op_mod,
                         MLX5_GET_HCA_CAP_OP_MOD_QOS_CAP |
@@ -736,6 +753,33 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
        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));
@@ -777,6 +821,8 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
                        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);
@@ -911,7 +957,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;
@@ -939,7 +985,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);
@@ -1016,7 +1062,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;
@@ -1058,13 +1104,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.
  *
@@ -1088,17 +1218,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);
@@ -1109,11 +1239,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);
@@ -1138,7 +1268,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;
@@ -1158,7 +1288,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;
@@ -1191,7 +1321,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;
@@ -1204,7 +1334,7 @@ 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);
@@ -1227,7 +1357,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);
@@ -1291,7 +1421,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;
@@ -1301,8 +1431,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);
@@ -1311,7 +1441,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);
@@ -1333,7 +1463,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;
@@ -1346,7 +1476,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,
@@ -1410,8 +1540,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) {
@@ -1435,6 +1566,12 @@ mlx5_devx_cmd_create_cq(void *ctx, struct mlx5_devx_cq_attr *attr)
                 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);
+       MLX5_SET(cqc, cqctx, cqe_sz, attr->cqe_size);
        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);
@@ -1446,7 +1583,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);
@@ -1470,8 +1607,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);
@@ -1519,7 +1657,7 @@ mlx5_devx_cmd_create_virtq(void *ctx,
        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);
@@ -1621,6 +1759,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;
 }
 
@@ -1641,8 +1782,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) {
@@ -1697,7 +1839,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);
@@ -1793,8 +1935,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) {
@@ -1812,7 +1955,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);
@@ -1856,3 +1999,48 @@ 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;
+}