gpu: ion: Fix several issues with page pool
Split out low and high mem pages so they are correctly reported
when the shrinker is called.
Fix potential deadlock caused by holding the page pool lock while
allocationg and also needing that lock from the shrink function
Change-Id: Iaeb45e5d644f1a1a39b491a2941ee9403fff81f0
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Git-commit: 27182f504ce9fa7b10cb2520e8684f7c17bc8c86
Git-repo: https://android.googlesource.com/kernel/common
[lauraa@codeaurora.org: Context differences due to debugfs.
Dropped the debugfs support until we can properly sync back
up]
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
diff --git a/drivers/gpu/ion/ion_priv.h b/drivers/gpu/ion/ion_priv.h
index e1910b9..a30b273 100644
--- a/drivers/gpu/ion/ion_priv.h
+++ b/drivers/gpu/ion/ion_priv.h
@@ -222,8 +222,10 @@
/**
* struct ion_page_pool - pagepool struct
- * @count: number of items in the pool
- * @items: list of items
+ * @high_count: number of highmem items in the pool
+ * @low_count: number of lowmem items in the pool
+ * @high_items: list of highmem items
+ * @low_items: list of lowmem items
* @shrinker: a shrinker for the items
* @mutex: lock protecting this struct and especially the count
* item list
@@ -240,8 +242,10 @@
* on many systems
*/
struct ion_page_pool {
- int count;
- struct list_head items;
+ int high_count;
+ int low_count;
+ struct list_head high_items;
+ struct list_head low_items;
struct shrinker shrinker;
struct mutex mutex;
void *(*alloc)(struct ion_page_pool *pool);