Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm fixes from Dan Williams:
 "A fix and regression test case for nvdimm namespace label
  compatibility.

  Details:

   - An "nvdimm namespace label" is metadata on an nvdimm that
     provisions dimm capacity into a "namespace" that can host a block
     device / dax-filesytem, or a device-dax character device.

     A namespace is an object that other operating environment and
     platform firmware needs to comprehend for capabilities like booting
     from an nvdimm.

     The label metadata contains a checksum that Linux was not
     calculating correctly leading to other environments rejecting the
     Linux label.

   These have received a build success notification from the kbuild
   robot, and a positive test result from Nick who reported the problem"

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  nfit, libnvdimm: fix interleave set cookie calculation
  tools/testing/nvdimm: make iset cookie predictable

1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index ce3e8dfa10ad..1b481a5fb966 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -1700,6 +1700,7 @@ static int select_pmem_id(struct nd_region *nd_region, u8 *pmem_id)
 struct device *create_namespace_pmem(struct nd_region *nd_region,
                 struct nd_namespace_label *nd_label)
 {
+        u64 altcookie = nd_region_interleave_set_altcookie(nd_region);
         u64 cookie = nd_region_interleave_set_cookie(nd_region);
         struct nd_label_ent *label_ent;
         struct nd_namespace_pmem *nspm;
@@ -1718,7 +1719,11 @@ struct device *create_namespace_pmem(struct nd_region *nd_region,
         if (__le64_to_cpu(nd_label->isetcookie) != cookie) {
                 dev_dbg(&nd_region->dev, "invalid cookie in label: %pUb\n",
                                 nd_label->uuid);
-                return ERR_PTR(-EAGAIN);
+                if (__le64_to_cpu(nd_label->isetcookie) != altcookie)
+                        return ERR_PTR(-EAGAIN);
+
+                dev_dbg(&nd_region->dev, "valid altcookie in label: %pUb\n",
+                                nd_label->uuid);
         }
 
         nspm = kzalloc(sizeof(*nspm), GFP_KERNEL);
@@ -1733,9 +1738,14 @@ struct device *create_namespace_pmem(struct nd_region *nd_region,
         res->name = dev_name(&nd_region->dev);
         res->flags = IORESOURCE_MEM;
 
-        for (i = 0; i < nd_region->ndr_mappings; i++)
-                if (!has_uuid_at_pos(nd_region, nd_label->uuid, cookie, i))
-                        break;
+        for (i = 0; i < nd_region->ndr_mappings; i++) {
+                if (has_uuid_at_pos(nd_region, nd_label->uuid, cookie, i))
+                        continue;
+                if (has_uuid_at_pos(nd_region, nd_label->uuid, altcookie, i))
+                        continue;
+                break;
+        }
+
         if (i < nd_region->ndr_mappings) {
                 struct nvdimm_drvdata *ndd = to_ndd(&nd_region->mapping[i]);