From: Laura Abbott <labbott@redhat.com>
To: Sumit Semwal <sumit.semwal@linaro.org>,
Riley Andrews <riandrews@android.com>,
arve@android.com
Cc: Laura Abbott <labbott@redhat.com>,
romlem@google.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
Brian Starkey <brian.starkey@arm.com>,
Daniel Vetter <daniel.vetter@intel.com>,
Mark Brown <broonie@kernel.org>,
Benjamin Gaignard <benjamin.gaignard@linaro.org>,
linux-mm@kvack.org
Subject: [RFC PATCH 04/12] staging: android: ion: Call dma_map_sg for syncing and mapping
Date: Thu, 2 Mar 2017 13:44:36 -0800 [thread overview]
Message-ID: <1488491084-17252-5-git-send-email-labbott@redhat.com> (raw)
In-Reply-To: <1488491084-17252-1-git-send-email-labbott@redhat.com>
Technically, calling dma_buf_map_attachment should return a buffer
properly dma_mapped. Add calls to dma_map_sg to begin_cpu_access to
ensure this happens. As a side effect, this lets Ion buffers take
advantage of the dma_buf sync ioctls.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
drivers/staging/android/ion/ion.c | 101 +++++++++++++++++++-------------------
1 file changed, 50 insertions(+), 51 deletions(-)
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index ce4adac..a931b30 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -795,10 +795,6 @@ void ion_client_destroy(struct ion_client *client)
}
EXPORT_SYMBOL(ion_client_destroy);
-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;
@@ -825,22 +821,43 @@ static struct sg_table *dup_sg_table(struct sg_table *table)
return new_table;
}
+static void free_duped_table(struct sg_table *table)
+{
+ sg_free_table(table);
+ kfree(table);
+}
+
static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment,
enum dma_data_direction direction)
{
struct dma_buf *dmabuf = attachment->dmabuf;
struct ion_buffer *buffer = dmabuf->priv;
+ struct sg_table *table;
+ int ret;
+
+ /*
+ * TODO: Need to sync wrt CPU or device completely owning?
+ */
+
+ table = dup_sg_table(buffer->sg_table);
- ion_buffer_sync_for_device(buffer, attachment->dev, direction);
- return dup_sg_table(buffer->sg_table);
+ if (!dma_map_sg(attachment->dev, table->sgl, table->nents,
+ direction)){
+ ret = -ENOMEM;
+ goto err;
+ }
+
+err:
+ free_duped_table(table);
+ return ERR_PTR(ret);
}
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);
+ dma_unmap_sg(attachment->dev, table->sgl, table->nents, direction);
+ free_duped_table(table);
}
void ion_pages_sync_for_device(struct device *dev, struct page *page,
@@ -864,38 +881,6 @@ struct ion_vma_list {
struct vm_area_struct *vma;
};
-static void ion_buffer_sync_for_device(struct ion_buffer *buffer,
- struct device *dev,
- enum dma_data_direction dir)
-{
- struct ion_vma_list *vma_list;
- int pages = PAGE_ALIGN(buffer->size) / PAGE_SIZE;
- int i;
-
- pr_debug("%s: syncing for device %s\n", __func__,
- dev ? dev_name(dev) : "null");
-
- if (!ion_buffer_fault_user_mappings(buffer))
- return;
-
- mutex_lock(&buffer->lock);
- for (i = 0; i < pages; i++) {
- struct page *page = buffer->pages[i];
-
- if (ion_buffer_page_is_dirty(page))
- ion_pages_sync_for_device(dev, ion_buffer_page(page),
- PAGE_SIZE, dir);
-
- ion_buffer_page_clean(buffer->pages + i);
- }
- list_for_each_entry(vma_list, &buffer->vmas, list) {
- struct vm_area_struct *vma = vma_list->vma;
-
- zap_page_range(vma, vma->vm_start, vma->vm_end - vma->vm_start);
- }
- mutex_unlock(&buffer->lock);
-}
-
static int ion_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
struct ion_buffer *buffer = vma->vm_private_data;
@@ -1014,16 +999,24 @@ static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
struct ion_buffer *buffer = dmabuf->priv;
void *vaddr;
- if (!buffer->heap->ops->map_kernel) {
- pr_err("%s: map kernel is not implemented by this heap.\n",
- __func__);
- return -ENODEV;
+ /*
+ * TODO: Move this elsewhere because we don't always need a vaddr
+ */
+ if (buffer->heap->ops->map_kernel) {
+ mutex_lock(&buffer->lock);
+ vaddr = ion_buffer_kmap_get(buffer);
+ mutex_unlock(&buffer->lock);
}
- mutex_lock(&buffer->lock);
- vaddr = ion_buffer_kmap_get(buffer);
- mutex_unlock(&buffer->lock);
- return PTR_ERR_OR_ZERO(vaddr);
+ /*
+ * Close enough right now? Flag to skip sync?
+ */
+ if (!dma_map_sg(buffer->dev->dev.this_device, buffer->sg_table->sgl,
+ buffer->sg_table->nents,
+ DMA_BIDIRECTIONAL))
+ return -ENOMEM;
+
+ return 0;
}
static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
@@ -1031,9 +1024,15 @@ static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
{
struct ion_buffer *buffer = dmabuf->priv;
- mutex_lock(&buffer->lock);
- ion_buffer_kmap_put(buffer);
- mutex_unlock(&buffer->lock);
+ if (buffer->heap->ops->map_kernel) {
+ mutex_lock(&buffer->lock);
+ ion_buffer_kmap_put(buffer);
+ mutex_unlock(&buffer->lock);
+ }
+
+ dma_unmap_sg(buffer->dev->dev.this_device, buffer->sg_table->sgl,
+ buffer->sg_table->nents,
+ DMA_BIDIRECTIONAL);
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2017-03-02 21:47 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-02 21:44 [RFC PATCH 00/12] Ion cleanup in preparation for moving out of staging Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 01/12] staging: android: ion: Remove dmap_cnt Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 02/12] staging: android: ion: Remove alignment from allocation field Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 03/12] staging: android: ion: Duplicate sg_table Laura Abbott
2017-03-03 8:18 ` Hillf Danton
2017-03-03 18:41 ` Laura Abbott
2017-03-02 21:44 ` Laura Abbott [this message]
2017-03-03 11:04 ` [RFC PATCH 04/12] staging: android: ion: Call dma_map_sg for syncing and mapping Dan Carpenter
2017-03-03 11:58 ` Eric Engestrom
2017-03-03 16:37 ` Laurent Pinchart
2017-03-03 18:40 ` Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 05/12] staging: android: ion: Remove page faulting support Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 06/12] staging: android: ion: Remove crufty cache support Laura Abbott
2017-03-03 9:56 ` Daniel Vetter
2017-03-03 16:39 ` Laurent Pinchart
2017-03-03 18:46 ` Laura Abbott
2017-03-06 10:29 ` Daniel Vetter
2017-03-06 17:00 ` Emil Velikov
2017-03-06 19:20 ` Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 07/12] staging: android: ion: Remove old platform support Laura Abbott
2017-03-03 10:31 ` Daniel Vetter
2017-03-02 21:44 ` [RFC PATCH 08/12] cma: Store a name in the cma structure Laura Abbott
2017-03-10 8:53 ` Sumit Semwal
2017-03-17 18:02 ` Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 09/12] cma: Introduce cma_for_each_area Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 10/12] staging: android: ion: Use CMA APIs directly Laura Abbott
2017-03-03 16:41 ` Laurent Pinchart
2017-03-03 18:50 ` Laura Abbott
2017-03-06 10:32 ` Daniel Vetter
2017-03-06 13:43 ` Laurent Pinchart
2017-03-06 15:52 ` Daniel Vetter
2017-03-06 19:14 ` Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 11/12] staging: android: ion: Make Ion heaps selectable Laura Abbott
2017-03-03 10:33 ` Daniel Vetter
2017-03-03 19:10 ` Laura Abbott
2017-03-02 21:44 ` [RFC PATCH 12/12] staging; android: ion: Enumerate all available heaps Laura Abbott
2017-03-03 10:39 ` Daniel Vetter
2017-03-03 10:04 ` [RFC PATCH 00/12] Ion cleanup in preparation for moving out of staging Daniel Vetter
2017-03-03 10:27 ` Daniel Vetter
2017-03-03 12:54 ` Benjamin Gaignard
2017-03-03 16:45 ` Laurent Pinchart
2017-03-03 19:16 ` Laura Abbott
2017-03-06 10:38 ` Daniel Vetter
2017-03-06 15:02 ` Laurent Pinchart
2017-03-06 16:01 ` Daniel Vetter
2017-03-03 13:29 ` Michal Hocko
2017-03-03 17:37 ` Laura Abbott
2017-03-06 7:42 ` Michal Hocko
2017-03-06 10:40 ` Daniel Vetter
2017-03-06 10:58 ` Mark Brown
2017-03-06 16:04 ` Daniel Vetter
2017-03-09 10:00 ` Benjamin Gaignard
2017-03-09 17:38 ` Laura Abbott
2017-03-10 10:31 ` Brian Starkey
2017-03-10 11:46 ` Robin Murphy
2017-03-10 14:27 ` Brian Starkey
2017-03-10 16:46 ` Laura Abbott
2017-03-10 12:40 ` Daniel Vetter
2017-03-10 13:56 ` Rob Clark
2017-03-12 13:34 ` Benjamin Gaignard
2017-03-12 19:05 ` Daniel Vetter
2017-03-13 21:09 ` Laura Abbott
2017-03-13 21:29 ` Rob Clark
2017-03-13 21:59 ` Laura Abbott
2017-03-14 14:47 ` Benjamin Gaignard
2017-03-14 19:45 ` Laura Abbott
2017-03-14 20:28 ` Nicolas Dufresne
2017-03-13 10:54 ` Brian Starkey
2017-03-13 13:21 ` Mark Brown
2017-03-13 21:45 ` Laura Abbott
2017-03-13 21:29 ` Laura Abbott
2017-03-06 13:34 ` Michal Hocko
2017-03-03 16:25 ` Laurent Pinchart
2017-03-03 19:14 ` Laura Abbott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488491084-17252-5-git-send-email-labbott@redhat.com \
--to=labbott@redhat.com \
--cc=arve@android.com \
--cc=benjamin.gaignard@linaro.org \
--cc=brian.starkey@arm.com \
--cc=broonie@kernel.org \
--cc=daniel.vetter@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=riandrews@android.com \
--cc=romlem@google.com \
--cc=sumit.semwal@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).