tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

device-dax: drop the dax_region.pfn_flags attribute

All callers specify the same flags to alloc_dax_region(), so there is no
need to allow for anything other than PFN_DEV|PFN_MAP, or carry a
->pfn_flags around on the region. Device-dax instances are always page
backed.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brice Goglin <Brice.Goglin@inria.fr>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: David Hildenbrand <david@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Jia He <justin.he@arm.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: Will Deacon <will@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Hulk Robot <hulkci@huawei.com>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: "Jérôme Glisse" <jglisse@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/159643098829.4062302.13611520567669439046.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Dan Williams and committed by
Linus Torvalds ec826909 5ccac54f

+7 -33
+1 -3
drivers/dax/bus.c
··· 226 226 } 227 227 228 228 struct dax_region *alloc_dax_region(struct device *parent, int region_id, 229 - struct resource *res, int target_node, unsigned int align, 230 - unsigned long long pfn_flags) 229 + struct resource *res, int target_node, unsigned int align) 231 230 { 232 231 struct dax_region *dax_region; 233 232 ··· 250 251 251 252 dev_set_drvdata(parent, dax_region); 252 253 memcpy(&dax_region->res, res, sizeof(*res)); 253 - dax_region->pfn_flags = pfn_flags; 254 254 kref_init(&dax_region->kref); 255 255 dax_region->id = region_id; 256 256 dax_region->align = align;
+1 -2
drivers/dax/bus.h
··· 10 10 struct dax_region; 11 11 void dax_region_put(struct dax_region *dax_region); 12 12 struct dax_region *alloc_dax_region(struct device *parent, int region_id, 13 - struct resource *res, int target_node, unsigned int align, 14 - unsigned long long flags); 13 + struct resource *res, int target_node, unsigned int align); 15 14 16 15 enum dev_dax_subsys { 17 16 DEV_DAX_BUS,
-2
drivers/dax/dax-private.h
··· 23 23 * @dev: parent device backing this region 24 24 * @align: allocation and mapping alignment for child dax devices 25 25 * @res: physical address range of the region 26 - * @pfn_flags: identify whether the pfns are paged back or not 27 26 */ 28 27 struct dax_region { 29 28 int id; ··· 31 32 struct device *dev; 32 33 unsigned int align; 33 34 struct resource res; 34 - unsigned long long pfn_flags; 35 35 }; 36 36 37 37 /**
+3 -23
drivers/dax/device.c
··· 41 41 return -EINVAL; 42 42 } 43 43 44 - if ((dax_region->pfn_flags & (PFN_DEV|PFN_MAP)) == PFN_DEV 45 - && (vma->vm_flags & VM_DONTCOPY) == 0) { 46 - dev_info_ratelimited(dev, 47 - "%s: %s: fail, dax range requires MADV_DONTFORK\n", 48 - current->comm, func); 49 - return -EINVAL; 50 - } 51 - 52 44 if (!vma_is_dax(vma)) { 53 45 dev_info_ratelimited(dev, 54 46 "%s: %s: fail, vma is not DAX capable\n", ··· 94 102 return VM_FAULT_SIGBUS; 95 103 } 96 104 97 - *pfn = phys_to_pfn_t(phys, dax_region->pfn_flags); 105 + *pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP); 98 106 99 107 return vmf_insert_mixed(vmf->vma, vmf->address, *pfn); 100 108 } ··· 119 127 return VM_FAULT_SIGBUS; 120 128 } 121 129 122 - /* dax pmd mappings require pfn_t_devmap() */ 123 - if ((dax_region->pfn_flags & (PFN_DEV|PFN_MAP)) != (PFN_DEV|PFN_MAP)) { 124 - dev_dbg(dev, "region lacks devmap flags\n"); 125 - return VM_FAULT_SIGBUS; 126 - } 127 - 128 130 if (fault_size < dax_region->align) 129 131 return VM_FAULT_SIGBUS; 130 132 else if (fault_size > dax_region->align) ··· 136 150 return VM_FAULT_SIGBUS; 137 151 } 138 152 139 - *pfn = phys_to_pfn_t(phys, dax_region->pfn_flags); 153 + *pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP); 140 154 141 155 return vmf_insert_pfn_pmd(vmf, *pfn, vmf->flags & FAULT_FLAG_WRITE); 142 156 } ··· 163 177 return VM_FAULT_SIGBUS; 164 178 } 165 179 166 - /* dax pud mappings require pfn_t_devmap() */ 167 - if ((dax_region->pfn_flags & (PFN_DEV|PFN_MAP)) != (PFN_DEV|PFN_MAP)) { 168 - dev_dbg(dev, "region lacks devmap flags\n"); 169 - return VM_FAULT_SIGBUS; 170 - } 171 - 172 180 if (fault_size < dax_region->align) 173 181 return VM_FAULT_SIGBUS; 174 182 else if (fault_size > dax_region->align) ··· 180 200 return VM_FAULT_SIGBUS; 181 201 } 182 202 183 - *pfn = phys_to_pfn_t(phys, dax_region->pfn_flags); 203 + *pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP); 184 204 185 205 return vmf_insert_pfn_pud(vmf, *pfn, vmf->flags & FAULT_FLAG_WRITE); 186 206 }
+1 -1
drivers/dax/hmem/hmem.c
··· 22 22 memcpy(&pgmap.res, res, sizeof(*res)); 23 23 24 24 dax_region = alloc_dax_region(dev, pdev->id, res, mri->target_node, 25 - PMD_SIZE, PFN_DEV|PFN_MAP); 25 + PMD_SIZE); 26 26 if (!dax_region) 27 27 return -ENOMEM; 28 28
+1 -2
drivers/dax/pmem/core.c
··· 53 53 memcpy(&res, &pgmap.res, sizeof(res)); 54 54 res.start += offset; 55 55 dax_region = alloc_dax_region(dev, region_id, &res, 56 - nd_region->target_node, le32_to_cpu(pfn_sb->align), 57 - PFN_DEV|PFN_MAP); 56 + nd_region->target_node, le32_to_cpu(pfn_sb->align)); 58 57 if (!dax_region) 59 58 return ERR_PTR(-ENOMEM); 60 59