Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1615497

[PATCHv3 05/22] staging: android: ion: Duplicate sg_table

Show all headers | View raw

Ion currently returns a single sg_table on each dma_map call. This is
incorrect for later usage.

Signed-off-by: Laura Abbott <labbott@redhat.com>
---
 drivers/staging/android/ion/ion.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index c2adfe1..7dcb8a9 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -800,6 +800,32 @@ static void ion_buffer_sync_for_device(struct ion_buffer *buffer,
 				       struct device *dev,
 				       enum dma_data_direction direction);
 
+static struct sg_table *dup_sg_table(struct sg_table *table)
+{
+	struct sg_table *new_table;
+	int ret, i;
+	struct scatterlist *sg, *new_sg;
+
+	new_table = kzalloc(sizeof(*new_table), GFP_KERNEL);
+	if (!new_table)
+		return ERR_PTR(-ENOMEM);
+
+	ret = sg_alloc_table(new_table, table->nents, GFP_KERNEL);
+	if (ret) {
+		kfree(new_table);
+		return ERR_PTR(-ENOMEM);
+	}
+
+	new_sg = new_table->sgl;
+	for_each_sg(table->sgl, sg, table->nents, i) {
+		memcpy(new_sg, sg, sizeof(*sg));
+		sg->dma_address = 0;
+		new_sg = sg_next(new_sg);
+	}
+
+	return new_table;
+}
+
 static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment,
 					enum dma_data_direction direction)
 {
@@ -807,13 +833,15 @@ static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment,
 	struct ion_buffer *buffer = dmabuf->priv;
 
 	ion_buffer_sync_for_device(buffer, attachment->dev, direction);
-	return buffer->sg_table;
+	return dup_sg_table(buffer->sg_table);
 }
 
 static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment,
 			      struct sg_table *table,
 			      enum dma_data_direction direction)
 {
+	sg_free_table(table);
+	kfree(table);
 }
 
 void ion_pages_sync_for_device(struct device *dev, struct page *page,
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCHv3 00/22] Ion clean up in preparation in moving out of staging Laura Abbott <labbott@redhat.com> - 2017-04-03 21:00 +0200
  [PATCHv3 15/22] staging: android: ion: Break the ABI in the name of forward progress Laura Abbott <labbott@redhat.com> - 2017-04-03 21:00 +0200
  [PATCHv3 07/22] staging: android: ion: Remove page faulting support Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 19/22] staging: android: ion: Drop ion_map_kernel interface Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 14/22] staging: android: ion: Stop butchering the DMA address Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 18/22] staging: android: ion: Rework heap registration/enumeration Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 06/22] staging: android: ion: Call dma_map_sg for syncing and mapping Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 05/22] staging: android: ion: Duplicate sg_table Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 11/22] staging: android: ion: Remove duplicate ION_IOC_MAP Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 22/22] staging/android: Update Ion TODO list Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 04/22] staging: android: ion: Remove alignment from allocation field Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 21/22] staging: android: ion: Set query return value Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 09/22] staging: android: ion: Remove custom ioctl interface Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  Re: [PATCHv3 00/22] Ion clean up in preparation in moving out of  staging Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-08 12:40 +0200
  Re: [PATCHv3 17/22] staging: android: ion: Collapse internal header files Emil Velikov <emil.l.velikov@gmail.com> - 2017-04-08 20:20 +0200

csiph-web