[PATCH 2/2] staging: android: ion: Add pss info for each ion_client

[PATCH 2/2] staging: android: ion: Add pss info for each ion_client

[Feng Tang]

In real ION buffer usage, many of the ion buffer are shared
by several clients(imported and exported), and current ion
debugfs only provides size of all buffers a client may use.
This patch will considers the sharing and adds a "pss" info
for each ion_client, which will help on profiling the ion
memory usage.

Actually we can do more aggressively in android world, in
which the "surfaceflinger" is a main proxy to help other
apps to do the ion buffer allocation, and we can consider
this and extract "surfaceflinger" related size out. And
this could be the next step.

Signed-off-by: Feng Tang <feng.tang@intel.com>
---
 drivers/staging/android/ion/ion.c |   25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 3d378ef..0b8fd56 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1386,18 +1386,25 @@ static const struct file_operations ion_fops = {
 };
 
 static size_t ion_debug_heap_total(struct ion_client *client,
-				   unsigned int id)
+				   unsigned int id, size_t *psize)
 {
 	size_t size = 0;
 	struct rb_node *n;
 
+	*psize = 0;
+
 	mutex_lock(&client->lock);
 	for (n = rb_first(&client->handles); n; n = rb_next(n)) {
 		struct ion_handle *handle = rb_entry(n,
 						     struct ion_handle,
 						     node);
-		if (handle->buffer->heap->id == id)
+		if (handle->buffer->heap->id == id) {
 			size += handle->buffer->size;
+			if (handle->buffer->handle_count)
+				*psize += handle->buffer->size /
+					handle->buffer->handle_count;
+		}
+
 	}
 	mutex_unlock(&client->lock);
 	return size;
@@ -1411,13 +1418,15 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
 	size_t total_size = 0;
 	size_t total_orphaned_size = 0;
 
-	seq_printf(s, "%16.s %16.s %16.s\n", "client", "pid", "size");
+	seq_printf(s, "%16.s %16.s %16.s %16.s\n",
+			"client", "pid", "size", "psize");
 	seq_puts(s, "----------------------------------------------------\n");
 
 	for (n = rb_first(&dev->clients); n; n = rb_next(n)) {
 		struct ion_client *client = rb_entry(n, struct ion_client,
 						     node);
-		size_t size = ion_debug_heap_total(client, heap->id);
+		size_t psize;
+		size_t size = ion_debug_heap_total(client, heap->id, &psize);
 
 		if (!size)
 			continue;
@@ -1425,11 +1434,11 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
 			char task_comm[TASK_COMM_LEN];
 
 			get_task_comm(task_comm, client->task);
-			seq_printf(s, "%16.s %16u %16zu\n", task_comm,
-				   client->pid, size);
+			seq_printf(s, "%16.s %16u %16zu %16zu\n", task_comm,
+				   client->pid, size, psize);
 		} else {
-			seq_printf(s, "%16.s %16u %16zu\n", client->name,
-				   client->pid, size);
+			seq_printf(s, "%16.s %16u %16zu %16zu\n", client->name,
+				   client->pid, size, psize);
 		}
 	}
 	seq_puts(s, "----------------------------------------------------\n");
-- 
1.7.9.5

Re: [PATCH 2/2] staging: android: ion: Add pss info for each ion_client

[Greg KH]

On Mon, Jan 19, 2015 at 10:00:25AM +0800, Feng Tang wrote:
> In real ION buffer usage, many of the ion buffer are shared
> by several clients(imported and exported), and current ion
> debugfs only provides size of all buffers a client may use.
> This patch will considers the sharing and adds a "pss" info
> for each ion_client, which will help on profiling the ion
> memory usage.
> 
> Actually we can do more aggressively in android world, in
> which the "surfaceflinger" is a main proxy to help other
> apps to do the ion buffer allocation, and we can consider
> this and extract "surfaceflinger" related size out. And
> this could be the next step.
> 
> Signed-off-by: Feng Tang <feng.tang@intel.com>
> ---
>  drivers/staging/android/ion/ion.c |   25 +++++++++++++++++--------
>  1 file changed, 17 insertions(+), 8 deletions(-)

I really need others to review and test this with their systems before I
can accept it.  So I'll have to wait for an ack from John or Colin or
someone else...

thanks,

greg k-h

[PATCH 1/2] staging: andriod: ion: Add ion_phys_get_by_id function

[Feng Tang]

There is user case that user only knows the ion_handle idand
needs to get the physical addr and len. So add this wrapper to
meet this requirement.

Signed-off-by: Feng Tang <feng.tang@intel.com>
---
 drivers/staging/android/ion/ion.c |   16 ++++++++++++++++
 drivers/staging/android/ion/ion.h |   14 ++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 296d347..3d378ef 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -577,6 +577,22 @@ int ion_phys(struct ion_client *client, struct ion_handle *handle,
 }
 EXPORT_SYMBOL(ion_phys);
 
+int ion_phys_get_by_id(struct ion_client *client, int id,
+	     ion_phys_addr_t *addr, size_t *len)
+{
+	struct ion_handle *handle;
+	int ret;
+
+	handle = ion_handle_get_by_id(client, id);
+	if (!handle)
+		return -EINVAL;
+
+	ret = ion_phys(client, handle, addr, len);
+	ion_handle_put(handle);
+	return ret;
+}
+EXPORT_SYMBOL(ion_phys_get_by_id);
+
 static void *ion_buffer_kmap_get(struct ion_buffer *buffer)
 {
 	void *vaddr;
diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h
index 443db84..9ef0f18 100644
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -147,6 +147,20 @@ int ion_phys(struct ion_client *client, struct ion_handle *handle,
 	     ion_phys_addr_t *addr, size_t *len);
 
 /**
+ * ion_phys_get_by_id - returns the physical address and len of a handle
+ * @client:	the client
+ * @id:		id bound to ion_handle, which may be passed to user space
+ * @addr:	a pointer to put the address in
+ * @len:	a pointer to put the length in
+ *
+ * This function will first get ion_handle from the id, and then
+ * use upper ion_phys() to get the physical and len.
+ */
+
+int ion_phys_get_by_id(struct ion_client *client, int id,
+	     ion_phys_addr_t *addr, size_t *len);
+
+/**
  * ion_map_dma - return an sg_table describing a handle
  * @client:	the client
  * @handle:	the handle
-- 
1.7.9.5

[PATCH 2/2] staging: android: ion: Add pss info for each ion_client

[Feng Tang]

In real ION buffer usage, many of the ion buffer are shared
by several clients(imported and exported), and current ion
debugfs only provides size of all buffers a client may use.
This patch will considers the sharing and adds a "pss" info
for each ion_client, which will help on profiling the ion
memory usage.

Actually we can do more aggressively in android world, in
which the "surfaceflinger" is a main proxy to help other
apps to do the ion buffer allocation, and we can consider
this and extract "surfaceflinger" related size out. And
this could be the next step.

Signed-off-by: Feng Tang <feng.tang@intel.com>
---
 drivers/staging/android/ion/ion.c |   25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 3d378ef..0b8fd56 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1386,18 +1386,25 @@ static const struct file_operations ion_fops = {
 };
 
 static size_t ion_debug_heap_total(struct ion_client *client,
-				   unsigned int id)
+				   unsigned int id, size_t *psize)
 {
 	size_t size = 0;
 	struct rb_node *n;
 
+	*psize = 0;
+
 	mutex_lock(&client->lock);
 	for (n = rb_first(&client->handles); n; n = rb_next(n)) {
 		struct ion_handle *handle = rb_entry(n,
 						     struct ion_handle,
 						     node);
-		if (handle->buffer->heap->id == id)
+		if (handle->buffer->heap->id == id) {
 			size += handle->buffer->size;
+			if (handle->buffer->handle_count)
+				*psize += handle->buffer->size /
+					handle->buffer->handle_count;
+		}
+
 	}
 	mutex_unlock(&client->lock);
 	return size;
@@ -1411,13 +1418,15 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
 	size_t total_size = 0;
 	size_t total_orphaned_size = 0;
 
-	seq_printf(s, "%16.s %16.s %16.s\n", "client", "pid", "size");
+	seq_printf(s, "%16.s %16.s %16.s %16.s\n",
+			"client", "pid", "size", "psize");
 	seq_puts(s, "----------------------------------------------------\n");
 
 	for (n = rb_first(&dev->clients); n; n = rb_next(n)) {
 		struct ion_client *client = rb_entry(n, struct ion_client,
 						     node);
-		size_t size = ion_debug_heap_total(client, heap->id);
+		size_t psize;
+		size_t size = ion_debug_heap_total(client, heap->id, &psize);
 
 		if (!size)
 			continue;
@@ -1425,11 +1434,11 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
 			char task_comm[TASK_COMM_LEN];
 
 			get_task_comm(task_comm, client->task);
-			seq_printf(s, "%16.s %16u %16zu\n", task_comm,
-				   client->pid, size);
+			seq_printf(s, "%16.s %16u %16zu %16zu\n", task_comm,
+				   client->pid, size, psize);
 		} else {
-			seq_printf(s, "%16.s %16u %16zu\n", client->name,
-				   client->pid, size);
+			seq_printf(s, "%16.s %16u %16zu %16zu\n", client->name,
+				   client->pid, size, psize);
 		}
 	}
 	seq_puts(s, "----------------------------------------------------\n");
-- 
1.7.9.5