Commit 450c6633 authored Nov 28, 2016 by Dan Williams

libnvdimm: use consistent naming for request_mem_region()



Here is an example /proc/iomem listing for a system with 2 namespaces,
one in "sector" mode and one in "memory" mode:

  1fc000000-2fbffffff : Persistent Memory (legacy)
    1fc000000-2fbffffff : namespace1.0
  340000000-34fffffff : Persistent Memory
    340000000-34fffffff : btt0.1

Here is the corresponding ndctl listing:

  # ndctl list
  [
    {
      "dev":"namespace1.0",
      "mode":"memory",
      "size":4294967296,
      "blockdev":"pmem1"
    },
    {
      "dev":"namespace0.0",
      "mode":"sector",
      "size":267091968,
      "uuid":"f7594f86-badb-4592-875f-ded577da2eaf",
      "sector_size":4096,
      "blockdev":"pmem0s"
    }
  ]

Notice that the ndctl listing is purely in terms of namespace devices,
while the iomem listing leaks the internal "btt0.1" implementation
detail. Given that ndctl requires the namespace device name to change
the mode, for example:

  # ndctl create-namespace --reconfig=namespace0.0 --mode=raw --force

...use the namespace name in the iomem listing to keep the claiming
device name consistent across different mode settings.

Cc: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

parent 2d9a0274

drivers/dax/pmem.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,8 @@ static int dax_pmem_probe(struct device *dev)
		pfn_sb = nd_pfn->pfn_sb;

		if (!devm_request_mem_region(dev, nsio->res.start,
		resource_size(&nsio->res), dev_name(dev))) {
		resource_size(&nsio->res),
		dev_name(&ndns->dev))) {
		dev_warn(dev, "could not reserve region %pR\n", &nsio->res);
		return -EBUSY;
		}

drivers/nvdimm/claim.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ int devm_nsio_enable(struct device dev, struct nd_namespace_io nsio)

		nsio->size = resource_size(res);
		if (!devm_request_mem_region(dev, res->start, resource_size(res),
		dev_name(dev))) {
		dev_name(&ndns->dev))) {
		dev_warn(dev, "could not reserve region %pR\n", res);
		return -EBUSY;
		}

drivers/nvdimm/pmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -266,7 +266,7 @@ static int pmem_attach_disk(struct device *dev,
		dev_warn(dev, "unable to guarantee persistence of writes\n");

		if (!devm_request_mem_region(dev, res->start, resource_size(res),
		dev_name(dev))) {
		dev_name(&ndns->dev))) {
		dev_warn(dev, "could not reserve region %pR\n", res);
		return -EBUSY;
		}

Admin message