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

gpu: nvgpu: use nvgpu list for page allocator

Browse Source 
Use nvgpu list APIs instead of linux list APIs
for page allocator lists

Jira NVGPU-13

Change-Id: I3ee64a5cdc2ced4ca9c4ba7ad6271915a66d90f5
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1462076
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-04-19 12:29:53 +05:30
committed by mobile promotions
parent afe12a49f7
commit 78fe154ff7
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ static inline void add_slab_page_to_empty(struct page_alloc_slab *slab,
struct page_alloc_slab_page *page)
{
BUG_ON(page->state != SP_NONE);
list_add(&page->list_entry, &slab->empty);
nvgpu_list_add(&page->list_entry, &slab->empty);
slab->nr_empty++;
page->state = SP_EMPTY;
}
@@ -42,7 +42,7 @@ static inline void add_slab_page_to_partial(struct page_alloc_slab *slab,
struct page_alloc_slab_page *page)
{
BUG_ON(page->state != SP_NONE);
list_add(&page->list_entry, &slab->partial);
nvgpu_list_add(&page->list_entry, &slab->partial);
slab->nr_partial++;
page->state = SP_PARTIAL;
}
@@ -50,7 +50,7 @@ static inline void add_slab_page_to_full(struct page_alloc_slab *slab,
struct page_alloc_slab_page *page)
{
BUG_ON(page->state != SP_NONE);
list_add(&page->list_entry, &slab->full);
nvgpu_list_add(&page->list_entry, &slab->full);
slab->nr_full++;
page->state = SP_FULL;
}
@@ -58,21 +58,21 @@ static inline void add_slab_page_to_full(struct page_alloc_slab *slab,
static inline void del_slab_page_from_empty(struct page_alloc_slab *slab,
struct page_alloc_slab_page *page)
{
list_del_init(&page->list_entry);
nvgpu_list_del(&page->list_entry);
slab->nr_empty--;
page->state = SP_NONE;
}
static inline void del_slab_page_from_partial(struct page_alloc_slab *slab,
struct page_alloc_slab_page *page)
{
list_del_init(&page->list_entry);
nvgpu_list_del(&page->list_entry);
slab->nr_partial--;
page->state = SP_NONE;
}
static inline void del_slab_page_from_full(struct page_alloc_slab *slab,
struct page_alloc_slab_page *page)
{
list_del_init(&page->list_entry);
nvgpu_list_del(&page->list_entry);
slab->nr_full--;
page->state = SP_NONE;
}
@@ -197,7 +197,7 @@ static struct page_alloc_slab_page *alloc_slab_page(
return ERR_PTR(-ENOMEM);
}
INIT_LIST_HEAD(&slab_page->list_entry);
nvgpu_init_list_node(&slab_page->list_entry);
slab_page->slab_size = slab->slab_size;
slab_page->nr_objects = (u32)a->page_size / slab->slab_size;
slab_page->nr_objects_alloced = 0;
@@ -244,14 +244,14 @@ static int __do_slab_alloc(struct nvgpu_page_allocator *a,
* readily available. Take the slab_page out of what ever list it
* was in since it may be put back into a different list later.
*/
if (!list_empty(&slab->partial)) {
slab_page = list_first_entry(&slab->partial,
struct page_alloc_slab_page,
if (!nvgpu_list_empty(&slab->partial)) {
slab_page = nvgpu_list_first_entry(&slab->partial,
page_alloc_slab_page,
list_entry);
del_slab_page_from_partial(slab, slab_page);
} else if (!list_empty(&slab->empty)) {
slab_page = list_first_entry(&slab->empty,
struct page_alloc_slab_page,
} else if (!nvgpu_list_empty(&slab->empty)) {
slab_page = nvgpu_list_first_entry(&slab->empty,
page_alloc_slab_page,
list_entry);
del_slab_page_from_empty(slab, slab_page);
}
@@ -383,7 +383,7 @@ static void __nvgpu_free_slab(struct nvgpu_page_allocator *a,
/* And add. */
if (new_state == SP_EMPTY) {
if (list_empty(&slab->empty))
if (nvgpu_list_empty(&slab->empty))
add_slab_page_to_empty(slab, slab_page);
else
free_slab_page(a, slab_page);
@@ -835,9 +835,9 @@ static int nvgpu_page_alloc_init_slabs(struct nvgpu_page_allocator *a)
struct page_alloc_slab *slab = &a->slabs[i];
slab->slab_size = SZ_4K * (1 << i);
INIT_LIST_HEAD(&slab->empty);
INIT_LIST_HEAD(&slab->partial);
INIT_LIST_HEAD(&slab->full);
nvgpu_init_list_node(&slab->empty);
nvgpu_init_list_node(&slab->partial);
nvgpu_init_list_node(&slab->full);
slab->nr_empty = 0;
slab->nr_partial = 0;
slab->nr_full = 0;

17
drivers/gpu/nvgpu/include/nvgpu/page_allocator.h
View File

@@ -17,8 +17,6 @@
#ifndef PAGE_ALLOCATOR_PRIV_H
#define PAGE_ALLOCATOR_PRIV_H
#include <linux/list.h>
#include <nvgpu/allocator.h>
#include <nvgpu/kmem.h>
#include <nvgpu/list.h>
@@ -46,9 +44,9 @@ struct nvgpu_allocator;
* assumed to be 64k) the allocation is satisfied by one of the buckets.
*/
struct page_alloc_slab {
struct list_head empty;
struct list_head partial;
struct list_head full;
struct nvgpu_list_node empty;
struct nvgpu_list_node partial;
struct nvgpu_list_node full;
int nr_empty;
int nr_partial;
@@ -75,7 +73,14 @@ struct page_alloc_slab_page {
enum slab_page_state state;
struct page_alloc_slab *owner;
struct list_head list_entry;
struct nvgpu_list_node list_entry;
};
static inline struct page_alloc_slab_page *
page_alloc_slab_page_from_list_entry(struct nvgpu_list_node *node)
{
return (struct page_alloc_slab_page *)
((uintptr_t)node - offsetof(struct page_alloc_slab_page, list_entry));
};
struct page_alloc_chunk {