vdpa/mlx5: fix large VM memory region registration

[dpdk.git] / drivers / vdpa / mlx5 / mlx5_vdpa_mem.c

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_mem.c b/drivers/vdpa/mlx5/mlx5_vdpa_mem.c
index f8861d5..a06681b 100644 (file)
--- a/drivers/vdpa/mlx5/mlx5_vdpa_mem.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_mem.c
@@ -103,15 +103,15 @@ mlx5_vdpa_vhost_mem_regions_prepare(int vid, uint8_t *mode, uint64_t *mem_size,
                        size = mem->regions[i].guest_phys_addr -
                                (mem->regions[i - 1].guest_phys_addr +
                                 mem->regions[i - 1].size);
-                       *gcd = rte_get_gcd(*gcd, size);
+                       *gcd = rte_get_gcd64(*gcd, size);
                        klm_entries_num += KLM_NUM_MAX_ALIGN(size);
                }
                size = mem->regions[i].size;
-               *gcd = rte_get_gcd(*gcd, size);
+               *gcd = rte_get_gcd64(*gcd, size);
                klm_entries_num += KLM_NUM_MAX_ALIGN(size);
        }
        if (*gcd > MLX5_MAX_KLM_BYTE_COUNT)
-               *gcd = rte_get_gcd(*gcd, MLX5_MAX_KLM_BYTE_COUNT);
+               *gcd = rte_get_gcd64(*gcd, MLX5_MAX_KLM_BYTE_COUNT);
        if (!RTE_IS_POWER_OF_2(*gcd)) {
                uint64_t candidate_gcd = rte_align64prevpow2(*gcd);
 
@@ -177,10 +177,10 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)
        struct mlx5_devx_mkey_attr mkey_attr;
        struct mlx5_vdpa_query_mr *entry = NULL;
        struct rte_vhost_mem_region *reg = NULL;
-       uint8_t mode;
+       uint8_t mode = 0;
        uint32_t entries_num = 0;
        uint32_t i;
-       uint64_t gcd;
+       uint64_t gcd = 0;
        uint64_t klm_size;
        uint64_t mem_size;
        uint64_t k;
@@ -200,6 +200,7 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)
                goto error;
        }
        DRV_LOG(DEBUG, "Dump fill Mkey = %u.", priv->null_mr->lkey);
+       memset(&mkey_attr, 0, sizeof(mkey_attr));
        for (i = 0; i < mem->nregions; i++) {
                reg = &mem->regions[i];
                entry = rte_zmalloc(__func__, sizeof(*entry), 0);
@@ -221,10 +222,6 @@ mlx5_vdpa_mem_register(struct mlx5_vdpa_priv *priv)
                mkey_attr.umem_id = entry->umem->umem_id;
                mkey_attr.pd = priv->pdn;
                mkey_attr.pg_access = 1;
-               mkey_attr.klm_array = NULL;
-               mkey_attr.klm_num = 0;
-               mkey_attr.relaxed_ordering_read = 0;
-               mkey_attr.relaxed_ordering_write = 0;
                entry->mkey = mlx5_devx_cmd_mkey_create(priv->ctx, &mkey_attr);
                if (!entry->mkey) {
                        DRV_LOG(ERR, "Failed to create direct Mkey.");