libnvdimm/btt: Fix LBA masking during 'free list' population

The Linux BTT implementation assumes that log entries will never have
the 'zero' flag set, and indeed it never sets that flag for log entries
itself.

However, the UEFI spec is ambiguous on the exact format of the LBA field
of a log entry, specifically as to whether it should include the
additional flag bits or not. While a zero bit doesn't make sense in the
context of a log entry, other BTT implementations might still have it set.

If an implementation does happen to have it set, we would happily read
it in as the next block to write to for writes. Since a high bit is set,
it pushes the block number out of the range of an 'arena', and we fail
such a write with an EIO.

Follow the robustness principle, and tolerate such implementations by
stripping out the zero flag when populating the free list during
initialization. Additionally, use the same stripped out entries for
detection of incomplete writes and map restoration that happens at this
stage.

Add a sysfs file 'log_zero_flags' that indicates the ability to accept
such a layout to userspace applications. This enables 'ndctl
check-namespace' to recognize whether the kernel is able to handle zero
flags, or whether it should attempt a fix-up under the --repair option.

Cc: Dan Williams <dan.j.williams@intel.com>
Reported-by: Dexuan Cui <decui@microsoft.com>
Reported-by: Pedro d'Aquino Filocre F S Barbuda <pbarbuda@microsoft.com>
Tested-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index cd4fa87ea48c5a5cb1db85c4a66859b4d00448ce..4671776f56239afd5d2155431779ab4f0f3836a4 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -542,8 +542,8 @@ static int arena_clear_freelist_error(struct arena_info *arena, u32 lane)
 static int btt_freelist_init(struct arena_info *arena)
 {
        int new, ret;
-       u32 i, map_entry;
        struct log_entry log_new;
+       u32 i, map_entry, log_oldmap, log_newmap;
 
        arena->freelist = kcalloc(arena->nfree, sizeof(struct free_entry),
                                        GFP_KERNEL);
@@ -555,16 +555,22 @@ static int btt_freelist_init(struct arena_info *arena)
                if (new < 0)
                        return new;
 
+               /* old and new map entries with any flags stripped out */
+               log_oldmap = ent_lba(le32_to_cpu(log_new.old_map));
+               log_newmap = ent_lba(le32_to_cpu(log_new.new_map));
+
                /* sub points to the next one to be overwritten */
                arena->freelist[i].sub = 1 - new;
                arena->freelist[i].seq = nd_inc_seq(le32_to_cpu(log_new.seq));
-               arena->freelist[i].block = le32_to_cpu(log_new.old_map);
+               arena->freelist[i].block = log_oldmap;
 
                /*
                 * FIXME: if error clearing fails during init, we want to make
                 * the BTT read-only
                 */
-               if (ent_e_flag(log_new.old_map)) {
+               if (ent_e_flag(log_new.old_map) &&
+                               !ent_normal(log_new.old_map)) {
+                       arena->freelist[i].has_err = 1;
                        ret = arena_clear_freelist_error(arena, i);
                        if (ret)
                                dev_err_ratelimited(to_dev(arena),
@@ -572,7 +578,7 @@ static int btt_freelist_init(struct arena_info *arena)
                }
 
                /* This implies a newly created or untouched flog entry */
-               if (log_new.old_map == log_new.new_map)
+               if (log_oldmap == log_newmap)
                        continue;
 
                /* Check if map recovery is needed */
@@ -580,8 +586,15 @@ static int btt_freelist_init(struct arena_info *arena)
                                NULL, NULL, 0);
                if (ret)
                        return ret;
-               if ((le32_to_cpu(log_new.new_map) != map_entry) &&
-                               (le32_to_cpu(log_new.old_map) == map_entry)) {
+
+               /*
+                * The map_entry from btt_read_map is stripped of any flag bits,
+                * so use the stripped out versions from the log as well for
+                * testing whether recovery is needed. For restoration, use the
+                * 'raw' version of the log entries as that captured what we
+                * were going to write originally.
+                */
+               if ((log_newmap != map_entry) && (log_oldmap == map_entry)) {
                        /*
                         * Last transaction wrote the flog, but wasn't able
                         * to complete the map write. So fix up the map.

diff --git a/drivers/nvdimm/btt.h b/drivers/nvdimm/btt.h
index db3cb6d4d0d495df8978494ff6619e2923478d32..ddff49c707b0af537b2e66bd8b23031f41d5e625 100644 (file)
--- a/drivers/nvdimm/btt.h
+++ b/drivers/nvdimm/btt.h
@@ -44,6 +44,8 @@
 #define ent_e_flag(ent) (!!(ent & MAP_ERR_MASK))
 #define ent_z_flag(ent) (!!(ent & MAP_TRIM_MASK))
 #define set_e_flag(ent) (ent |= MAP_ERR_MASK)
+/* 'normal' is both e and z flags set */
+#define ent_normal(ent) (ent_e_flag(ent) && ent_z_flag(ent))
 
 enum btt_init_state {
        INIT_UNCHECKED = 0,

diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
index 795ad4ff35cafdb91ac7c9629aa63ad22a87f1f9..b72a303176c70962e04f8304a816c78f812512c1 100644 (file)
--- a/drivers/nvdimm/btt_devs.c
+++ b/drivers/nvdimm/btt_devs.c
@@ -159,11 +159,19 @@ static ssize_t size_show(struct device *dev,
 }
 static DEVICE_ATTR_RO(size);
 
+static ssize_t log_zero_flags_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "Y\n");
+}
+static DEVICE_ATTR_RO(log_zero_flags);
+
 static struct attribute *nd_btt_attributes[] = {
        &dev_attr_sector_size.attr,
        &dev_attr_namespace.attr,
        &dev_attr_uuid.attr,
        &dev_attr_size.attr,
+       &dev_attr_log_zero_flags.attr,
        NULL,
 };