Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/829939/?format=api
{ "id": 829939, "url": "http://patchwork.ozlabs.org/api/1.2/patches/829939/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-ext4/patch/20171024152415.22864-5-jack@suse.cz/", "project": { "id": 8, "url": "http://patchwork.ozlabs.org/api/1.2/projects/8/?format=api", "name": "Linux ext4 filesystem development", "link_name": "linux-ext4", "list_id": "linux-ext4.vger.kernel.org", "list_email": "linux-ext4@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20171024152415.22864-5-jack@suse.cz>", "list_archive_url": null, "date": "2017-10-24T15:24:01", "name": "[04/17] dax: Factor out getting of pfn out of iomap", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "be97a89dbac88f1ab07117031dd91ea57750efe2", "submitter": { "id": 363, "url": "http://patchwork.ozlabs.org/api/1.2/people/363/?format=api", "name": "Jan Kara", "email": "jack@suse.cz" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-ext4/patch/20171024152415.22864-5-jack@suse.cz/mbox/", "series": [ { "id": 10008, "url": "http://patchwork.ozlabs.org/api/1.2/series/10008/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-ext4/list/?series=10008", "date": "2017-10-24T15:23:57", "name": "dax, ext4, xfs: Synchronous page faults", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/10008/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/829939/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/829939/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linux-ext4-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-ext4-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yLxtC1Qfkz9t3m\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 25 Oct 2017 02:25:39 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932443AbdJXPZe (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tTue, 24 Oct 2017 11:25:34 -0400", "from mx2.suse.de ([195.135.220.15]:36052 \"EHLO mx2.suse.de\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751559AbdJXPZa (ORCPT <rfc822;linux-ext4@vger.kernel.org>);\n\tTue, 24 Oct 2017 11:25:30 -0400", "from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254])\n\tby mx2.suse.de (Postfix) with ESMTP id CC009AC5E;\n\tTue, 24 Oct 2017 15:25:27 +0000 (UTC)", "by quack2.suse.cz (Postfix, from userid 1000)\n\tid 573F51E3590; Tue, 24 Oct 2017 17:25:27 +0200 (CEST)" ], "X-Virus-Scanned": "by amavisd-new at test-mx.suse.de", "From": "Jan Kara <jack@suse.cz>", "To": "Dan Williams <dan.j.williams@intel.com>", "Cc": "Ross Zwisler <ross.zwisler@linux.intel.com>,\n\tChristoph Hellwig <hch@infradead.org>,\n\t<linux-ext4@vger.kernel.org>, linux-nvdimm@lists.01.org,\n\t<linux-fsdevel@vger.kernel.org>, <linux-xfs@vger.kernel.org>,\n\tlinux-api@vger.kernel.org, <linux-mm@kvack.org>, Jan Kara <jack@suse.cz>", "Subject": "[PATCH 04/17] dax: Factor out getting of pfn out of iomap", "Date": "Tue, 24 Oct 2017 17:24:01 +0200", "Message-Id": "<20171024152415.22864-5-jack@suse.cz>", "X-Mailer": "git-send-email 2.12.3", "In-Reply-To": "<20171024152415.22864-1-jack@suse.cz>", "References": "<20171024152415.22864-1-jack@suse.cz>", "Sender": "linux-ext4-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<linux-ext4.vger.kernel.org>", "X-Mailing-List": "linux-ext4@vger.kernel.org" }, "content": "Factor out code to get pfn out of iomap that is shared between PTE and\nPMD fault path.\n\nReviewed-by: Christoph Hellwig <hch@lst.de>\nReviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>\nSigned-off-by: Jan Kara <jack@suse.cz>\n---\n fs/dax.c | 83 +++++++++++++++++++++++++++++++++-------------------------------\n 1 file changed, 43 insertions(+), 40 deletions(-)", "diff": "diff --git a/fs/dax.c b/fs/dax.c\nindex 0bc42ac294ca..116eef8d6c69 100644\n--- a/fs/dax.c\n+++ b/fs/dax.c\n@@ -825,30 +825,53 @@ static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)\n \treturn iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);\n }\n \n-static int dax_insert_mapping(struct vm_fault *vmf, struct iomap *iomap,\n-\t\t\t loff_t pos, void *entry)\n+static int dax_iomap_pfn(struct iomap *iomap, loff_t pos, size_t size,\n+\t\t\t pfn_t *pfnp)\n {\n \tconst sector_t sector = dax_iomap_sector(iomap, pos);\n-\tstruct vm_area_struct *vma = vmf->vma;\n-\tstruct address_space *mapping = vma->vm_file->f_mapping;\n-\tunsigned long vaddr = vmf->address;\n-\tvoid *ret, *kaddr;\n \tpgoff_t pgoff;\n+\tvoid *kaddr;\n \tint id, rc;\n-\tpfn_t pfn;\n+\tlong length;\n \n-\trc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff);\n+\trc = bdev_dax_pgoff(iomap->bdev, sector, size, &pgoff);\n \tif (rc)\n \t\treturn rc;\n-\n \tid = dax_read_lock();\n-\trc = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(PAGE_SIZE),\n-\t\t\t &kaddr, &pfn);\n-\tif (rc < 0) {\n-\t\tdax_read_unlock(id);\n-\t\treturn rc;\n+\tlength = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size),\n+\t\t\t\t &kaddr, pfnp);\n+\tif (length < 0) {\n+\t\trc = length;\n+\t\tgoto out;\n \t}\n+\trc = -EINVAL;\n+\tif (PFN_PHYS(length) < size)\n+\t\tgoto out;\n+\tif (pfn_t_to_pfn(*pfnp) & (PHYS_PFN(size)-1))\n+\t\tgoto out;\n+\t/* For larger pages we need devmap */\n+\tif (length > 1 && !pfn_t_devmap(*pfnp))\n+\t\tgoto out;\n+\trc = 0;\n+out:\n \tdax_read_unlock(id);\n+\treturn rc;\n+}\n+\n+static int dax_insert_mapping(struct vm_fault *vmf, struct iomap *iomap,\n+\t\t\t loff_t pos, void *entry)\n+{\n+\tconst sector_t sector = dax_iomap_sector(iomap, pos);\n+\tstruct vm_area_struct *vma = vmf->vma;\n+\tstruct address_space *mapping = vma->vm_file->f_mapping;\n+\tunsigned long vaddr = vmf->address;\n+\tvoid *ret;\n+\tint rc;\n+\tpfn_t pfn;\n+\n+\trc = dax_iomap_pfn(iomap, pos, PAGE_SIZE, &pfn);\n+\tif (rc < 0)\n+\t\treturn rc;\n \n \tret = dax_insert_mapping_entry(mapping, vmf, entry, sector, 0);\n \tif (IS_ERR(ret))\n@@ -1223,46 +1246,26 @@ static int dax_pmd_insert_mapping(struct vm_fault *vmf, struct iomap *iomap,\n {\n \tstruct address_space *mapping = vmf->vma->vm_file->f_mapping;\n \tconst sector_t sector = dax_iomap_sector(iomap, pos);\n-\tstruct dax_device *dax_dev = iomap->dax_dev;\n-\tstruct block_device *bdev = iomap->bdev;\n \tstruct inode *inode = mapping->host;\n-\tconst size_t size = PMD_SIZE;\n-\tvoid *ret = NULL, *kaddr;\n-\tlong length = 0;\n-\tpgoff_t pgoff;\n+\tvoid *ret = NULL;\n \tpfn_t pfn = {};\n-\tint id;\n+\tint rc;\n \n-\tif (bdev_dax_pgoff(bdev, sector, size, &pgoff) != 0)\n+\trc = dax_iomap_pfn(iomap, pos, PMD_SIZE, &pfn);\n+\tif (rc < 0)\n \t\tgoto fallback;\n \n-\tid = dax_read_lock();\n-\tlength = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, &pfn);\n-\tif (length < 0)\n-\t\tgoto unlock_fallback;\n-\tlength = PFN_PHYS(length);\n-\n-\tif (length < size)\n-\t\tgoto unlock_fallback;\n-\tif (pfn_t_to_pfn(pfn) & PG_PMD_COLOUR)\n-\t\tgoto unlock_fallback;\n-\tif (!pfn_t_devmap(pfn))\n-\t\tgoto unlock_fallback;\n-\tdax_read_unlock(id);\n-\n \tret = dax_insert_mapping_entry(mapping, vmf, entry, sector,\n \t\t\tRADIX_DAX_PMD);\n \tif (IS_ERR(ret))\n \t\tgoto fallback;\n \n-\ttrace_dax_pmd_insert_mapping(inode, vmf, length, pfn, ret);\n+\ttrace_dax_pmd_insert_mapping(inode, vmf, PMD_SIZE, pfn, ret);\n \treturn vmf_insert_pfn_pmd(vmf->vma, vmf->address, vmf->pmd,\n \t\t\tpfn, vmf->flags & FAULT_FLAG_WRITE);\n \n-unlock_fallback:\n-\tdax_read_unlock(id);\n fallback:\n-\ttrace_dax_pmd_insert_mapping_fallback(inode, vmf, length, pfn, ret);\n+\ttrace_dax_pmd_insert_mapping_fallback(inode, vmf, PMD_SIZE, pfn, ret);\n \treturn VM_FAULT_FALLBACK;\n }\n \n", "prefixes": [ "04/17" ] }