From patchwork Sat Dec 14 03:26:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22474 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E816623908 for ; Sat, 14 Dec 2013 03:27:06 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id vb8sf9452273obc.8 for ; Fri, 13 Dec 2013 19:27:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=m+oVa5KkLDK/rPicv0x8NH4600RMN/2xRGAfxjelMXs=; b=VlqeZ6FRmElNIJPVgs0hKD3Xn2SkyTdS2rx3443xd8A6PFBs+z7ELdo+9IUqkJYfIr xSIzu/pUo5BvowvE4KV9FuYykGHAjAP/ghpRKxOAz1aRcZm/YrEnULF23ZcUZiJFB4CV VPK5x4JbtF3++yUVcKVEhgfIHXuqV/jiR1BDyigTEPgtcZjY1i2V6PGcvu0vbOUrzLI8 EYGiJPtyXgs/vKdU1GvGHGZGfnTJKR9DwhO7nqnmyXPXTkF74My9+GfORHDca7HAYtkV 73ircc0j2JVN86QfYtexqP+oPHcjaQ+7fuBQdhBN2kQNEMjRJ4Qxp1fF3rmtbrx+4Wih 2rXQ== X-Gm-Message-State: ALoCoQmNnLbw7vrbjBMNtmLJ3+Pwg+gG+4oZ5Q2tXZ2TIIFU1P0B1KIczhi6eCXp4hnrR9yN5z2i X-Received: by 10.182.24.134 with SMTP id u6mr2174573obf.24.1386991626573; Fri, 13 Dec 2013 19:27:06 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.65 with SMTP id m1ls1253356qed.91.gmail; Fri, 13 Dec 2013 19:27:06 -0800 (PST) X-Received: by 10.221.54.65 with SMTP id vt1mr2618529vcb.46.1386991626467; Fri, 13 Dec 2013 19:27:06 -0800 (PST) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id sl9si1417551vdc.112.2013.12.13.19.27.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:27:06 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id lf12so1841087vcb.7 for ; Fri, 13 Dec 2013 19:27:06 -0800 (PST) X-Received: by 10.52.168.106 with SMTP id zv10mr2216229vdb.21.1386991626390; Fri, 13 Dec 2013 19:27:06 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp86954vcz; Fri, 13 Dec 2013 19:27:05 -0800 (PST) X-Received: by 10.66.4.130 with SMTP id k2mr7075834pak.95.1386991625416; Fri, 13 Dec 2013 19:27:05 -0800 (PST) Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by mx.google.com with ESMTPS id hb3si2951654pac.297.2013.12.13.19.27.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:27:05 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.45 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.45; Received: by mail-pa0-f45.google.com with SMTP id fb1so797214pad.18 for ; Fri, 13 Dec 2013 19:27:05 -0800 (PST) X-Received: by 10.68.134.200 with SMTP id pm8mr7180912pbb.123.1386991624981; Fri, 13 Dec 2013 19:27:04 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id nw11sm11680086pab.13.2013.12.13.19.27.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 19:27:04 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , John Stultz Subject: [PATCH 104/115] ion: use vm_insert_pfn for faulted pages Date: Fri, 13 Dec 2013 19:26:24 -0800 Message-Id: <1386991595-6251-12-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386991595-6251-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> <1386991595-6251-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Colin Cross Most ion userspace mappings are created with remap_pfn_range. Use vm_insert_pfn instead of vm_insert_page to make faulted cached mappings look more like uncached mappings. Signed-off-by: Colin Cross Signed-off-by: John Stultz --- drivers/staging/android/ion/ion.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index fc77aa6..45127f5 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -890,14 +890,15 @@ static void ion_buffer_sync_for_device(struct ion_buffer *buffer, 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]); - ret = vm_insert_page(vma, (unsigned long)vmf->virtual_address, - ion_buffer_page(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; @@ -956,6 +957,8 @@ static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) } 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);