From patchwork Wed Dec 5 12:28:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goldwyn Rodrigues X-Patchwork-Id: 10713993 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DE1814E2 for ; Wed, 5 Dec 2018 12:29:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D9E32CC55 for ; Wed, 5 Dec 2018 12:29:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81C762CC8A; Wed, 5 Dec 2018 12:29:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F0872CC55 for ; Wed, 5 Dec 2018 12:29:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727807AbeLEM3M (ORCPT ); Wed, 5 Dec 2018 07:29:12 -0500 Received: from mx2.suse.de ([195.135.220.15]:48534 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727787AbeLEM3L (ORCPT ); Wed, 5 Dec 2018 07:29:11 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D0057ADA9 for ; Wed, 5 Dec 2018 12:29:09 +0000 (UTC) From: Goldwyn Rodrigues To: linux-btrfs@vger.kernel.org Cc: Goldwyn Rodrigues Subject: [PATCH 09/10] btrfs: dax support for cow_page/mmap_private and shared Date: Wed, 5 Dec 2018 06:28:34 -0600 Message-Id: <20181205122835.19290-10-rgoldwyn@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181205122835.19290-1-rgoldwyn@suse.de> References: <20181205122835.19290-1-rgoldwyn@suse.de> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Goldwyn Rodrigues Signed-off-by: Goldwyn Rodrigues --- fs/btrfs/dax.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/dax.c b/fs/btrfs/dax.c index 88017f8799d1..6d68d39cc5da 100644 --- a/fs/btrfs/dax.c +++ b/fs/btrfs/dax.c @@ -198,10 +198,13 @@ vm_fault_t btrfs_dax_fault(struct vm_fault *vmf) pfn_t pfn; struct address_space *mapping = vmf->vma->vm_file->f_mapping; XA_STATE(xas, &mapping->i_pages, vmf->pgoff); + unsigned long vaddr = vmf->address; struct inode *inode = mapping->host; loff_t pos = (loff_t)vmf->pgoff << PAGE_SHIFT; void *entry = NULL; vm_fault_t ret = 0; + struct extent_map *em; + struct dax_device *dax_dev; if (pos > i_size_read(inode)) { ret = VM_FAULT_SIGBUS; @@ -214,21 +217,33 @@ vm_fault_t btrfs_dax_fault(struct vm_fault *vmf) goto out; } - if (!vmf->cow_page) { + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, pos, PAGE_SIZE, 0); + if (em->block_start != EXTENT_MAP_HOLE) + dax_dev = fs_dax_get_by_bdev(em->bdev); + + if (vmf->cow_page) { + sector_t sector; + if (em->block_start == EXTENT_MAP_HOLE) { + clear_user_highpage(vmf->cow_page, vaddr); + goto out; + } + sector = (get_start_sect(em->bdev) << 9) + (em->block_start + (pos - em->start)); + sector >>= 9; + ret = copy_user_dax(em->bdev, dax_dev, sector, PAGE_SIZE, vmf->cow_page, vaddr); + goto out; + } else { sector_t sector; - struct extent_map *em; - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, pos, PAGE_SIZE, 0); if (em->block_start == EXTENT_MAP_HOLE) { ret = dax_load_hole(&xas, mapping, entry, vmf); goto out; } sector = ((get_start_sect(em->bdev) << 9) + (em->block_start + (pos - em->start))) >> 9; - ret = dax_pfn(fs_dax_get_by_bdev(em->bdev), em->bdev, sector, PAGE_SIZE, &pfn); + ret = dax_pfn(dax_dev, em->bdev, sector, PAGE_SIZE, &pfn); if (ret) goto out; dax_insert_entry(&xas, mapping, vmf, entry, pfn, 0, false); - ret = vmf_insert_mixed(vmf->vma, vmf->address, pfn); + ret = vmf_insert_mixed(vmf->vma, vaddr, pfn); } out: if (entry)