On 09/04/2018 09:23 PM, Laura Abbott wrote:
> On 08/26/2018 01:08 PM, Alexey Skidanov wrote:
>> ION had supported heap debug info under
>> /sys/kernel/debug/ion/<heap_name>.
>> This support have been removed but some leftovers (dead code) still
>> exist.
>>
>> This patch removes the existing dead code.
>>
>
> This was actually an unintended side effect. The goal was to rip out
> the racy handle/buffer mess and the associated debugfs there. I do
> think the extra heap_show for system heap is useful but I'd rather
> see it reimplemented with a full debugfs vs. trying to just tack it
> on.
>
I would start with some basic, per heap, statistics - # of buffers,
total allocated space, etc ...
> I'd like to see the exact commit where this was orphaned (15c6098cfec5
> ("staging: android: ion: Remove ion_handle and ion_client")) specified
> somewhere in the commit text so if you add that, you can add
Yes, sure, I will add it
>
> Acked-by: Laura Abbott <labbott@xxxxxxxxxx>
>
>> Signed-off-by: Alexey Skidanov <alexey.skidanov@xxxxxxxxx>
>> ---
>> drivers/staging/android/ion/ion.h | 5 -----
>> drivers/staging/android/ion/ion_system_heap.c | 24
>> ------------------------
>> 2 files changed, 29 deletions(-)
>>
>> diff --git a/drivers/staging/android/ion/ion.h
>> b/drivers/staging/android/ion/ion.h
>> index 876197b..0afa9cd 100644
>> --- a/drivers/staging/android/ion/ion.h
>> +++ b/drivers/staging/android/ion/ion.h
>> @@ -158,8 +158,6 @@ struct ion_heap_ops {
>> * @lock: protects the free list
>> * @waitqueue: queue to wait on from deferred free thread
>> * @task: task struct of deferred free thread
>> - * @debug_show: called when heap debug file is read to add any
>> - * heap specific debug info to output
>> *
>> * Represents a pool of memory from which buffers can be made. In some
>> * systems the only heap is regular system memory allocated via
>> vmalloc.
>> @@ -180,9 +178,6 @@ struct ion_heap {
>> spinlock_t free_lock;
>> wait_queue_head_t waitqueue;
>> struct task_struct *task;
>> -
>> - int (*debug_show)(struct ion_heap *heap, struct seq_file *s,
>> - void *unused);
>> };
>> /**
>> diff --git a/drivers/staging/android/ion/ion_system_heap.c
>> b/drivers/staging/android/ion/ion_system_heap.c
>> index b5c3195..d0d0490 100644
>> --- a/drivers/staging/android/ion/ion_system_heap.c
>> +++ b/drivers/staging/android/ion/ion_system_heap.c
>> @@ -213,29 +213,6 @@ static struct ion_heap_ops system_heap_ops = {
>> .shrink = ion_system_heap_shrink,
>> };
>> -static int ion_system_heap_debug_show(struct ion_heap *heap, struct
>> seq_file *s,
>> - void *unused)
>> -{
>> - struct ion_system_heap *sys_heap = container_of(heap,
>> - struct ion_system_heap,
>> - heap);
>> - int i;
>> - struct ion_page_pool *pool;
>> -
>> - for (i = 0; i < NUM_ORDERS; i++) {
>> - pool = sys_heap->pools[i];
>> -
>> - seq_printf(s, "%d order %u highmem pages %lu total\n",
>> - pool->high_count, pool->order,
>> - (PAGE_SIZE << pool->order) * pool->high_count);
>> - seq_printf(s, "%d order %u lowmem pages %lu total\n",
>> - pool->low_count, pool->order,
>> - (PAGE_SIZE << pool->order) * pool->low_count);
>> - }
>> -
>> - return 0;
>> -}
>> -
>> static void ion_system_heap_destroy_pools(struct ion_page_pool **pools)
>> {
>> int i;
>> @@ -282,7 +259,6 @@ static struct ion_heap
>> *__ion_system_heap_create(void)
>> if (ion_system_heap_create_pools(heap->pools))
>> goto free_heap;
>> - heap->heap.debug_show = ion_system_heap_debug_show;
>> return &heap->heap;
>> free_heap:
>>
>
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
