From patchwork Mon May 4 09:54:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 976 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Mon, 04 May 2009 09:56:24 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Mon, 04 May 2009 07:01:31 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1M0uuO-0006Ge-7B; Mon, 04 May 2009 09:56:24 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754274AbZEDJ4T (ORCPT + 1 other); Mon, 4 May 2009 05:56:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753795AbZEDJ4T (ORCPT ); Mon, 4 May 2009 05:56:19 -0400 Received: from cmpxchg.org ([85.214.51.133]:49969 "EHLO cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754094AbZEDJ4Q (ORCPT ); Mon, 4 May 2009 05:56:16 -0400 From: Johannes Weiner To: Andrew Morton Cc: Magnus Damm , linux-media@vger.kernel.org, Hans Verkuil , Paul Mundt , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [patch 3/3] mm: introduce follow_pfn() Date: Mon, 4 May 2009 11:54:34 +0200 Message-Id: <1241430874-12667-3-git-send-email-hannes@cmpxchg.org> X-Mailer: git-send-email 1.6.2.1.135.gde769 In-Reply-To: <20090501181449.GA8912@cmpxchg.org> References: <20090501181449.GA8912@cmpxchg.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Analoguous to follow_phys(), add a helper that looks up the PFN instead. It also only allows IO mappings or PFN mappings. Signed-off-by: Johannes Weiner --- include/linux/mm.h | 2 ++ mm/memory.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index bff1f0d..1cca8b6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -794,6 +794,8 @@ int copy_page_range(struct mm_struct *dst, struct mm_struct *src, struct vm_area_struct *vma); void unmap_mapping_range(struct address_space *mapping, loff_t const holebegin, loff_t const holelen, int even_cows); +int follow_pfn(struct vm_area_struct *vma, unsigned long address, + unsigned long *pfn); int follow_phys(struct vm_area_struct *vma, unsigned long address, unsigned int flags, unsigned long *prot, resource_size_t *phys); int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, diff --git a/mm/memory.c b/mm/memory.c index aee167d..05fc8e5 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3046,6 +3046,25 @@ out: return -EINVAL; } +int follow_pfn(struct vm_area_struct *vma, unsigned long address, + unsigned long *pfn) +{ + int ret = -EINVAL; + spinlock_t *ptl; + pte_t *ptep; + + if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) + return ret; + + ret = follow_pte(vma->vm_mm, address, &ptep, &ptl); + if (ret) + return ret; + *pfn = pte_pfn(*ptep); + pte_unmap_unlock(ptep, ptl); + return 0; +} +EXPORT_SYMBOL(follow_pfn); + #ifdef CONFIG_HAVE_IOREMAP_PROT int follow_phys(struct vm_area_struct *vma, unsigned long address, unsigned int flags,