device-dax/kmem: move resource name tracking to drvdata

Towards removing the mode specific @dax_kmem_res attribute from the
generic 'struct dev_dax', and preparing for multi-range support, move
resource name tracking to driver data.  The memory for the resource name
needs to have its own lifetime separate from the device bind lifetime for
cases where the driver is unbound, but the kmem range could not be
unplugged from the page allocator.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Brice Goglin <Brice.Goglin@inria.fr>
Cc: Dave Jiang <dave.jiang@intel.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: Hulk Robot <hulkci@huawei.com>
Cc: Ingo Molnar <mingo@redhat.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: 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: 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/160106111639.30709.17624822766862009183.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c
index b0d6a99cf12dc17cdb580439d78c4869394b978f..6fe2cb1c5f7c18d82af65aea4ad5fac24d59a25d 100644 (file)
--- a/drivers/dax/kmem.c
+++ b/drivers/dax/kmem.c
@@ -34,7 +34,7 @@ int dev_dax_kmem_probe(struct device *dev)
        struct dev_dax *dev_dax = to_dev_dax(dev);
        struct range range = dax_kmem_range(dev_dax);
        struct resource *new_res;
-       const char *new_res_name;
+       char *res_name;
        int numa_node;
        int rc;
 
@@ -51,15 +51,15 @@ int dev_dax_kmem_probe(struct device *dev)
                return -EINVAL;
        }
 
-       new_res_name = kstrdup(dev_name(dev), GFP_KERNEL);
-       if (!new_res_name)
+       res_name = kstrdup(dev_name(dev), GFP_KERNEL);
+       if (!res_name)
                return -ENOMEM;
 
        /* Region is permanently reserved if hotremove fails. */
-       new_res = request_mem_region(range.start, range_len(&range), new_res_name);
+       new_res = request_mem_region(range.start, range_len(&range), res_name);
        if (!new_res) {
                dev_warn(dev, "could not reserve region [%#llx-%#llx]\n", range.start, range.end);
-               kfree(new_res_name);
+               kfree(res_name);
                return -EBUSY;
        }
 
@@ -80,9 +80,11 @@ int dev_dax_kmem_probe(struct device *dev)
        if (rc) {
                release_resource(new_res);
                kfree(new_res);
-               kfree(new_res_name);
+               kfree(res_name);
                return rc;
        }
+
+       dev_set_drvdata(dev, res_name);
        dev_dax->dax_kmem_res = new_res;
 
        return 0;
@@ -94,7 +96,7 @@ static int dev_dax_kmem_remove(struct device *dev)
        struct dev_dax *dev_dax = to_dev_dax(dev);
        struct range range = dax_kmem_range(dev_dax);
        struct resource *res = dev_dax->dax_kmem_res;
-       const char *res_name = res->name;
+       const char *res_name = dev_get_drvdata(dev);
        int rc;
 
        /*