Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 829d8c9e authored by Gioh Kim's avatar Gioh Kim Committed by Daniel Rosenberg
Browse files

staging: ion: debugfs to shrink pool 



This patch enables debugfs file /sys/kernel/debug/ion/heaps/system_shrink
to shrink pool and get pool size. This technically enables debugfs
shrinking for all heaps, not just the system heap although the system heap
is the only one with a shrinker right now. It is already implemented
but not complete. This patch completes and enables it.

Reading the file returns pool size
in page unit and writing the number of pages shrinks pool.
It flushes all pages to write zero at the file.

Signed-off-by: default avatarGioh Kim <gioh.kim@lge.com>
Reviewed-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit aeb7fa7b4f29ce4d7d16c4c3565c4714f2f62b82)
parent 42f3ea19

drivers/staging/android/ion/ion.c

+9 −13
Original line number Diff line number Diff line
@@ -1463,7 +1463,6 @@ static const struct file_operations debug_heap_fops = { 
	.release = single_release,

};



#ifdef DEBUG_HEAP_SHRINKER

static int debug_shrink_set(void *data, u64 val)

{

	struct ion_heap *heap = data;
@@ -1471,15 +1470,14 @@ static int debug_shrink_set(void *data, u64 val) 
	int objs;



	sc.gfp_mask = -1;

	sc.nr_to_scan = 0;



	if (!val)

		return 0;

	sc.nr_to_scan = val;



	objs = heap->shrinker.shrink(&heap->shrinker, &sc);

	if (!val) {

		objs = heap->shrinker.count_objects(&heap->shrinker, &sc);

		sc.nr_to_scan = objs;

	}



	heap->shrinker.shrink(&heap->shrinker, &sc);

	heap->shrinker.scan_objects(&heap->shrinker, &sc);

	return 0;

}
@@ -1492,14 +1490,13 @@ static int debug_shrink_get(void *data, u64 *val) 
	sc.gfp_mask = -1;

	sc.nr_to_scan = 0;



	objs = heap->shrinker.shrink(&heap->shrinker, &sc);

	objs = heap->shrinker.count_objects(&heap->shrinker, &sc);

	*val = objs;

	return 0;

}



DEFINE_SIMPLE_ATTRIBUTE(debug_shrink_fops, debug_shrink_get,

			debug_shrink_set, "%llu\n");

#endif



void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap)

{
@@ -1534,8 +1531,7 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap) 
			path, heap->name);

	}



#ifdef DEBUG_HEAP_SHRINKER

	if (heap->shrinker.shrink) {

	if (heap->shrinker.count_objects && heap->shrinker.scan_objects) {

		char debug_name[64];



		snprintf(debug_name, 64, "%s_shrink", heap->name);
@@ -1550,7 +1546,7 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap) 
				path, debug_name);

		}

	}

#endif



	up_write(&dev->lock);

}