diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-10-04 17:04:01 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-02-10 14:57:31 -0500 |
commit | cf0ef133e6e3075c808bb3f553b35e94fc000afd (patch) | |
tree | 13cace143fe43034791570514a05bf06cfcc47cb /drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h | |
parent | 24e8ee192a02ff75a569f8c734efa9b4b5267fc8 (diff) |
gpu: nvgpu: Move kmem_caches to allocator
Instead of using a single static kmem_cache for each type of
data structure the allocators may want to allocate each
allocator now has its own instance of the kmem_cache. This is
done so that each GPU driver instance can accurately track how
much memory it is using.
In order to support this on older kernels a new NVGPU API has
been made,
nvgpu_kmem_cache_create(struct gk20a *g, size_t size)
To handle the possibility that caches cannot be created with
the same name.
This patch also fixes numerous places where kfree() was wrongly
used to free kmem_cache allocs.
Bug 1799159
Bug 1823380
Change-Id: Id674f9a5445fde3f95db65ad6bf3ea990444603d
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1283826
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h b/drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h index 9802b9db..95780202 100644 --- a/drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h +++ b/drivers/gpu/nvgpu/common/mm/bitmap_allocator_priv.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -19,6 +19,8 @@ | |||
19 | 19 | ||
20 | #include <linux/rbtree.h> | 20 | #include <linux/rbtree.h> |
21 | 21 | ||
22 | #include <nvgpu/kmem.h> | ||
23 | |||
22 | struct nvgpu_allocator; | 24 | struct nvgpu_allocator; |
23 | 25 | ||
24 | struct nvgpu_bitmap_allocator { | 26 | struct nvgpu_bitmap_allocator { |
@@ -43,6 +45,8 @@ struct nvgpu_bitmap_allocator { | |||
43 | unsigned long *bitmap; /* The actual bitmap! */ | 45 | unsigned long *bitmap; /* The actual bitmap! */ |
44 | struct rb_root allocs; /* Tree of outstanding allocations. */ | 46 | struct rb_root allocs; /* Tree of outstanding allocations. */ |
45 | 47 | ||
48 | struct nvgpu_kmem_cache *meta_data_cache; | ||
49 | |||
46 | u64 flags; | 50 | u64 flags; |
47 | 51 | ||
48 | bool inited; | 52 | bool inited; |