device-dax: make align a per-device property

Introduce @align to struct dev_dax.

When creating a new device, we still initialize to the default dax_region
@align.  Child devices belonging to a region may wish to keep a different
alignment property instead of a global region-defined one.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
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: Hulk Robot <hulkci@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: "Jérôme Glisse" <jglisse@redhat.com>
Cc: Jia He <justin.he@arm.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: kernel test robot <lkp@intel.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: Randy Dunlap <rdunlap@infradead.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/159643105377.4062302.4159447829955683131.stgit@dwillia2-desk3.amr.corp.intel.com
Link: https://lore.kernel.org/r/20200716172913.19658-2-joao.m.martins@oracle.com
Link: https://lkml.kernel.org/r/160106117957.30709.1142303024324655705.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c
index 005fa3e6d41c59fd48ae4b352235f018eebb8ea6..852899084d135eadc2524586f96b694bc04611c9 100644 (file)
--- a/drivers/dax/bus.c
+++ b/drivers/dax/bus.c
@@ -1218,6 +1218,7 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data)
 
        dev_dax->dax_dev = dax_dev;
        dev_dax->target_node = dax_region->target_node;
+       dev_dax->align = dax_region->align;
        ida_init(&dev_dax->ida);
        kref_get(&dax_region->kref);
 

diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h
index 13780f62b95e491974c3fd4213f282fee8f5716e..5fd3a26cfcea84febe8d207b77e77ef9cee6f433 100644 (file)
--- a/drivers/dax/dax-private.h
+++ b/drivers/dax/dax-private.h
@@ -62,6 +62,7 @@ struct dax_mapping {
 struct dev_dax {
        struct dax_region *region;
        struct dax_device *dax_dev;
+       unsigned int align;
        int target_node;
        int id;
        struct ida ida;
@@ -84,4 +85,6 @@ static inline struct dax_mapping *to_dax_mapping(struct device *dev)
 {
        return container_of(dev, struct dax_mapping, dev);
 }
+
+phys_addr_t dax_pgoff_to_phys(struct dev_dax *dev_dax, pgoff_t pgoff, unsigned long size);
 #endif

diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index bf389712a20b6135114a6abf277d754b67f76733..25e0b84a4296acd78c19e30fb031a6c194d7d12d 100644 (file)
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -17,7 +17,6 @@
 static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma,
                const char *func)
 {
-       struct dax_region *dax_region = dev_dax->region;
        struct device *dev = &dev_dax->dev;
        unsigned long mask;
 
@@ -32,7 +31,7 @@ static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma,
                return -EINVAL;
        }
 
-       mask = dax_region->align - 1;
+       mask = dev_dax->align - 1;
        if (vma->vm_start & mask || vma->vm_end & mask) {
                dev_info_ratelimited(dev,
                                "%s: %s: fail, unaligned vma (%#lx - %#lx, %#lx)\n",
@@ -78,21 +77,19 @@ static vm_fault_t __dev_dax_pte_fault(struct dev_dax *dev_dax,
                                struct vm_fault *vmf, pfn_t *pfn)
 {
        struct device *dev = &dev_dax->dev;
-       struct dax_region *dax_region;
        phys_addr_t phys;
        unsigned int fault_size = PAGE_SIZE;
 
        if (check_vma(dev_dax, vmf->vma, __func__))
                return VM_FAULT_SIGBUS;
 
-       dax_region = dev_dax->region;
-       if (dax_region->align > PAGE_SIZE) {
+       if (dev_dax->align > PAGE_SIZE) {
                dev_dbg(dev, "alignment (%#x) > fault size (%#x)\n",
-                       dax_region->align, fault_size);
+                       dev_dax->align, fault_size);
                return VM_FAULT_SIGBUS;
        }
 
-       if (fault_size != dax_region->align)
+       if (fault_size != dev_dax->align)
                return VM_FAULT_SIGBUS;
 
        phys = dax_pgoff_to_phys(dev_dax, vmf->pgoff, PAGE_SIZE);
@@ -111,7 +108,6 @@ static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax,
 {
        unsigned long pmd_addr = vmf->address & PMD_MASK;
        struct device *dev = &dev_dax->dev;
-       struct dax_region *dax_region;
        phys_addr_t phys;
        pgoff_t pgoff;
        unsigned int fault_size = PMD_SIZE;
@@ -119,16 +115,15 @@ static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax,
        if (check_vma(dev_dax, vmf->vma, __func__))
                return VM_FAULT_SIGBUS;
 
-       dax_region = dev_dax->region;
-       if (dax_region->align > PMD_SIZE) {
+       if (dev_dax->align > PMD_SIZE) {
                dev_dbg(dev, "alignment (%#x) > fault size (%#x)\n",
-                       dax_region->align, fault_size);
+                       dev_dax->align, fault_size);
                return VM_FAULT_SIGBUS;
        }
 
-       if (fault_size < dax_region->align)
+       if (fault_size < dev_dax->align)
                return VM_FAULT_SIGBUS;
-       else if (fault_size > dax_region->align)
+       else if (fault_size > dev_dax->align)
                return VM_FAULT_FALLBACK;
 
        /* if we are outside of the VMA */
@@ -154,7 +149,6 @@ static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax,
 {
        unsigned long pud_addr = vmf->address & PUD_MASK;
        struct device *dev = &dev_dax->dev;
-       struct dax_region *dax_region;
        phys_addr_t phys;
        pgoff_t pgoff;
        unsigned int fault_size = PUD_SIZE;
@@ -163,16 +157,15 @@ static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax,
        if (check_vma(dev_dax, vmf->vma, __func__))
                return VM_FAULT_SIGBUS;
 
-       dax_region = dev_dax->region;
-       if (dax_region->align > PUD_SIZE) {
+       if (dev_dax->align > PUD_SIZE) {
                dev_dbg(dev, "alignment (%#x) > fault size (%#x)\n",
-                       dax_region->align, fault_size);
+                       dev_dax->align, fault_size);
                return VM_FAULT_SIGBUS;
        }
 
-       if (fault_size < dax_region->align)
+       if (fault_size < dev_dax->align)
                return VM_FAULT_SIGBUS;
-       else if (fault_size > dax_region->align)
+       else if (fault_size > dev_dax->align)
                return VM_FAULT_FALLBACK;
 
        /* if we are outside of the VMA */
@@ -267,9 +260,8 @@ static int dev_dax_split(struct vm_area_struct *vma, unsigned long addr)
 {
        struct file *filp = vma->vm_file;
        struct dev_dax *dev_dax = filp->private_data;
-       struct dax_region *dax_region = dev_dax->region;
 
-       if (!IS_ALIGNED(addr, dax_region->align))
+       if (!IS_ALIGNED(addr, dev_dax->align))
                return -EINVAL;
        return 0;
 }
@@ -278,9 +270,8 @@ static unsigned long dev_dax_pagesize(struct vm_area_struct *vma)
 {
        struct file *filp = vma->vm_file;
        struct dev_dax *dev_dax = filp->private_data;
-       struct dax_region *dax_region = dev_dax->region;
 
-       return dax_region->align;
+       return dev_dax->align;
 }
 
 static const struct vm_operations_struct dax_vm_ops = {
@@ -319,13 +310,11 @@ static unsigned long dax_get_unmapped_area(struct file *filp,
 {
        unsigned long off, off_end, off_align, len_align, addr_align, align;
        struct dev_dax *dev_dax = filp ? filp->private_data : NULL;
-       struct dax_region *dax_region;
 
        if (!dev_dax || addr)
                goto out;
 
-       dax_region = dev_dax->region;
-       align = dax_region->align;
+       align = dev_dax->align;
        off = pgoff << PAGE_SHIFT;
        off_end = off + len;
        off_align = round_up(off, align);