net/mlx5: move static asserts to global scope

[dpdk.git] / drivers / net / mlx5 / linux / mlx5_os.c

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 2e7bbb4..a6c1eba 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -116,7 +116,12 @@ mlx5_os_get_dev_attr(void *ctx, struct mlx5_dev_attr *device_attr)
        device_attr->max_qp_wr = attr_ex.orig_attr.max_qp_wr;
        device_attr->max_sge = attr_ex.orig_attr.max_sge;
        device_attr->max_cq = attr_ex.orig_attr.max_cq;
+       device_attr->max_cqe = attr_ex.orig_attr.max_cqe;
+       device_attr->max_mr = attr_ex.orig_attr.max_mr;
+       device_attr->max_pd = attr_ex.orig_attr.max_pd;
        device_attr->max_qp = attr_ex.orig_attr.max_qp;
+       device_attr->max_srq = attr_ex.orig_attr.max_srq;
+       device_attr->max_srq_wr = attr_ex.orig_attr.max_srq_wr;
        device_attr->raw_packet_caps = attr_ex.raw_packet_caps;
        device_attr->max_rwq_indirection_table_size =
                attr_ex.rss_caps.max_rwq_indirection_table_size;
@@ -168,9 +173,8 @@ mlx5_os_get_dev_attr(void *ctx, struct mlx5_dev_attr *device_attr)
 static void *
 mlx5_alloc_verbs_buf(size_t size, void *data)
 {
-       struct mlx5_priv *priv = data;
+       struct mlx5_dev_ctx_shared *sh = data;
        void *ret;
-       unsigned int socket = SOCKET_ID_ANY;
        size_t alignment = rte_mem_page_size();
        if (alignment == (size_t)-1) {
                DRV_LOG(ERR, "Failed to get mem page size");
@@ -178,18 +182,8 @@ mlx5_alloc_verbs_buf(size_t size, void *data)
                return NULL;
        }
 
-       if (priv->verbs_alloc_ctx.type == MLX5_VERBS_ALLOC_TYPE_TX_QUEUE) {
-               const struct mlx5_txq_ctrl *ctrl = priv->verbs_alloc_ctx.obj;
-
-               socket = ctrl->socket;
-       } else if (priv->verbs_alloc_ctx.type ==
-                  MLX5_VERBS_ALLOC_TYPE_RX_QUEUE) {
-               const struct mlx5_rxq_ctrl *ctrl = priv->verbs_alloc_ctx.obj;
-
-               socket = ctrl->socket;
-       }
        MLX5_ASSERT(data != NULL);
-       ret = mlx5_malloc(0, size, alignment, socket);
+       ret = mlx5_malloc(0, size, alignment, sh->numa_node);
        if (!ret && size)
                rte_errno = ENOMEM;
        return ret;
@@ -264,7 +258,8 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
        snprintf(s, sizeof(s), "%s_tags", sh->ibdev_name);
        sh->tag_table = mlx5_hlist_create(s, MLX5_TAGS_HLIST_ARRAY_SIZE, 0,
                                          MLX5_HLIST_WRITE_MOST,
-                                         flow_dv_tag_create_cb, NULL,
+                                         flow_dv_tag_create_cb,
+                                         flow_dv_tag_match_cb,
                                          flow_dv_tag_remove_cb);
        if (!sh->tag_table) {
                DRV_LOG(ERR, "tags with hash creation failed.");
@@ -1198,7 +1193,7 @@ err_secondary:
                        }
                }
 #endif
-#ifdef HAVE_MLX5DV_DR_ACTION_FLOW_HIT
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_ASO
                if (config->hca_attr.flow_hit_aso &&
                    priv->mtr_color_reg == REG_C_3) {
                        sh->flow_hit_aso_en = 1;
@@ -1209,7 +1204,7 @@ err_secondary:
                        }
                        DRV_LOG(DEBUG, "Flow Hit ASO is supported.");
                }
-#endif /* HAVE_MLX5DV_DR_ACTION_FLOW_HIT */
+#endif /* HAVE_MLX5_DR_CREATE_ACTION_ASO */
 #if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE)
                if (config->hca_attr.log_max_ft_sampler_num > 0  &&
                    config->dv_flow_en) {
@@ -1459,7 +1454,7 @@ err_secondary:
                        (void *)((uintptr_t)&(struct mlx5dv_ctx_allocators){
                                .alloc = &mlx5_alloc_verbs_buf,
                                .free = &mlx5_free_verbs_buf,
-                               .data = priv,
+                               .data = sh,
                        }));
        /* Bring Ethernet device up. */
        DRV_LOG(DEBUG, "port %u forcing Ethernet interface up",
@@ -1564,7 +1559,7 @@ err_secondary:
                                                      MLX5_FLOW_MREG_HTABLE_SZ,
                                                      0, 0,
                                                      flow_dv_mreg_create_cb,
-                                                     NULL,
+                                                     flow_dv_mreg_match_cb,
                                                      flow_dv_mreg_remove_cb);
                if (!priv->mreg_cp_tbl) {
                        err = ENOMEM;
@@ -2324,6 +2319,16 @@ mlx5_os_open_device(const struct mlx5_dev_spawn_data *spawn,
                DRV_LOG(DEBUG, "DevX is NOT supported");
                err = 0;
        }
+       if (!err && sh->ctx) {
+               /* Hint libmlx5 to use PMD allocator for data plane resources */
+               mlx5_glue->dv_set_context_attr(sh->ctx,
+                       MLX5DV_CTX_ATTR_BUF_ALLOCATORS,
+                       (void *)((uintptr_t)&(struct mlx5dv_ctx_allocators){
+                               .alloc = &mlx5_alloc_verbs_buf,
+                               .free = &mlx5_free_verbs_buf,
+                               .data = sh,
+                       }));
+       }
        return err;
 }