iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfit, libnvdimm, region: export 'position' in mapping info

Browse Source 
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 <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2017-08-04 17:20:16 -07:00
parent 0dd6964306
commit 401c0a19c6
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/acpi/nfit/core.c
View File

@ -1835,6 +1835,30 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
cmp_map_compat, NULL); cmp_map_compat, NULL);
nd_set->altcookie = nd_fletcher64(info, sizeof_nfit_set_info(nr), 0); 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 = &info2->mapping[i];
int j;
for (j = 0; j < nr; j++) {
struct nd_mapping_desc *mapping = &ndr_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; ndr_desc->nd_set = nd_set;
devm_kfree(dev, info); devm_kfree(dev, info);
devm_kfree(dev, info2); devm_kfree(dev, info2);

1
drivers/nvdimm/nd.h
View File

@ -134,6 +134,7 @@ struct nd_mapping {
struct nvdimm *nvdimm; struct nvdimm *nvdimm;
u64 start; u64 start;
u64 size; u64 size;
int position;
struct list_head labels; struct list_head labels;
struct mutex lock; struct mutex lock;
/* /*

6
drivers/nvdimm/region_devs.c
View File

@ -723,8 +723,9 @@ static ssize_t mappingN(struct device *dev, char *buf, int n)
nd_mapping = &nd_region->mapping[n]; nd_mapping = &nd_region->mapping[n];
nvdimm = nd_mapping->nvdimm; nvdimm = nd_mapping->nvdimm;
return sprintf(buf, "%s,%llu,%llu\n", dev_name(&nvdimm->dev), return sprintf(buf, "%s,%llu,%llu,%d\n", dev_name(&nvdimm->dev),
nd_mapping->start, nd_mapping->size); nd_mapping->start, nd_mapping->size,
nd_mapping->position);
} }
#define REGION_MAPPING(idx) \ #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].nvdimm = nvdimm;
nd_region->mapping[i].start = mapping->start; nd_region->mapping[i].start = mapping->start;
nd_region->mapping[i].size = mapping->size; nd_region->mapping[i].size = mapping->size;
nd_region->mapping[i].position = mapping->position;
INIT_LIST_HEAD(&nd_region->mapping[i].labels); INIT_LIST_HEAD(&nd_region->mapping[i].labels);
mutex_init(&nd_region->mapping[i].lock); mutex_init(&nd_region->mapping[i].lock);

1
include/linux/libnvdimm.h
View File

@ -87,6 +87,7 @@ struct nd_mapping_desc {
struct nvdimm *nvdimm; struct nvdimm *nvdimm;
u64 start; u64 start;
u64 size; u64 size;
int position;
}; };
struct nd_region_desc { struct nd_region_desc {