From: labbott@redhat.com (Laura Abbott)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv3 07/22] staging: android: ion: Remove page faulting support
Date: Mon, 3 Apr 2017 11:57:49 -0700 [thread overview]
Message-ID: <1491245884-15852-8-git-send-email-labbott@redhat.com> (raw)
In-Reply-To: <1491245884-15852-1-git-send-email-labbott@redhat.com>
The new method of syncing with dma_map means that the page faulting sync
implementation is no longer applicable. Remove it.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
drivers/staging/android/ion/ion.c | 117 --------------------------------------
1 file changed, 117 deletions(-)
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 6aac935..226ea1f 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -42,37 +42,11 @@
#include "ion_priv.h"
#include "compat_ion.h"
-bool ion_buffer_fault_user_mappings(struct ion_buffer *buffer)
-{
- return (buffer->flags & ION_FLAG_CACHED) &&
- !(buffer->flags & ION_FLAG_CACHED_NEEDS_SYNC);
-}
-
bool ion_buffer_cached(struct ion_buffer *buffer)
{
return !!(buffer->flags & ION_FLAG_CACHED);
}
-static inline struct page *ion_buffer_page(struct page *page)
-{
- return (struct page *)((unsigned long)page & ~(1UL));
-}
-
-static inline bool ion_buffer_page_is_dirty(struct page *page)
-{
- return !!((unsigned long)page & 1UL);
-}
-
-static inline void ion_buffer_page_dirty(struct page **page)
-{
- *page = (struct page *)((unsigned long)(*page) | 1UL);
-}
-
-static inline void ion_buffer_page_clean(struct page **page)
-{
- *page = (struct page *)((unsigned long)(*page) & ~(1UL));
-}
-
/* this function should only be called while dev->lock is held */
static void ion_buffer_add(struct ion_device *dev,
struct ion_buffer *buffer)
@@ -140,25 +114,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
buffer->dev = dev;
buffer->size = len;
- if (ion_buffer_fault_user_mappings(buffer)) {
- int num_pages = PAGE_ALIGN(buffer->size) / PAGE_SIZE;
- struct scatterlist *sg;
- int i, j, k = 0;
-
- buffer->pages = vmalloc(sizeof(struct page *) * num_pages);
- if (!buffer->pages) {
- ret = -ENOMEM;
- goto err1;
- }
-
- for_each_sg(table->sgl, sg, table->nents, i) {
- struct page *page = sg_page(sg);
-
- for (j = 0; j < sg->length / PAGE_SIZE; j++)
- buffer->pages[k++] = page++;
- }
- }
-
buffer->dev = dev;
buffer->size = len;
INIT_LIST_HEAD(&buffer->vmas);
@@ -924,69 +879,6 @@ void ion_pages_sync_for_device(struct device *dev, struct page *page,
dma_sync_sg_for_device(dev, &sg, 1, dir);
}
-struct ion_vma_list {
- struct list_head list;
- struct vm_area_struct *vma;
-};
-
-static int ion_vm_fault(struct vm_fault *vmf)
-{
- struct ion_buffer *buffer = vmf->vma->vm_private_data;
- unsigned long pfn;
- int ret;
-
- mutex_lock(&buffer->lock);
- ion_buffer_page_dirty(buffer->pages + vmf->pgoff);
- BUG_ON(!buffer->pages || !buffer->pages[vmf->pgoff]);
-
- pfn = page_to_pfn(ion_buffer_page(buffer->pages[vmf->pgoff]));
- ret = vm_insert_pfn(vmf->vma, vmf->address, pfn);
- mutex_unlock(&buffer->lock);
- if (ret)
- return VM_FAULT_ERROR;
-
- return VM_FAULT_NOPAGE;
-}
-
-static void ion_vm_open(struct vm_area_struct *vma)
-{
- struct ion_buffer *buffer = vma->vm_private_data;
- struct ion_vma_list *vma_list;
-
- vma_list = kmalloc(sizeof(*vma_list), GFP_KERNEL);
- if (!vma_list)
- return;
- vma_list->vma = vma;
- mutex_lock(&buffer->lock);
- list_add(&vma_list->list, &buffer->vmas);
- mutex_unlock(&buffer->lock);
- pr_debug("%s: adding %p\n", __func__, vma);
-}
-
-static void ion_vm_close(struct vm_area_struct *vma)
-{
- struct ion_buffer *buffer = vma->vm_private_data;
- struct ion_vma_list *vma_list, *tmp;
-
- pr_debug("%s\n", __func__);
- mutex_lock(&buffer->lock);
- list_for_each_entry_safe(vma_list, tmp, &buffer->vmas, list) {
- if (vma_list->vma != vma)
- continue;
- list_del(&vma_list->list);
- kfree(vma_list);
- pr_debug("%s: deleting %p\n", __func__, vma);
- break;
- }
- mutex_unlock(&buffer->lock);
-}
-
-static const struct vm_operations_struct ion_vma_ops = {
- .open = ion_vm_open,
- .close = ion_vm_close,
- .fault = ion_vm_fault,
-};
-
static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
{
struct ion_buffer *buffer = dmabuf->priv;
@@ -998,15 +890,6 @@ static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
return -EINVAL;
}
- if (ion_buffer_fault_user_mappings(buffer)) {
- vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND |
- VM_DONTDUMP;
- vma->vm_private_data = buffer;
- vma->vm_ops = &ion_vma_ops;
- ion_vm_open(vma);
- return 0;
- }
-
if (!(buffer->flags & ION_FLAG_CACHED))
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
--
2.7.4
next prev parent reply other threads:[~2017-04-03 18:57 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-03 18:57 [PATCHv3 00/22] Ion clean up in preparation in moving out of staging Laura Abbott
2017-04-03 18:57 ` [PATCHv3 01/22] cma: Store a name in the cma structure Laura Abbott
2017-04-03 18:57 ` [PATCHv3 02/22] cma: Introduce cma_for_each_area Laura Abbott
2017-04-03 18:57 ` [PATCHv3 03/22] staging: android: ion: Remove dmap_cnt Laura Abbott
2017-04-03 18:57 ` [PATCHv3 04/22] staging: android: ion: Remove alignment from allocation field Laura Abbott
2017-04-03 18:57 ` [PATCHv3 05/22] staging: android: ion: Duplicate sg_table Laura Abbott
2017-04-03 18:57 ` [PATCHv3 06/22] staging: android: ion: Call dma_map_sg for syncing and mapping Laura Abbott
2017-04-03 18:57 ` Laura Abbott [this message]
2017-04-11 6:00 ` [PATCHv3 07/22] staging: android: ion: Remove page faulting support Archit Taneja
2017-04-03 18:57 ` [PATCHv3 08/22] staging: android: ion: Remove crufty cache support Laura Abbott
2017-04-11 5:08 ` Archit Taneja
2017-04-03 18:57 ` [PATCHv3 09/22] staging: android: ion: Remove custom ioctl interface Laura Abbott
2017-04-03 18:57 ` [PATCHv3 10/22] staging: android: ion: Remove import interface Laura Abbott
2017-04-03 18:57 ` [PATCHv3 11/22] staging: android: ion: Remove duplicate ION_IOC_MAP Laura Abbott
2017-04-03 18:57 ` [PATCHv3 12/22] staging: android: ion: Remove old platform support Laura Abbott
2017-04-03 18:57 ` [PATCHv3 13/22] staging: android: ion: Use CMA APIs directly Laura Abbott
2017-04-11 6:47 ` Laurent Pinchart
2017-04-11 16:48 ` Laura Abbott
2017-04-18 14:07 ` Greg Kroah-Hartman
2017-04-03 18:57 ` [PATCHv3 14/22] staging: android: ion: Stop butchering the DMA address Laura Abbott
2017-04-03 18:57 ` [PATCHv3 15/22] staging: android: ion: Break the ABI in the name of forward progress Laura Abbott
2017-04-03 18:57 ` [PATCHv3 16/22] staging: android: ion: Get rid of ion_phys_addr_t Laura Abbott
2017-04-03 18:57 ` [PATCHv3 17/22] staging: android: ion: Collapse internal header files Laura Abbott
2017-04-08 18:12 ` Emil Velikov
2017-04-10 15:10 ` Laura Abbott
2017-04-03 18:58 ` [PATCHv3 18/22] staging: android: ion: Rework heap registration/enumeration Laura Abbott
2017-04-03 18:58 ` [PATCHv3 19/22] staging: android: ion: Drop ion_map_kernel interface Laura Abbott
2017-04-03 18:58 ` [PATCHv3 20/22] staging: android: ion: Remove ion_handle and ion_client Laura Abbott
2017-04-03 18:58 ` [PATCHv3 21/22] staging: android: ion: Set query return value Laura Abbott
2017-04-03 18:58 ` [PATCHv3 22/22] staging/android: Update Ion TODO list Laura Abbott
2017-04-08 10:38 ` [PATCHv3 00/22] Ion clean up in preparation in moving out of staging Greg Kroah-Hartman
2017-04-10 16:20 ` Laura Abbott
2017-04-10 16:25 ` Greg Kroah-Hartman
2017-04-10 17:20 ` 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=1491245884-15852-8-git-send-email-labbott@redhat.com \
--to=labbott@redhat.com \
--cc=linux-arm-kernel@lists.infradead.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).