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

device-dax: introduce 'struct dev_dax' typed-driver operations 



In preparation for introducing seed devices the dax-bus core needs to be
able to intercept ->probe() and ->remove() operations.  Towards that end
arrange for the bus and drivers to switch from raw 'struct device' driver
operations to 'struct dev_dax' typed operations.

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Brice Goglin <Brice.Goglin@inria.fr>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jia He <justin.he@arm.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
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: Catalin Marinas <catalin.marinas@arm.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: "Jérôme Glisse" <jglisse@redhat.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: 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/160106113357.30709.4541750544799737855.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c2f3011e

drivers/dax/bus.c

+18 −0
Original line number Diff line number Diff line
@@ -135,10 +135,28 @@ static bool is_static(struct dax_region *dax_region) 
	return (dax_region->res.flags & IORESOURCE_DAX_STATIC) != 0;

}



static int dax_bus_probe(struct device *dev)

{

	struct dax_device_driver *dax_drv = to_dax_drv(dev->driver);

	struct dev_dax *dev_dax = to_dev_dax(dev);



	return dax_drv->probe(dev_dax);

}



static int dax_bus_remove(struct device *dev)

{

	struct dax_device_driver *dax_drv = to_dax_drv(dev->driver);

	struct dev_dax *dev_dax = to_dev_dax(dev);



	return dax_drv->remove(dev_dax);

}



static struct bus_type dax_bus_type = {

	.name = "dax",

	.uevent = dax_bus_uevent,

	.match = dax_bus_match,

	.probe = dax_bus_probe,

	.remove = dax_bus_remove,

	.drv_groups = dax_drv_groups,

};

drivers/dax/bus.h

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ struct dax_device_driver { 
	struct device_driver drv;

	struct list_head ids;

	int match_always;

	int (*probe)(struct dev_dax *dev);

	int (*remove)(struct dev_dax *dev);

};



int __dax_driver_register(struct dax_device_driver *dax_drv,
@@ -48,7 +50,7 @@ void dax_driver_unregister(struct dax_device_driver *dax_drv); 
void kill_dev_dax(struct dev_dax *dev_dax);



#if IS_ENABLED(CONFIG_DEV_DAX_PMEM_COMPAT)

int dev_dax_probe(struct device *dev);

int dev_dax_probe(struct dev_dax *dev_dax);

#endif



/*

drivers/dax/device.c

+5 −7
Original line number Diff line number Diff line
@@ -392,11 +392,11 @@ static void dev_dax_kill(void *dev_dax) 
	kill_dev_dax(dev_dax);

}



int dev_dax_probe(struct device *dev)

int dev_dax_probe(struct dev_dax *dev_dax)

{

	struct dev_dax *dev_dax = to_dev_dax(dev);

	struct dax_device *dax_dev = dev_dax->dax_dev;

	struct range *range = &dev_dax->range;

	struct device *dev = &dev_dax->dev;

	struct dev_pagemap *pgmap;

	struct inode *inode;

	struct cdev *cdev;
@@ -446,17 +446,15 @@ int dev_dax_probe(struct device *dev) 
}

EXPORT_SYMBOL_GPL(dev_dax_probe);



static int dev_dax_remove(struct device *dev)

static int dev_dax_remove(struct dev_dax *dev_dax)

{

	/* all probe actions are unwound by devm */

	return 0;

}



static struct dax_device_driver device_dax_driver = {

	.drv = {

	.probe = dev_dax_probe,

	.remove = dev_dax_remove,

	},

	.match_always = 1,

};

drivers/dax/kmem.c

+8 −10
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ static struct range dax_kmem_range(struct dev_dax *dev_dax) 
	return range;

}



int dev_dax_kmem_probe(struct device *dev)

static int dev_dax_kmem_probe(struct dev_dax *dev_dax)

{

	struct dev_dax *dev_dax = to_dev_dax(dev);

	struct range range = dax_kmem_range(dev_dax);

	struct device *dev = &dev_dax->dev;

	struct resource *res;

	char *res_name;

	int numa_node;
@@ -88,12 +88,12 @@ int dev_dax_kmem_probe(struct device *dev) 
}



#ifdef CONFIG_MEMORY_HOTREMOVE

static int dev_dax_kmem_remove(struct device *dev)

static int dev_dax_kmem_remove(struct dev_dax *dev_dax)

{

	struct dev_dax *dev_dax = to_dev_dax(dev);

	int rc;

	struct device *dev = &dev_dax->dev;

	struct range range = dax_kmem_range(dev_dax);

	const char *res_name = dev_get_drvdata(dev);

	int rc;



	/*

	 * We have one shot for removing memory, if some memory blocks were not
@@ -116,7 +116,7 @@ static int dev_dax_kmem_remove(struct device *dev) 
	return 0;

}

#else

static int dev_dax_kmem_remove(struct device *dev)

static int dev_dax_kmem_remove(struct dev_dax *dev_dax)

{

	/*

	 * Without hotremove purposely leak the request_mem_region() for the
@@ -131,10 +131,8 @@ static int dev_dax_kmem_remove(struct device *dev) 
#endif /* CONFIG_MEMORY_HOTREMOVE */



static struct dax_device_driver device_dax_kmem_driver = {

	.drv = {

	.probe = dev_dax_kmem_probe,

	.remove = dev_dax_kmem_remove,

	},

};



static int __init dax_kmem_init(void)

drivers/dax/pmem/compat.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static int dax_pmem_compat_probe(struct device *dev) 
		return -ENOMEM;



	device_lock(&dev_dax->dev);

	rc = dev_dax_probe(&dev_dax->dev);

	rc = dev_dax_probe(dev_dax);

	device_unlock(&dev_dax->dev);



	devres_close_group(&dev_dax->dev, dev_dax);

CRA Git | Maintained and supported by SUSTech CRA and CCSE