1
diff --git a/debian/changelog b/debian/changelog
2
index 00774c3..f9e03a6 100644
3
--- a/debian/changelog
4
+++ b/debian/changelog
5
@@ -1,3 +1,9 @@
6
1
ndctl (61.2-0ubuntu2~18.04.1) bionic; urgency=medium
7
2
8
3
  * d/p/ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch (LP: #1811785)
9
4
10
5
 -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Sat, 23 Nov 2019 00:44:53 +0000
11
6
12
1
ndctl (61.2-0ubuntu1~18.04.1) bionic; urgency=medium
7
ndctl (61.2-0ubuntu1~18.04.1) bionic; urgency=medium
13
2
8
14
3
  * Backport to bionic (LP: #1781268)
9
  * Backport to bionic (LP: #1781268)
15
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
16
4
new file mode 100644
10
new file mode 100644
17
index 0000000..ea32ae0
18
--- /dev/null
19
+++ b/debian/patches/ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch
20
@@ -0,0 +1,92 @@
21
1
From 9c6aae5635ebe8d0ca56a3ed949eef88639cb1b5 Mon Sep 17 00:00:00 2001
22
2
From: Dan Williams <dan.j.williams@intel.com>
23
3
Date: Mon, 14 Jan 2019 19:51:45 -0800
24
4
Subject: [PATCH] ndctl/init-labels: Fix label slot accounting per UEFI 2.7
25
5
26
6
Quoting from Linux kernel commit 9e694d9c18dd "libnvdimm, label: change
27
7
nvdimm_num_label_slots per UEFI 2.7":
28
8
29
9
    sizeof_namespace_index() fails when NVDIMM devices have the minimum
30
10
    1024 bytes label storage area.  nvdimm_num_label_slots() returns 3
31
11
    slots while the area is only big enough for 2 slots.
32
12
33
13
    Change nvdimm_num_label_slots() to calculate a number of label slots
34
14
    according to UEFI 2.7 spec.
35
15
36
16
Without this fix attempts to initialize labels on a small (1K) label
37
17
area results in the following:
38
18
39
19
libndctl: sizeof_namespace_index: nmem2: label area (1024) too small to host (128 byte) labels
40
20
libndctl: sizeof_namespace_index: nmem2: label area (1024) too small to host (256 byte) labels
41
21
42
22
Based on an original patch by Toshi Kani
43
23
Fixes: bdaec95463ca ("ndctl: introduce ndctl_dimm_{validate_labels,init_labels}")
44
24
Reported-by: Sujith Pandel <sujith_pandel@dell.com>
45
25
Link: https://github.com/pmem/ndctl/issues/78
46
26
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
47
27
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
48
28
---
49
29
 ndctl/lib/dimm.c | 35 +++++++++++++++++++++++++----------
50
30
 1 file changed, 25 insertions(+), 10 deletions(-)
51
31
52
32
diff --git a/ndctl/lib/dimm.c b/ndctl/lib/dimm.c
53
33
index b3e032e..108d795 100644
54
34
--- a/ndctl/lib/dimm.c
55
35
+++ b/ndctl/lib/dimm.c
56
36
@@ -66,9 +66,27 @@ static unsigned int sizeof_namespace_label(struct nvdimm_data *ndd)
57
37
 	return ndctl_dimm_sizeof_namespace_label(to_dimm(ndd));
58
38
 }
59
39
 
60
40
+static size_t __sizeof_namespace_index(u32 nslot)
61
41
+{
62
42
+	return ALIGN(sizeof(struct namespace_index) + DIV_ROUND_UP(nslot, 8),
63
43
+			NSINDEX_ALIGN);
64
44
+}
65
45
+
66
46
+static int __nvdimm_num_label_slots(struct nvdimm_data *ndd,
67
47
+		size_t index_size)
68
48
+{
69
49
+	return (ndd->config_size - index_size * 2) /
70
50
+		sizeof_namespace_label(ndd);
71
51
+}
72
52
+
73
53
 static int nvdimm_num_label_slots(struct nvdimm_data *ndd)
74
54
 {
75
55
-	return ndd->config_size / (sizeof_namespace_label(ndd) + 1);
76
56
+	u32 tmp_nslot, n;
77
57
+
78
58
+	tmp_nslot = ndd->config_size / sizeof_namespace_label(ndd);
79
59
+	n = __sizeof_namespace_index(tmp_nslot) / NSINDEX_ALIGN;
80
60
+
81
61
+	return __nvdimm_num_label_slots(ndd, NSINDEX_ALIGN * n);
82
62
 }
83
63
 
84
64
 static unsigned int sizeof_namespace_index(struct nvdimm_data *ndd)
85
65
@@ -78,18 +96,15 @@ static unsigned int sizeof_namespace_index(struct nvdimm_data *ndd)
86
66
 	struct ndctl_ctx *ctx = ndctl_dimm_get_ctx(dimm);
87
67
 
88
68
 	/*
89
69
-	 * The minimum index space is 512 bytes, with that amount of
90
70
-	 * index we can describe ~1400 labels which is less than a byte
91
71
-	 * of overhead per label.  Round up to a byte of overhead per
92
72
-	 * label and determine the size of the index region.  Yes, this
93
73
-	 * starts to waste space at larger config_sizes, but it's
94
74
-	 * unlikely we'll ever see anything but 128K.
95
75
+	 * Per UEFI 2.7, the minimum size of the Label Storage Area is
96
76
+	 * large enough to hold 2 index blocks and 2 labels.  The
97
77
+	 * minimum index block size is 256 bytes, and the minimum label
98
78
+	 * size is 256 bytes.
99
79
 	 */
100
80
 	nslot = nvdimm_num_label_slots(ndd);
101
81
 	space = ndd->config_size - nslot * sizeof_namespace_label(ndd);
102
82
-	size = ALIGN(sizeof(struct namespace_index) + DIV_ROUND_UP(nslot, 8),
103
83
-			NSINDEX_ALIGN) * 2;
104
84
-	if (size <= space)
105
85
+	size = __sizeof_namespace_index(nslot) * 2;
106
86
+	if (size <= space && nslot >= 2)
107
87
 		return size / 2;
108
88
 
109
89
 	err(ctx, "%s: label area (%ld) too small to host (%d byte) labels\n",
110
90
-- 
111
91
2.20.1
112
92
113
diff --git a/debian/patches/series b/debian/patches/series
114
0
new file mode 100644
93
new file mode 100644
115
index 0000000..084e496
116
--- /dev/null
117
+++ b/debian/patches/series
118
@@ -0,0 +1 @@
119
1
ndctl-init-labels-Fix-label-slot-accounting-per-UEFI.patch
Reviewer	Review Type	Date Requested	Status
Rafael David Tinoco (community)			Needs Fixing on 2019-11-25
Christian Ehrhardt  (community)			Needs Fixing on 2019-11-25
Review via email: mp+375930@code.launchpad.net