Merge ~rafaeldtinoco/ubuntu/+source/ndctl:lp1811785-disco into ubuntu/+source/ndctl:ubuntu/disco-devel

[Rafael David Tinoco]

[Rafael David Tinoco (rafaeldtinoco)]

An XML file for a KVM guest (example) can be found here:

https://bugs.launchpad.net/ubuntu/+source/ndctl/+bug/1853506/comments/2

And an example on how to test ndctl can be found here:

https://bugs.launchpad.net/ubuntu/+source/ndctl/+bug/1853506/comments/1

[Rafael David Tinoco (rafaeldtinoco)]

PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1811785

[Christian Ehrhardt  (paelzer)]

I think the fix itself is good, but a few things need cleanup.

changelog: we usually name the patch before the colon:
so instead
     * ndctl/init-labels: Fix label slot accounting per UEFI 2.7 (LP: #1811785)
maybe:
     * d/p/ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch: Fix label slot accounting per UEFI 2.7 (LP: #1811785)

Furthermore the bug should get a proper SRU Template before sponsoring it into -unapproved.

review: Needs Fixing

[Rafael David Tinoco (rafaeldtinoco)]

I'm removing it from canonical-server view based on:

https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1811785/comments/21

and

https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1811785/comments/22

If end-user chooses to continue the SRU, I'll get back to this.

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

No activity on this one, setting rejected to get off our overview.
Please revive if needed.

Unmerged commits

9d84733... by Rafael David Tinoco on 2019-11-23

update-maintainer

ca31b1a... by Rafael David Tinoco on 2019-11-23

changelog

862b738... by Rafael David Tinoco on 2019-11-23

 * ndctl/init-labels: Fix label slot accounting per UEFI 2.7 (LP: #1811785)

diff --git a/debian/changelog b/debian/changelog
index 393bc2e..89168f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ndctl (63-1.3ubuntu1) disco; urgency=medium
+
+  * d/p/ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch (LP: #1811785)
+
+ -- Rafael David Tinoco <[e-mail]>  Sat, 23 Nov 2019 00:32:03 +0000
+
 ndctl (63-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index e8cc763..c5cfbaf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: ndctl
-Maintainer: Breno Leitao <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Breno Leitao <[e-mail]>
 Section: libs
 Priority: optional
 Standards-Version: 4.2.1
diff --git a/debian/patches/ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch b/debian/patches/ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch
new file mode 100644
index 0000000..ef7f00f
--- /dev/null
+++ b/debian/patches/ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch
@@ -0,0 +1,92 @@
+From 9c6aae5635ebe8d0ca56a3ed949eef88639cb1b5 Mon Sep 17 00:00:00 2001
+From: Dan Williams <[e-mail]>
+Date: Mon, 14 Jan 2019 19:51:45 -0800
+Subject: [PATCH] ndctl/init-labels: Fix label slot accounting per UEFI 2.7
+
+Quoting from Linux kernel commit 9e694d9c18dd "libnvdimm, label: change
+nvdimm_num_label_slots per UEFI 2.7":
+
+    sizeof_namespace_index() fails when NVDIMM devices have the minimum
+    1024 bytes label storage area.  nvdimm_num_label_slots() returns 3
+    slots while the area is only big enough for 2 slots.
+
+    Change nvdimm_num_label_slots() to calculate a number of label slots
+    according to UEFI 2.7 spec.
+
+Without this fix attempts to initialize labels on a small (1K) label
+area results in the following:
+
+libndctl: sizeof_namespace_index: nmem2: label area (1024) too small to host (128 byte) labels
+libndctl: sizeof_namespace_index: nmem2: label area (1024) too small to host (256 byte) labels
+
+Based on an original patch by Toshi Kani
+Fixes: bdaec95463ca ("ndctl: introduce ndctl_dimm_{validate_labels,init_labels}")
+Reported-by: Sujith Pandel <[e-mail]>
+Link: https://github.com/pmem/ndctl/issues/78
+Signed-off-by: Dan Williams <[e-mail]>
+Signed-off-by: Vishal Verma <[e-mail]>
+---
+ ndctl/lib/dimm.c | 35 +++++++++++++++++++++++++----------
+ 1 file changed, 25 insertions(+), 10 deletions(-)
+
+diff --git a/ndctl/lib/dimm.c b/ndctl/lib/dimm.c
+index 5e41734..634999f 100644
+--- a/ndctl/lib/dimm.c
++++ b/ndctl/lib/dimm.c
+@@ -66,9 +66,27 @@ static unsigned int sizeof_namespace_label(struct nvdimm_data *ndd)
+ 	return ndctl_dimm_sizeof_namespace_label(to_dimm(ndd));
+ }
+ 
++static size_t __sizeof_namespace_index(u32 nslot)
++{
++	return ALIGN(sizeof(struct namespace_index) + DIV_ROUND_UP(nslot, 8),
++			NSINDEX_ALIGN);
++}
++
++static int __nvdimm_num_label_slots(struct nvdimm_data *ndd,
++		size_t index_size)
++{
++	return (ndd->config_size - index_size * 2) /
++		sizeof_namespace_label(ndd);
++}
++
+ static int nvdimm_num_label_slots(struct nvdimm_data *ndd)
+ {
+-	return ndd->config_size / (sizeof_namespace_label(ndd) + 1);
++	u32 tmp_nslot, n;
++
++	tmp_nslot = ndd->config_size / sizeof_namespace_label(ndd);
++	n = __sizeof_namespace_index(tmp_nslot) / NSINDEX_ALIGN;
++
++	return __nvdimm_num_label_slots(ndd, NSINDEX_ALIGN * n);
+ }
+ 
+ static unsigned int sizeof_namespace_index(struct nvdimm_data *ndd)
+@@ -78,18 +96,15 @@ static unsigned int sizeof_namespace_index(struct nvdimm_data *ndd)
+ 	struct ndctl_ctx *ctx = ndctl_dimm_get_ctx(dimm);
+ 
+ 	/*
+-	 * The minimum index space is 512 bytes, with that amount of
+-	 * index we can describe ~1400 labels which is less than a byte
+-	 * of overhead per label.  Round up to a byte of overhead per
+-	 * label and determine the size of the index region.  Yes, this
+-	 * starts to waste space at larger config_sizes, but it's
+-	 * unlikely we'll ever see anything but 128K.
++	 * Per UEFI 2.7, the minimum size of the Label Storage Area is
++	 * large enough to hold 2 index blocks and 2 labels.  The
++	 * minimum index block size is 256 bytes, and the minimum label
++	 * size is 256 bytes.
+ 	 */
+ 	nslot = nvdimm_num_label_slots(ndd);
+ 	space = ndd->config_size - nslot * sizeof_namespace_label(ndd);
+-	size = ALIGN(sizeof(struct namespace_index) + DIV_ROUND_UP(nslot, 8),
+-			NSINDEX_ALIGN) * 2;
+-	if (size <= space)
++	size = __sizeof_namespace_index(nslot) * 2;
++	if (size <= space && nslot >= 2)
+ 		return size / 2;
+ 
+ 	err(ctx, "%s: label area (%ld) too small to host (%d byte) labels\n",
+-- 
+2.24.0
+
diff --git a/debian/patches/series b/debian/patches/series
index fc2b1e8..d835c28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 avoid_modprobe_test.patch
 include_errno.h.patch
+ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch