nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: use nvgpu list for page chunks

Browse Source 
Use nvgpu list APIs instead of linux list APIs
to store chunks of page allocator

Jira NVGPU-13

Change-Id: I63375fc2df683e018c48a90b76eca368438cc32f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1326814
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Deepak Nibade
2017-02-10 17:35:58 +05:30
committed by mobile promotions
parent 1e355ca52e
commit 0d8830394a
4 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/gpu/nvgpu/common/mm/page_allocator.c
View File

@@ -135,11 +135,11 @@ static void __nvgpu_free_pages(struct nvgpu_page_allocator *a,
{
struct page_alloc_chunk *chunk;
while (!list_empty(&alloc->alloc_chunks)) {
chunk = list_first_entry(&alloc->alloc_chunks,
struct page_alloc_chunk,
while (!nvgpu_list_empty(&alloc->alloc_chunks)) {
chunk = nvgpu_list_first_entry(&alloc->alloc_chunks,
page_alloc_chunk,
list_entry);
list_del(&chunk->list_entry);
nvgpu_list_del(&chunk->list_entry);
if (free_buddy_alloc)
nvgpu_free(&a->source_allocator, chunk->base);
@@ -322,8 +322,8 @@ static int __do_slab_alloc(struct nvgpu_page_allocator *a,
alloc->length = slab_page->slab_size;
alloc->base = slab_page->page_addr + (offs * slab_page->slab_size);
chunk = list_first_entry(&alloc->alloc_chunks,
struct page_alloc_chunk, list_entry);
chunk = nvgpu_list_first_entry(&alloc->alloc_chunks,
page_alloc_chunk, list_entry);
chunk->base = alloc->base;
chunk->length = alloc->length;
@@ -359,8 +359,8 @@ static struct nvgpu_page_alloc *__nvgpu_alloc_slab(
goto fail;
}
INIT_LIST_HEAD(&alloc->alloc_chunks);
list_add(&chunk->list_entry, &alloc->alloc_chunks);
nvgpu_init_list_node(&alloc->alloc_chunks);
nvgpu_list_add(&chunk->list_entry, &alloc->alloc_chunks);
err = __do_slab_alloc(a, slab, alloc);
if (err)
@@ -448,7 +448,7 @@ static struct nvgpu_page_alloc *__do_nvgpu_alloc_pages(
memset(alloc, 0, sizeof(*alloc));
INIT_LIST_HEAD(&alloc->alloc_chunks);
nvgpu_init_list_node(&alloc->alloc_chunks);
alloc->length = pages << a->page_shift;
while (pages) {
@@ -504,23 +504,23 @@ static struct nvgpu_page_alloc *__do_nvgpu_alloc_pages(
c->base = chunk_addr;
c->length = chunk_len;
list_add(&c->list_entry, &alloc->alloc_chunks);
nvgpu_list_add(&c->list_entry, &alloc->alloc_chunks);
i++;
}
alloc->nr_chunks = i;
c = list_first_entry(&alloc->alloc_chunks,
struct page_alloc_chunk, list_entry);
c = nvgpu_list_first_entry(&alloc->alloc_chunks,
page_alloc_chunk, list_entry);
alloc->base = c->base;
return alloc;
fail_cleanup:
while (!list_empty(&alloc->alloc_chunks)) {
c = list_first_entry(&alloc->alloc_chunks,
struct page_alloc_chunk, list_entry);
list_del(&c->list_entry);
while (!nvgpu_list_empty(&alloc->alloc_chunks)) {
c = nvgpu_list_first_entry(&alloc->alloc_chunks,
page_alloc_chunk, list_entry);
nvgpu_list_del(&c->list_entry);
nvgpu_free(&a->source_allocator, c->base);
nvgpu_kmem_cache_free(a->chunk_cache, c);
}
@@ -548,7 +548,8 @@ static struct nvgpu_page_alloc *__nvgpu_alloc_pages(
palloc_dbg(a, "Alloc 0x%llx (%llu) id=0x%010llx\n",
pages << a->page_shift, pages, alloc->base);
list_for_each_entry(c, &alloc->alloc_chunks, list_entry) {
nvgpu_list_for_each_entry(c, &alloc->alloc_chunks,
page_alloc_chunk, list_entry) {
palloc_dbg(a, " Chunk %2d: 0x%010llx + 0x%llx\n",
i++, c->base, c->length);
}
@@ -664,11 +665,11 @@ static struct nvgpu_page_alloc *__nvgpu_alloc_pages_fixed(
alloc->nr_chunks = 1;
alloc->length = length;
INIT_LIST_HEAD(&alloc->alloc_chunks);
nvgpu_init_list_node(&alloc->alloc_chunks);
c->base = alloc->base;
c->length = length;
list_add(&c->list_entry, &alloc->alloc_chunks);
nvgpu_list_add(&c->list_entry, &alloc->alloc_chunks);
return alloc;
@@ -708,7 +709,8 @@ static u64 nvgpu_page_alloc_fixed(struct nvgpu_allocator *__a,
palloc_dbg(a, "Alloc [fixed] @ 0x%010llx + 0x%llx (%llu)\n",
alloc->base, aligned_len, pages);
list_for_each_entry(c, &alloc->alloc_chunks, list_entry) {
nvgpu_list_for_each_entry(c, &alloc->alloc_chunks,
page_alloc_chunk, list_entry) {
palloc_dbg(a, " Chunk %2d: 0x%010llx + 0x%llx\n",
i++, c->base, c->length);
}