drm/amdkfd: use kvcalloc() instead of kvmalloc() in kfd_migrate

simplify programming with existing functions.

Signed-off-by: Yang Wang <KevinYang.Wang@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
index 3a29d857640b117ea6b03b601c6ab185b66d2dc2..43cd47723946504316a67597246f0f96a72240ee 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
@@ -410,7 +410,6 @@ svm_migrate_vma_to_vram(struct amdgpu_device *adev, struct svm_range *prange,
        struct migrate_vma migrate;
        unsigned long cpages = 0;
        dma_addr_t *scratch;
-       size_t size;
        void *buf;
        int r = -ENOMEM;
 
@@ -421,9 +420,9 @@ svm_migrate_vma_to_vram(struct amdgpu_device *adev, struct svm_range *prange,
        migrate.flags = MIGRATE_VMA_SELECT_SYSTEM;
        migrate.pgmap_owner = SVM_ADEV_PGMAP_OWNER(adev);
 
-       size = 2 * sizeof(*migrate.src) + sizeof(uint64_t) + sizeof(dma_addr_t);
-       size *= npages;
-       buf = kvmalloc(size, GFP_KERNEL | __GFP_ZERO);
+       buf = kvcalloc(npages,
+                      2 * sizeof(*migrate.src) + sizeof(uint64_t) + sizeof(dma_addr_t),
+                      GFP_KERNEL);
        if (!buf)
                goto out;
 
@@ -665,7 +664,6 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange,
        struct dma_fence *mfence = NULL;
        struct migrate_vma migrate;
        dma_addr_t *scratch;
-       size_t size;
        void *buf;
        int r = -ENOMEM;
 
@@ -676,9 +674,10 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange,
        migrate.flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE;
        migrate.pgmap_owner = SVM_ADEV_PGMAP_OWNER(adev);
 
-       size = 2 * sizeof(*migrate.src) + sizeof(uint64_t) + sizeof(dma_addr_t);
-       size *= npages;
-       buf = kvmalloc(size, GFP_KERNEL | __GFP_ZERO);
+       buf = kvcalloc(npages,
+                      2 * sizeof(*migrate.src) + sizeof(uint64_t) + sizeof(dma_addr_t),
+                      GFP_KERNEL);
+
        if (!buf)
                goto out;
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index 459fa07a3bcc85d998897d77b801700ef44f8fdd..aed2f6f3ce5e3cb7edebdd4768a7e4a95c96e246 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -149,8 +149,7 @@ svm_range_dma_map_dev(struct amdgpu_device *adev, struct svm_range *prange,
        int i, r;
 
        if (!addr) {
-               addr = kvmalloc_array(prange->npages, sizeof(*addr),
-                                     GFP_KERNEL | __GFP_ZERO);
+               addr = kvcalloc(prange->npages, sizeof(*addr), GFP_KERNEL);
                if (!addr)
                        return -ENOMEM;
                prange->dma_addr[gpuidx] = addr;