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

Commit a0232647 authored by Santhosh Punugu's avatar Santhosh Punugu
Browse files

msm: kgsl: add egl_surface/egl_image usage count in debugfs 



Add more information to the debugfs kgsl/proc/<pid>/mem which
will allow memtrack to correctly assign allocated ion buffer
memory to a process. The additional columns show the number of
kgsl_mem_entries which have a usage of egl_image (or) egl_surface.

When attaching a dma_buf to kgsl, use the dma_buf_attachment's
(void*)priv to point back to the kgsl_mem_entry. This makes it
possible to iterate through all attachments on a dma_buf and
gather statistics from each kgsl_mem_entry associated with the
dma_buf.

CRs-Fixed: 1073673
Change-Id: I1ef3bd0da3f74fa41074021699b2226c48bde9c3
Signed-off-by: default avatarSanthosh Punugu <spunug@codeaurora.org>
parent f709a7bf

drivers/gpu/msm/kgsl.c

+41 −0
Original line number Diff line number Diff line
@@ -2434,6 +2434,8 @@ static int kgsl_setup_dma_buf(struct kgsl_device *device, 
	meta->dmabuf = dmabuf;

	meta->attach = attach;



	attach->priv = entry;



	entry->priv_data = meta;

	entry->memdesc.pagetable = pagetable;

	entry->memdesc.size = 0;
@@ -2484,6 +2486,45 @@ out: 
}

#endif



#ifdef CONFIG_DMA_SHARED_BUFFER

void kgsl_get_egl_counts(struct kgsl_mem_entry *entry,

		int *egl_surface_count, int *egl_image_count)

{

	struct kgsl_dma_buf_meta *meta = entry->priv_data;

	struct dma_buf *dmabuf = meta->dmabuf;

	struct dma_buf_attachment *mem_entry_buf_attachment = meta->attach;

	struct device *buf_attachment_dev = mem_entry_buf_attachment->dev;

	struct dma_buf_attachment *attachment = NULL;



	mutex_lock(&dmabuf->lock);

	list_for_each_entry(attachment, &dmabuf->attachments, node) {

		struct kgsl_mem_entry *scan_mem_entry = NULL;



		if (attachment->dev != buf_attachment_dev)

			continue;



		scan_mem_entry = attachment->priv;

		if (!scan_mem_entry)

			continue;



		switch (kgsl_memdesc_get_memtype(&scan_mem_entry->memdesc)) {

		case KGSL_MEMTYPE_EGL_SURFACE:

			(*egl_surface_count)++;

			break;

		case KGSL_MEMTYPE_EGL_IMAGE:

			(*egl_image_count)++;

			break;

		}

	}

	mutex_unlock(&dmabuf->lock);

}

#else

void kgsl_get_egl_counts(struct kgsl_mem_entry *entry,

		int *egl_surface_count, int *egl_image_count)

{

}

#endif



long kgsl_ioctl_map_user_mem(struct kgsl_device_private *dev_priv,

				     unsigned int cmd, void *data)

{

drivers/gpu/msm/kgsl.h

+3 −0
Original line number Diff line number Diff line
@@ -379,6 +379,9 @@ long kgsl_ioctl_gpuobj_set_info(struct kgsl_device_private *dev_priv, 


void kgsl_mem_entry_destroy(struct kref *kref);



void kgsl_get_egl_counts(struct kgsl_mem_entry *entry,

			int *egl_surface_count, int *egl_image_count);



struct kgsl_mem_entry * __must_check

kgsl_sharedmem_find(struct kgsl_process_private *private, uint64_t gpuaddr);

drivers/gpu/msm/kgsl_debugfs.c

+13 −6
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ static int print_mem_entry(void *data, void *ptr) 
	char flags[9];

	char usage[16];

	struct kgsl_memdesc *m = &entry->memdesc;

	unsigned int usermem_type = kgsl_memdesc_usermem_type(m);

	int egl_surface_count = 0, egl_image_count = 0;



	flags[0] = kgsl_memdesc_is_global(m) ?  'g' : '-';

	flags[1] = '-';
@@ -145,12 +147,17 @@ static int print_mem_entry(void *data, void *ptr) 


	kgsl_get_memory_usage(usage, sizeof(usage), m->flags);



	seq_printf(s, "%pK %pK %16llu %5d %9s %10s %16s %5d %16llu",

	if (usermem_type == KGSL_MEM_ENTRY_ION)

		kgsl_get_egl_counts(entry, &egl_surface_count,

						&egl_image_count);



	seq_printf(s, "%pK %pK %16llu %5d %9s %10s %16s %5d %16llu %6d %6d",

			(uint64_t *)(uintptr_t) m->gpuaddr,

			(unsigned long *) m->useraddr,

			m->size, entry->id, flags,

			memtype_str(kgsl_memdesc_usermem_type(m)),

			usage, (m->sgt ? m->sgt->nents : 0), m->mapsize);

			memtype_str(usermem_type),

			usage, (m->sgt ? m->sgt->nents : 0), m->mapsize,

			egl_surface_count, egl_image_count);



	if (entry->metadata[0] != 0)

		seq_printf(s, " %s", entry->metadata);
@@ -217,9 +224,9 @@ static void *process_mem_seq_next(struct seq_file *s, void *ptr, 
static int process_mem_seq_show(struct seq_file *s, void *ptr)

{

	if (ptr == SEQ_START_TOKEN) {

		seq_printf(s, "%16s %16s %16s %5s %9s %10s %16s %5s %16s\n",

				"gpuaddr", "useraddr", "size", "id", "flags",

				"type", "usage", "sglen", "mapsize");

		seq_printf(s, "%16s %16s %16s %5s %9s %10s %16s %5s %16s %6s %6s\n",

			"gpuaddr", "useraddr", "size", "id", "flags", "type",

			"usage", "sglen", "mapsize", "eglsrf", "eglimg");

		return 0;

	} else

		return print_mem_entry(s, ptr);