mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-08 20:07:46 +09:00
gpu: ion: Fix lockdep issue in ion_page_pool
Currently the mutex is held while kmalloc is called, under a low memory condition this might trigger the shrinker which also takes this mutex. Refactor so the mutex is not held during allocation. Change-Id: Ic1d3b2f69e61209191bac84724ba56f6b98e2bc4 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
This commit is contained in:
committed by
Arve Hjønnevåg
parent
cb80c2ec45
commit
15da191d8f
@@ -53,6 +53,8 @@ static int ion_page_pool_add(struct ion_page_pool *pool, struct page *page)
|
||||
item = kmalloc(sizeof(struct ion_page_pool_item), GFP_KERNEL);
|
||||
if (!item)
|
||||
return -ENOMEM;
|
||||
|
||||
mutex_lock(&pool->mutex);
|
||||
item->page = page;
|
||||
if (PageHighMem(page)) {
|
||||
list_add_tail(&item->list, &pool->high_items);
|
||||
@@ -61,6 +63,7 @@ static int ion_page_pool_add(struct ion_page_pool *pool, struct page *page)
|
||||
list_add_tail(&item->list, &pool->low_items);
|
||||
pool->low_count++;
|
||||
}
|
||||
mutex_unlock(&pool->mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -110,9 +113,7 @@ void ion_page_pool_free(struct ion_page_pool *pool, struct page* page)
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(&pool->mutex);
|
||||
ret = ion_page_pool_add(pool, page);
|
||||
mutex_unlock(&pool->mutex);
|
||||
if (ret)
|
||||
ion_page_pool_free_pages(pool, page);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user