From patchwork Sun Jan 31 12:19:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wilcox, Matthew R" X-Patchwork-Id: 8174081 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D96A5BEEE5 for ; Sun, 31 Jan 2016 12:21:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F2D7220154 for ; Sun, 31 Jan 2016 12:21:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E74F62034B for ; Sun, 31 Jan 2016 12:21:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932417AbcAaMUj (ORCPT ); Sun, 31 Jan 2016 07:20:39 -0500 Received: from mga11.intel.com ([192.55.52.93]:26129 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932339AbcAaMUE (ORCPT ); Sun, 31 Jan 2016 07:20:04 -0500 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP; 31 Jan 2016 04:20:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,375,1449561600"; d="scan'208";a="39654741" Received: from vsundhar-mobl.amr.corp.intel.com (HELO thog.int.wil.cx) ([10.252.206.106]) by fmsmga004.fm.intel.com with SMTP; 31 Jan 2016 04:20:00 -0800 Received: by thog.int.wil.cx (Postfix, from userid 1000) id D91B461C9B; Sun, 31 Jan 2016 07:19:56 -0500 (EST) From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-mm@kvack.org, linux-nvdimm@lists.01.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, willy@linux.intel.com Subject: [PATCH 6/6] dax: Factor dax_insert_pud_mapping out of dax_pud_fault Date: Sun, 31 Jan 2016 23:19:55 +1100 Message-Id: <1454242795-18038-7-git-send-email-matthew.r.wilcox@intel.com> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1454242795-18038-1-git-send-email-matthew.r.wilcox@intel.com> References: <1454242795-18038-1-git-send-email-matthew.r.wilcox@intel.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Follow the factoring done for dax_pmd_fault. Signed-off-by: Matthew Wilcox --- fs/dax.c | 100 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index ec31e6e..e9701d6 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -915,6 +915,57 @@ static int dax_pmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf, #define dax_pud_dbg(bh, address, reason) __dax_dbg(bh, address, reason, "dax_pud") +static int dax_insert_pud_mapping(struct inode *inode, struct buffer_head *bh, + struct vm_area_struct *vma, struct vm_fault *vmf) +{ + int major = 0; + struct blk_dax_ctl dax = { + .sector = to_sector(bh, inode), + .size = PUD_SIZE, + }; + struct block_device *bdev = bh->b_bdev; + bool write = vmf->flags & FAULT_FLAG_WRITE; + unsigned long address = (unsigned long)vmf->virtual_address; + long length = dax_map_atomic(bdev, &dax); + + if (length < 0) + return VM_FAULT_SIGBUS; + if (length < PUD_SIZE) { + dax_pud_dbg(bh, address, "dax-length too small"); + goto unmap; + } + if (pfn_t_to_pfn(dax.pfn) & PG_PUD_COLOUR) { + dax_pud_dbg(bh, address, "pfn unaligned"); + goto unmap; + } + + if (!pfn_t_devmap(dax.pfn)) { + dax_pud_dbg(bh, address, "pfn not in memmap"); + goto unmap; + } + + if (buffer_unwritten(bh) || buffer_new(bh)) { + clear_pmem(dax.addr, PUD_SIZE); + wmb_pmem(); + count_vm_event(PGMAJFAULT); + mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT); + major = VM_FAULT_MAJOR; + } + dax_unmap_atomic(bdev, &dax); + + dev_dbg(part_to_dev(bdev->bd_part), + "%s: %s addr: %lx pfn: %lx sect: %llx\n", + __func__, current->comm, address, + pfn_t_to_pfn(dax.pfn), + (unsigned long long) dax.sector); + return major | vmf_insert_pfn_pud(vma, address, vmf->pud, + dax.pfn, write); + unmap: + dax_unmap_atomic(bdev, &dax); + count_vm_event(THP_FAULT_FALLBACK); + return VM_FAULT_FALLBACK; +} + static int dax_pud_fault(struct vm_area_struct *vma, struct vm_fault *vmf, get_block_t get_block, dax_iodone_t complete_unwritten) { @@ -926,10 +977,9 @@ static int dax_pud_fault(struct vm_area_struct *vma, struct vm_fault *vmf, unsigned long address = (unsigned long)vmf->virtual_address; unsigned long pud_addr = address & PUD_MASK; bool write = vmf->flags & FAULT_FLAG_WRITE; - struct block_device *bdev; pgoff_t size; sector_t block; - int result = 0; + int result; bool alloc = false; /* dax pud mappings require pfn_t_devmap() */ @@ -977,8 +1027,6 @@ static int dax_pud_fault(struct vm_area_struct *vma, struct vm_fault *vmf, alloc = true; } - bdev = bh.b_bdev; - /* * If the filesystem isn't willing to tell us the length of a hole, * just fall back to PMDs. Calling get_block 512 times in a loop @@ -1004,49 +1052,7 @@ static int dax_pud_fault(struct vm_area_struct *vma, struct vm_fault *vmf, dax_pud_dbg(&bh, address, "no zero page"); goto fallback; } else { - struct blk_dax_ctl dax = { - .sector = to_sector(&bh, inode), - .size = PUD_SIZE, - }; - long length = dax_map_atomic(bdev, &dax); - - if (length < 0) { - result = VM_FAULT_SIGBUS; - goto out; - } - if (length < PUD_SIZE) { - dax_pud_dbg(&bh, address, "dax-length too small"); - dax_unmap_atomic(bdev, &dax); - goto fallback; - } - if (pfn_t_to_pfn(dax.pfn) & PG_PUD_COLOUR) { - dax_pud_dbg(&bh, address, "pfn unaligned"); - dax_unmap_atomic(bdev, &dax); - goto fallback; - } - - if (!pfn_t_devmap(dax.pfn)) { - dax_unmap_atomic(bdev, &dax); - dax_pud_dbg(&bh, address, "pfn not in memmap"); - goto fallback; - } - - if (buffer_unwritten(&bh) || buffer_new(&bh)) { - clear_pmem(dax.addr, PUD_SIZE); - wmb_pmem(); - count_vm_event(PGMAJFAULT); - mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT); - result |= VM_FAULT_MAJOR; - } - dax_unmap_atomic(bdev, &dax); - - dev_dbg(part_to_dev(bdev->bd_part), - "%s: %s addr: %lx pfn: %lx sect: %llx\n", - __func__, current->comm, address, - pfn_t_to_pfn(dax.pfn), - (unsigned long long) dax.sector); - result |= vmf_insert_pfn_pud(vma, address, vmf->pud, - dax.pfn, write); + result = dax_insert_pud_mapping(inode, &bh, vma, vmf); } out: