Commit ec826909 authored by Dan Williams's avatar Dan Williams Committed by Linus Torvalds
Browse files

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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarAndrew 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ccac54f

drivers/dax/bus.c

+1 −3
Original line number Diff line number Diff line
@@ -226,8 +226,7 @@ static void dax_region_unregister(void *region) 
}



struct dax_region *alloc_dax_region(struct device *parent, int region_id,

		struct resource *res, int target_node, unsigned int align,

		unsigned long long pfn_flags)

		struct resource *res, int target_node, unsigned int align)

{

	struct dax_region *dax_region;
@@ -251,7 +250,6 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id, 


	dev_set_drvdata(parent, dax_region);

	memcpy(&dax_region->res, res, sizeof(*res));

	dax_region->pfn_flags = pfn_flags;

	kref_init(&dax_region->kref);

	dax_region->id = region_id;

	dax_region->align = align;

drivers/dax/bus.h

+1 −2
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ struct dax_device; 
struct dax_region;

void dax_region_put(struct dax_region *dax_region);

struct dax_region *alloc_dax_region(struct device *parent, int region_id,

		struct resource *res, int target_node, unsigned int align,

		unsigned long long flags);

		struct resource *res, int target_node, unsigned int align);



enum dev_dax_subsys {

	DEV_DAX_BUS,

drivers/dax/dax-private.h

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ void dax_bus_exit(void); 
 * @dev: parent device backing this region

 * @align: allocation and mapping alignment for child dax devices

 * @res: physical address range of the region

 * @pfn_flags: identify whether the pfns are paged back or not

 */

struct dax_region {

	int id;
@@ -32,7 +31,6 @@ struct dax_region { 
	struct device *dev;

	unsigned int align;

	struct resource res;

	unsigned long long pfn_flags;

};



/**

drivers/dax/device.c

+3 −23
Original line number Diff line number Diff line
@@ -41,14 +41,6 @@ static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma, 
		return -EINVAL;

	}



	if ((dax_region->pfn_flags & (PFN_DEV|PFN_MAP)) == PFN_DEV

			&& (vma->vm_flags & VM_DONTCOPY) == 0) {

		dev_info_ratelimited(dev,

				"%s: %s: fail, dax range requires MADV_DONTFORK\n",

				current->comm, func);

		return -EINVAL;

	}



	if (!vma_is_dax(vma)) {

		dev_info_ratelimited(dev,

				"%s: %s: fail, vma is not DAX capable\n",
@@ -102,7 +94,7 @@ static vm_fault_t __dev_dax_pte_fault(struct dev_dax *dev_dax, 
		return VM_FAULT_SIGBUS;

	}



	*pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);

	*pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP);



	return vmf_insert_mixed(vmf->vma, vmf->address, *pfn);

}
@@ -127,12 +119,6 @@ static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax, 
		return VM_FAULT_SIGBUS;

	}



	/* dax pmd mappings require pfn_t_devmap() */

	if ((dax_region->pfn_flags & (PFN_DEV|PFN_MAP)) != (PFN_DEV|PFN_MAP)) {

		dev_dbg(dev, "region lacks devmap flags\n");

		return VM_FAULT_SIGBUS;

	}



	if (fault_size < dax_region->align)

		return VM_FAULT_SIGBUS;

	else if (fault_size > dax_region->align)
@@ -150,7 +136,7 @@ static vm_fault_t __dev_dax_pmd_fault(struct dev_dax *dev_dax, 
		return VM_FAULT_SIGBUS;

	}



	*pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);

	*pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP);



	return vmf_insert_pfn_pmd(vmf, *pfn, vmf->flags & FAULT_FLAG_WRITE);

}
@@ -177,12 +163,6 @@ static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax, 
		return VM_FAULT_SIGBUS;

	}



	/* dax pud mappings require pfn_t_devmap() */

	if ((dax_region->pfn_flags & (PFN_DEV|PFN_MAP)) != (PFN_DEV|PFN_MAP)) {

		dev_dbg(dev, "region lacks devmap flags\n");

		return VM_FAULT_SIGBUS;

	}



	if (fault_size < dax_region->align)

		return VM_FAULT_SIGBUS;

	else if (fault_size > dax_region->align)
@@ -200,7 +180,7 @@ static vm_fault_t __dev_dax_pud_fault(struct dev_dax *dev_dax, 
		return VM_FAULT_SIGBUS;

	}



	*pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);

	*pfn = phys_to_pfn_t(phys, PFN_DEV|PFN_MAP);



	return vmf_insert_pfn_pud(vmf, *pfn, vmf->flags & FAULT_FLAG_WRITE);

}

drivers/dax/hmem/hmem.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static int dax_hmem_probe(struct platform_device *pdev) 
	memcpy(&pgmap.res, res, sizeof(*res));



	dax_region = alloc_dax_region(dev, pdev->id, res, mri->target_node,

			PMD_SIZE, PFN_DEV|PFN_MAP);

			PMD_SIZE);

	if (!dax_region)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE