Merge "ion: add additional debug info in dmabuf exp_info" (d1c6045b) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/staging/android/ion/ion.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -505,6 +505,7 @@ static void ion_dma_buf_release(struct dma_buf *dmabuf)
		struct ion_buffer *buffer = dmabuf->priv;

		_ion_buffer_destroy(buffer);
		kfree(dmabuf->exp_name);
		}

		static void ion_dma_buf_kmap(struct dma_buf dmabuf, unsigned long offset)
		@@ -1047,6 +1048,7 @@ struct dma_buf *ion_alloc_dmabuf(size_t len, unsigned int heap_id_mask,
		struct ion_heap *heap;
		DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
		struct dma_buf *dmabuf;
		char task_comm[TASK_COMM_LEN];

		pr_debug("%s: len %zu heap_id_mask %u flags %x\n", __func__,
		len, heap_id_mask, flags);
		@@ -1078,14 +1080,20 @@ struct dma_buf *ion_alloc_dmabuf(size_t len, unsigned int heap_id_mask,
		if (IS_ERR(buffer))
		return ERR_CAST(buffer);

		get_task_comm(task_comm, current->group_leader);

		exp_info.ops = &dma_buf_ops;
		exp_info.size = buffer->size;
		exp_info.flags = O_RDWR;
		exp_info.priv = buffer;
		exp_info.exp_name = kasprintf(GFP_KERNEL, "%s-%s-%d-%s", KBUILD_MODNAME,
		heap->name, current->tgid, task_comm);

		dmabuf = dma_buf_export(&exp_info);
		if (IS_ERR(dmabuf))
		if (IS_ERR(dmabuf)) {
		_ion_buffer_destroy(buffer);
		kfree(dmabuf->exp_name);
		}

		return dmabuf;
		}