Path: csiph.com!1.us.feeder.erje.net!feeder.erje.net!1.eu.feeder.erje.net!news.albasani.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Laura Abbott Newsgroups: linux.kernel Subject: [RFC PATCH 3/4] staging: android: ion: Remove page faulting support Date: Thu, 15 Dec 2016 01:10:02 +0100 Message-ID: References: X-Original-To: Sumit Semwal , Riley Andrews , arve@android.com X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e5z3K4Z0qjMalBkcOUrk0Gx1/JbP0/TMlx2BDgzglOg=; b=hZaXwdEyocWMD0wBVVmQT0855/fyOOmuebwpW+EZxc6xI2uUjLVid8DwwtTFYNNrEI F9RoCuSaD0dBMBy8uN1kfKQCUbVrTez2Ihmpc8VRtEKiL+gg4IjjIkFK2LQqyxHWF1+3 SQOv/knlKSYEU/cHCygTJG2ChMn1nO6YDG5eO9KgYtqB1uc6xq53s2ZY1jMcXFkKvBQp AOnvGiHnuLKfZaSUyrhN984q1zHDD01Y3IYaZaOZvqpH6r8dQjFUkeUcr4/pj//paBwr 97AgyDxJ4jmJhuM22Myso2V5/WifNlPR3GZUp4WYpHKNVif0xd3l1IUcbmB85Oq5DtdW VQJg== X-Gm-Message-State: AKaTC00PGwznrcVGeZj85L1W2+Uy/ogtFqDkc9P/7j7cpih7+qYaTTKnTv6xeeVgIp6izjuh X-Received: by 10.237.48.193 with SMTP id 59mr98579701qtf.27.1481760477707; Wed, 14 Dec 2016 16:07:57 -0800 (PST) X-Mailer: git-send-email 2.7.4 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 128 Organization: linux.* mail to news gateway X-Original-Cc: Laura Abbott , romlem@google.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, Bryan Huntsman , pratikp@codeaurora.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, Brian Starkey X-Original-Date: Wed, 14 Dec 2016 16:07:42 -0800 X-Original-Message-ID: <1481760463-3515-4-git-send-email-labbott@redhat.com> X-Original-References: <1481760463-3515-1-git-send-email-labbott@redhat.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1542385 Unclear if this is wanted or needed? Not-signed-off-by: Laura Abbott --- drivers/staging/android/ion/ion.c | 74 --------------------------------------- 1 file changed, 74 deletions(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 76b874a0..86dba07 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -41,37 +41,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) @@ -139,25 +113,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); @@ -845,25 +800,6 @@ struct ion_vma_list { struct vm_area_struct *vma; }; -static int ion_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -{ - struct ion_buffer *buffer = 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(vma, (unsigned long)vmf->virtual_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; @@ -900,7 +836,6 @@ static void ion_vm_close(struct vm_area_struct *vma) 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) @@ -914,15 +849,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