This patch creates debugfs files, /sys/kernel/debug/ion/heaps/system_shrink,
to shrink pool or get pool size.
Reading the file returns pool size and writing occurs to shrink pool.

Signed-off-by: Gioh Kim <gioh....@lge.com>
---
 drivers/staging/android/ion/ion.c |   31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c 
b/drivers/staging/android/ion/ion.c
index 290d4d2..ecc1121 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1463,43 +1463,29 @@ 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;
-       struct shrink_control sc;
        int objs;
 
-       sc.gfp_mask = -1;
-       sc.nr_to_scan = 0;
-
-       if (!val)
-               return 0;
-
-       objs = heap->shrinker.shrink(&heap->shrinker, &sc);
-       sc.nr_to_scan = objs;
+       if (val)
+               objs = val;
+       else
+               objs = heap->ops->shrink(heap, __GFP_HIGHMEM, 0);
 
-       heap->shrinker.shrink(&heap->shrinker, &sc);
+       (void)heap->ops->shrink(heap, __GFP_HIGHMEM, objs);
        return 0;
 }
 
 static int debug_shrink_get(void *data, u64 *val)
 {
        struct ion_heap *heap = data;
-       struct shrink_control sc;
-       int objs;
-
-       sc.gfp_mask = -1;
-       sc.nr_to_scan = 0;
-
-       objs = heap->shrinker.shrink(&heap->shrinker, &sc);
-       *val = objs;
+       *val = heap->ops->shrink(heap, __GFP_HIGHMEM, 0);
        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 +1520,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->ops->shrink) {
                char debug_name[64];
 
                snprintf(debug_name, 64, "%s_shrink", heap->name);
@@ -1550,7 +1535,7 @@ void ion_device_add_heap(struct ion_device *dev, struct 
ion_heap *heap)
                                path, debug_name);
                }
        }
-#endif
+
        up_write(&dev->lock);
 }
 
-- 
1.7.9.5

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to