[PATCH] nfit, libnvdimm, region: export 'position' in mapping info

[Dan Williams]

It is useful to be able to know the position of a DIMM in an
interleave-set. Consider the case where the order of the DIMMs changes
causing a namespace to be invalidated because the interleave-set cookie no
longer matches. If the before and after state of each DIMM position is
known this state debugged by the system owner.

Signed-off-by: Dan Williams 
---
 drivers/acpi/nfit/core.c |   24 
 drivers/nvdimm/nd.h  |1 +
 drivers/nvdimm/region_devs.c |6 --
 include/linux/libnvdimm.h|1 +
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 19182d091587..be231a549eb0 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1835,6 +1835,30 @@ static int acpi_nfit_init_interleave_set(struct 
acpi_nfit_desc *acpi_desc,
cmp_map_compat, NULL);
nd_set->altcookie = nd_fletcher64(info, sizeof_nfit_set_info(nr), 0);
 
+   /* record the result of the sort for the mapping position */
+   for (i = 0; i < nr; i++) {
+   struct nfit_set_info_map2 *map2 = >mapping[i];
+   int j;
+
+   for (j = 0; j < nr; j++) {
+   struct nd_mapping_desc *mapping = _desc->mapping[j];
+   struct nvdimm *nvdimm = mapping->nvdimm;
+   struct nfit_mem *nfit_mem = 
nvdimm_provider_data(nvdimm);
+
+   if (map2->serial_number
+   == nfit_mem->dcr->serial_number &&
+   map2->vendor_id
+   == nfit_mem->dcr->vendor_id &&
+   map2->manufacturing_date
+   == nfit_mem->dcr->manufacturing_date &&
+   map2->manufacturing_location
+   == nfit_mem->dcr->manufacturing_location) {
+   mapping->position = i;
+   break;
+   }
+   }
+   }
+
ndr_desc->nd_set = nd_set;
devm_kfree(dev, info);
devm_kfree(dev, info2);
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index e9fa9e84b364..a08fc2e24fb3 100644
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -134,6 +134,7 @@ struct nd_mapping {
struct nvdimm *nvdimm;
u64 start;
u64 size;
+   int position;
struct list_head labels;
struct mutex lock;
/*
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index 5954cfbea3fc..829d760f651c 100644
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -723,8 +723,9 @@ static ssize_t mappingN(struct device *dev, char *buf, int 
n)
nd_mapping = _region->mapping[n];
nvdimm = nd_mapping->nvdimm;
 
-   return sprintf(buf, "%s,%llu,%llu\n", dev_name(>dev),
-   nd_mapping->start, nd_mapping->size);
+   return sprintf(buf, "%s,%llu,%llu,%d\n", dev_name(>dev),
+   nd_mapping->start, nd_mapping->size,
+   nd_mapping->position);
 }
 
 #define REGION_MAPPING(idx) \
@@ -965,6 +966,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus 
*nvdimm_bus,
nd_region->mapping[i].nvdimm = nvdimm;
nd_region->mapping[i].start = mapping->start;
nd_region->mapping[i].size = mapping->size;
+   nd_region->mapping[i].position = mapping->position;
INIT_LIST_HEAD(_region->mapping[i].labels);
mutex_init(_region->mapping[i].lock);
 
diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
index f3d3e6af8838..9b8d81a7b80e 100644
--- a/include/linux/libnvdimm.h
+++ b/include/linux/libnvdimm.h
@@ -87,6 +87,7 @@ struct nd_mapping_desc {
struct nvdimm *nvdimm;
u64 start;
u64 size;
+   int position;
 };
 
 struct nd_region_desc {

[PATCH] nfit, libnvdimm, region: export 'position' in mapping info

[Dan Williams]

It is useful to be able to know the position of a DIMM in an
interleave-set. Consider the case where the order of the DIMMs changes
causing a namespace to be invalidated because the interleave-set cookie no
longer matches. If the before and after state of each DIMM position is
known this state debugged by the system owner.

Signed-off-by: Dan Williams 
---
 drivers/acpi/nfit/core.c |   24 
 drivers/nvdimm/nd.h  |1 +
 drivers/nvdimm/region_devs.c |6 --
 include/linux/libnvdimm.h|1 +
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 19182d091587..be231a549eb0 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1835,6 +1835,30 @@ static int acpi_nfit_init_interleave_set(struct 
acpi_nfit_desc *acpi_desc,
cmp_map_compat, NULL);
nd_set->altcookie = nd_fletcher64(info, sizeof_nfit_set_info(nr), 0);
 
+   /* record the result of the sort for the mapping position */
+   for (i = 0; i < nr; i++) {
+   struct nfit_set_info_map2 *map2 = >mapping[i];
+   int j;
+
+   for (j = 0; j < nr; j++) {
+   struct nd_mapping_desc *mapping = _desc->mapping[j];
+   struct nvdimm *nvdimm = mapping->nvdimm;
+   struct nfit_mem *nfit_mem = 
nvdimm_provider_data(nvdimm);
+
+   if (map2->serial_number
+   == nfit_mem->dcr->serial_number &&
+   map2->vendor_id
+   == nfit_mem->dcr->vendor_id &&
+   map2->manufacturing_date
+   == nfit_mem->dcr->manufacturing_date &&
+   map2->manufacturing_location
+   == nfit_mem->dcr->manufacturing_location) {
+   mapping->position = i;
+   break;
+   }
+   }
+   }
+
ndr_desc->nd_set = nd_set;
devm_kfree(dev, info);
devm_kfree(dev, info2);
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index e9fa9e84b364..a08fc2e24fb3 100644
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -134,6 +134,7 @@ struct nd_mapping {
struct nvdimm *nvdimm;
u64 start;
u64 size;
+   int position;
struct list_head labels;
struct mutex lock;
/*
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index 5954cfbea3fc..829d760f651c 100644
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -723,8 +723,9 @@ static ssize_t mappingN(struct device *dev, char *buf, int 
n)
nd_mapping = _region->mapping[n];
nvdimm = nd_mapping->nvdimm;
 
-   return sprintf(buf, "%s,%llu,%llu\n", dev_name(>dev),
-   nd_mapping->start, nd_mapping->size);
+   return sprintf(buf, "%s,%llu,%llu,%d\n", dev_name(>dev),
+   nd_mapping->start, nd_mapping->size,
+   nd_mapping->position);
 }
 
 #define REGION_MAPPING(idx) \
@@ -965,6 +966,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus 
*nvdimm_bus,
nd_region->mapping[i].nvdimm = nvdimm;
nd_region->mapping[i].start = mapping->start;
nd_region->mapping[i].size = mapping->size;
+   nd_region->mapping[i].position = mapping->position;
INIT_LIST_HEAD(_region->mapping[i].labels);
mutex_init(_region->mapping[i].lock);
 
diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
index f3d3e6af8838..9b8d81a7b80e 100644
--- a/include/linux/libnvdimm.h
+++ b/include/linux/libnvdimm.h
@@ -87,6 +87,7 @@ struct nd_mapping_desc {
struct nvdimm *nvdimm;
u64 start;
u64 size;
+   int position;
 };
 
 struct nd_region_desc {