gpu: nvgpu: Use new kmem API functions (common/*)

Use the new kmem API functions in common/* and common/mm/*.

Add a struct gk20a pointer to struct nvgpu_allocator in order
to store the gk20a pointer used for allocating memory.

Bug 1799159
Bug 1823380

Change-Id: I881ea9545e8a8f0b75d77a1e35dd1812e0bb654e
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1318315
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
index 6f4c670a..246be974 100644
--- a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 
 #include <nvgpu/allocator.h>
+#include <nvgpu/kmem.h>
 
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/platform_gk20a.h"
@@ -304,7 +305,7 @@ static void nvgpu_buddy_allocator_destroy(struct nvgpu_allocator *__a)
         }
 
         nvgpu_kmem_cache_destroy(a->buddy_cache);
-        kfree(a);
+        nvgpu_kfree(nvgpu_alloc_to_gpu(__a), a);
 
         alloc_unlock(__a);
 }
@@ -809,7 +810,7 @@ static void __balloc_do_free_fixed(struct nvgpu_buddy_allocator *a,
                 balloc_coalesce(a, bud);
         }
 
-        kfree(falloc);
+        nvgpu_kfree(nvgpu_alloc_to_gpu(a->owner), falloc);
 }
 
 /*
@@ -893,7 +894,7 @@ static u64 __nvgpu_balloc_fixed_buddy(struct nvgpu_allocator *__a,
                         goto fail;
         }
 
-        falloc = kmalloc(sizeof(*falloc), GFP_KERNEL);
+        falloc = nvgpu_kmalloc(nvgpu_alloc_to_gpu(__a), sizeof(*falloc));
         if (!falloc)
                 goto fail;
 
@@ -932,7 +933,7 @@ static u64 __nvgpu_balloc_fixed_buddy(struct nvgpu_allocator *__a,
 fail_unlock:
         alloc_unlock(__a);
 fail:
-        kfree(falloc);
+        nvgpu_kfree(nvgpu_alloc_to_gpu(__a), falloc);
         nvgpu_alloc_trace_func_done();
         return 0;
 }
@@ -1261,11 +1262,11 @@ int __nvgpu_buddy_allocator_init(struct gk20a *g, struct nvgpu_allocator *__a,
         if (flags & GPU_ALLOC_GVA_SPACE && !vm)
                 return -EINVAL;
 
-        a = kzalloc(sizeof(struct nvgpu_buddy_allocator), GFP_KERNEL);
+        a = nvgpu_kzalloc(g, sizeof(struct nvgpu_buddy_allocator));
         if (!a)
                 return -ENOMEM;
 
-        err = __nvgpu_alloc_common_init(__a, name, a, false, &buddy_ops);
+        err = __nvgpu_alloc_common_init(__a, g, name, a, false, &buddy_ops);
         if (err)
                 goto fail;
 
@@ -1339,7 +1340,7 @@ int __nvgpu_buddy_allocator_init(struct gk20a *g, struct nvgpu_allocator *__a,
 fail:
         if (a->buddy_cache)
                 nvgpu_kmem_cache_destroy(a->buddy_cache);
-        kfree(a);
+        nvgpu_kfree(g, a);
         return err;
 }