evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ion: Switch to new shrinker interface

Browse source 
The shrinker interface has now changed with separate count and scan
functions. Update this for the secure CMA shrinker.

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
This commit is contained in:
Laura Abbott 2014-08-07 15:14:22 -07:00 • committed by David Keitel
parent 44e7c99081
commit a9b26544ee
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/android/ion/ion_cma_secure_heap.c
View file

@ -371,16 +371,13 @@ int ion_secure_cma_drain_pool(struct ion_heap *heap, void *unused)
return 0; return 0;
} }
static int ion_secure_cma_shrinker(struct shrinker *shrinker, static unsigned long ion_secure_cma_shrinker(struct shrinker *shrinker,
struct shrink_control *sc) struct shrink_control *sc)
{ {
struct ion_cma_secure_heap *sheap = container_of(shrinker, struct ion_cma_secure_heap *sheap = container_of(shrinker,
struct ion_cma_secure_heap, shrinker); struct ion_cma_secure_heap, shrinker);
int nr_to_scan = sc->nr_to_scan; int nr_to_scan = sc->nr_to_scan;
if (nr_to_scan == 0)
return atomic_read(&sheap->total_pool_size);
/* /*
* Allocation path may invoke the shrinker. Proceeding any further * Allocation path may invoke the shrinker. Proceeding any further
* would cause a deadlock in several places so don't shrink if that * would cause a deadlock in several places so don't shrink if that
@ -396,6 +393,14 @@ static int ion_secure_cma_shrinker(struct shrinker *shrinker,
return atomic_read(&sheap->total_pool_size); return atomic_read(&sheap->total_pool_size);
} }
static unsigned long ion_secure_cma_shrinker_count(struct shrinker *shrinker,
struct shrink_control *sc)
{
struct ion_cma_secure_heap *sheap = container_of(shrinker,
struct ion_cma_secure_heap, shrinker);
return atomic_read(&sheap->total_pool_size);
}
static void ion_secure_cma_free_from_pool(struct ion_cma_secure_heap *sheap, static void ion_secure_cma_free_from_pool(struct ion_cma_secure_heap *sheap,
dma_addr_t handle, dma_addr_t handle,
unsigned long len) unsigned long len)
@ -692,7 +697,8 @@ struct ion_heap *ion_secure_cma_heap_create(struct ion_platform_heap *data)
INIT_WORK(&sheap->work, ion_secure_pool_pages); INIT_WORK(&sheap->work, ion_secure_pool_pages);
sheap->shrinker.seeks = DEFAULT_SEEKS; sheap->shrinker.seeks = DEFAULT_SEEKS;
sheap->shrinker.batch = 0; sheap->shrinker.batch = 0;
/* sheap->shrinker.shrink = ion_secure_cma_shrinker; */ sheap->shrinker.scan_objects = ion_secure_cma_shrinker;
sheap->shrinker.count_objects = ion_secure_cma_shrinker_count;
sheap->default_prefetch_size = sheap->heap_size; sheap->default_prefetch_size = sheap->heap_size;
register_shrinker(&sheap->shrinker); register_shrinker(&sheap->shrinker);