Hello community,
here is the log from the commit of package ndctl for openSUSE:Leap:15.2 checked
in at 2020-02-10 16:41:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/ndctl (Old)
and /work/SRC/openSUSE:Leap:15.2/.ndctl.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ndctl"
Mon Feb 10 16:41:51 2020 rev:28 rq:769590 version:64.1
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/ndctl/ndctl.changes 2020-01-15
15:33:04.546845231 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.ndctl.new.26092/ndctl.changes 2020-02-10
16:42:13.191735748 +0100
@@ -1,0 +2,24 @@
+Fri Nov 8 14:42:49 UTC 2019 - Michal Suchanek <msucha...@suse.de>
+
+- ndctl/dimm: Fix init-labels success reporting (bsc#1156308 ltc#181441).
+ + ndctl-dimm-Fix-init-labels-success-reporting.patch
+- Refresh patches with upstream status:
+ ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch
+ ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch
+
+-------------------------------------------------------------------
+Fri Oct 18 13:14:35 UTC 2019 - Michal Suchanek <msucha...@suse.de>
+
+- Refresh patches with upstream status:
+ ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch
+ ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch
+
+-------------------------------------------------------------------
+Wed Aug 21 18:15:16 UTC 2019 - Michal Suchanek <msucha...@suse.de>
+
+- Refresh patches with upstream status:
+ ndctl_check_Ensure_mmap_of_BTT_sections_work_with_64K_page-sizes.patch
+ ndctl-namespace-Handle-create-namespace-in-label-less-mode.patch
+ ndctl-list-Introduce-region-capability-objects.patch
+
+-------------------------------------------------------------------
New:
----
ndctl-dimm-Fix-init-labels-success-reporting.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ndctl.spec ++++++
--- /var/tmp/diff_new_pack.mPuYck/_old 2020-02-10 16:42:13.531735988 +0100
+++ /var/tmp/diff_new_pack.mPuYck/_new 2020-02-10 16:42:13.531735988 +0100
@@ -33,6 +33,7 @@
Patch3:
%{name}-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch
Patch4: %{name}-ndctl-lib-Fix-duplicate-bus-detection.patch
Patch5:
%{name}-namespace-Handle-create-namespace-in-label-less-mode.patch
+Patch6: %{name}-dimm-Fix-init-labels-success-reporting.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: keyutils-devel
++++++
ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch ++++++
--- /var/tmp/diff_new_pack.mPuYck/_old 2020-02-10 16:42:13.571736016 +0100
+++ /var/tmp/diff_new_pack.mPuYck/_new 2020-02-10 16:42:13.571736016 +0100
@@ -1,40 +1,40 @@
-From patchwork Wed Aug 7 04:44:16 2019
-X-Patchwork-Submitter: "Aneesh Kumar K.V" <aneesh.ku...@linux.ibm.com>
-X-Patchwork-Id: 11080973
+From e81ccd7f062beeae7498d04785fe55c55c857d4b Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.ku...@linux.ibm.com>
-To: dan.j.willi...@intel.com
-Subject: [PATCH] ndctl: Use the same align value as original namespace on
- reconfigure
-Date: Wed, 7 Aug 2019 10:14:16 +0530
-Message-Id: <20190807044416.30799-1-aneesh.ku...@linux.ibm.com>
+Date: Wed, 7 Aug 2019 10:14:16 +0530
+Subject: [PATCH] ndctl: Reuse the align value from the original namespace on
+ reconfiguration
-When using reconfigure command to add a `name` to the namespace we end
+Patch-mainline: v67
+Git-commit: e81ccd7f062beeae7498d04785fe55c55c857d4b
+
+When using reconfigure command to add a 'name' to the namespace we end
up updating the align attribute. Avoid this by using the value from
the original namespace. Do this only if we are keeping the namespace mode
same.
Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
+Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com>
---
ndctl/namespace.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/ndctl/namespace.c b/ndctl/namespace.c
-index 1f212a2b3a9b..24e51bb35ae1 100644
+index 67768f34365c..7fb00078646b 100644
--- a/ndctl/namespace.c
+++ b/ndctl/namespace.c
-@@ -596,6 +596,22 @@ static int validate_namespace_options(struct ndctl_region
*region,
+@@ -598,6 +598,22 @@ static int validate_namespace_options(struct ndctl_region
*region,
return -ENXIO;
}
} else {
-+
+ /*
-+ * If we are tryint to reconfigure with the same namespace mode
-+ * Use the align details from the origin namespace. Otherwise
++ * If we are trying to reconfigure with the same namespace mode,
++ * use the align details from the original namespace. Otherwise
+ * pick the align details from seed namespace
+ */
+ if (ndns && p->mode == ndctl_namespace_get_mode(ndns)) {
+ struct ndctl_pfn *ns_pfn =
ndctl_namespace_get_pfn(ndns);
+ struct ndctl_dax *ns_dax =
ndctl_namespace_get_dax(ndns);
++
+ if (ns_pfn)
+ p->align = ndctl_pfn_get_align(ns_pfn);
+ else if (ns_dax)
@@ -45,3 +45,6 @@
/*
* Use the seed namespace alignment as the default if we need
* one. If we don't then use PAGE_SIZE so the size_align
+--
+2.23.0
+
++++++ ndctl-dimm-Fix-init-labels-success-reporting.patch ++++++
>From 4f7cad25e06483ae20b9bebabefb05fb1e55a2a7 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.willi...@intel.com>
Date: Sat, 27 Jul 2019 14:40:42 -0700
Subject: [PATCH] ndctl/dimm: Fix init-labels success reporting
Patch-mainline: v66
Git-commit: 4f7cad25e06483ae20b9bebabefb05fb1e55a2a7
When a DIMM is disabled due to a label parsing issue "ndctl init-labels"
mis-reports the status of the init-labels command:
# ndctl init-labels all -f
initialized 1 nmem
[root@dwillia2-dev ndctl]# ndctl list -Di
[
{
"dev":"nmem1",
"id":"8680-57341200",
"handle":2,
"phys_id":0,
"state":"disabled"
},
{
"dev":"nmem0",
"id":"8680-56341200",
"handle":1,
"phys_id":0
}
]
# ndctl init-labels nmem1 -f
initialized 1020 nmems
Catch any positive return from action_init() as success:
# ndctl init-labels all -f
initialized 2 nmems
# ndctl init-labels nmem1 -f
initialized 1 nmem
Link: https://github.com/pmem/ndctl/issues/60
Reported-by: Jane Chu <jane....@oracle.com>
Reported-by: Steve Scargal <steve.scarg...@intel.com>
Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com>
---
ndctl/dimm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ndctl/dimm.c b/ndctl/dimm.c
index 5f05a75f00eb..db91f42421e4 100644
--- a/ndctl/dimm.c
+++ b/ndctl/dimm.c
@@ -1027,7 +1027,7 @@ static int __action_init(struct ndctl_dimm *dimm,
out:
ndctl_cmd_unref(cmd_read);
- return rc;
+ return rc >= 0 ? 0 : rc;
}
static int action_init(struct ndctl_dimm *dimm, struct action_context *actx)
--
2.23.0
++++++ ndctl-list-Introduce-region-capability-objects.patch ++++++
--- /var/tmp/diff_new_pack.mPuYck/_old 2020-02-10 16:42:13.587736027 +0100
+++ /var/tmp/diff_new_pack.mPuYck/_new 2020-02-10 16:42:13.587736027 +0100
@@ -3,6 +3,9 @@
Date: Wed, 6 Mar 2019 23:19:45 -0800
Subject: [PATCH] ndctl/list: Introduce region capability objects
+Patch-mainline: v65
+Git-commit: da2820a80483791498b50bd5b5932076b7c17b1a
+
For common capabilities that a region can create provide a json object
of the following form:
@@ -51,7 +54,7 @@
4 files changed, 93 insertions(+), 19 deletions(-)
diff --git a/Documentation/ndctl/ndctl-list.txt
b/Documentation/ndctl/ndctl-list.txt
-index bdd69ad..80ad610 100644
+index bdd69add9f22..80ad6100060f 100644
--- a/Documentation/ndctl/ndctl-list.txt
+++ b/Documentation/ndctl/ndctl-list.txt
@@ -175,6 +175,12 @@ include::xable-region-options.txt[]
@@ -78,7 +81,7 @@
include::human-option.txt[]
diff --git a/ndctl/list.c b/ndctl/list.c
-index 506404d..1c3e34d 100644
+index 506404db11b0..1c3e34d58ddb 100644
--- a/ndctl/list.c
+++ b/ndctl/list.c
@@ -36,6 +36,7 @@ static struct {
@@ -129,7 +132,7 @@
list.dimms = true;
list.buses = true;
diff --git a/util/json.c b/util/json.c
-index c732f1b..babdc8c 100644
+index c732f1b77522..babdc8c47565 100644
--- a/util/json.c
+++ b/util/json.c
@@ -321,7 +321,7 @@ struct json_object *util_daxctl_devs_to_list(struct
daxctl_region *region,
@@ -260,7 +263,7 @@
jbbs = util_pfn_badblocks_to_json(pfn, &bb_count, flags);
else if (dax)
diff --git a/util/json.h b/util/json.h
-index e292973..7c3f649 100644
+index e292973dbbbf..7c3f64932cec 100644
--- a/util/json.h
+++ b/util/json.h
@@ -24,6 +24,7 @@ enum util_json_flags {
++++++ ndctl-namespace-Handle-create-namespace-in-label-less-mode.patch ++++++
--- /var/tmp/diff_new_pack.mPuYck/_old 2020-02-10 16:42:13.595736033 +0100
+++ /var/tmp/diff_new_pack.mPuYck/_new 2020-02-10 16:42:13.595736033 +0100
@@ -1,9 +1,10 @@
-From patchwork Sat Jul 27 21:40:36 2019
-X-Patchwork-Submitter: Dan Williams <dan.j.willi...@intel.com>
-X-Patchwork-Id: 11062719
-Subject: [ndctl PATCH v2 14/26] ndctl/namespace: Handle 'create-namespace'
- in label-less mode
+From 7966c92c9da72b0640eec1341bdee959ce746957 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.willi...@intel.com>
+Date: Sat, 27 Jul 2019 14:40:36 -0700
+Subject: [PATCH] ndctl/namespace: Handle 'create-namespace' in label-less mode
+
+Patch-mainline: v66
+Git-commit: 7966c92c9da72b0640eec1341bdee959ce746957
A common confusion with ndctl is that 'create-namespace' does not work
in the label-less case. In the label-less case there is no capacity to
@@ -36,15 +37,16 @@
and just reconfigure the raw namespace.
Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
+Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com>
---
- ndctl/namespace.c | 10 +++++++---
+ ndctl/namespace.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/ndctl/namespace.c b/ndctl/namespace.c
-index 58fec194ab94..e5a2b1341cdb 100644
+index 58a9e3c53474..a654460ce4c5 100644
--- a/ndctl/namespace.c
+++ b/ndctl/namespace.c
-@@ -837,9 +837,13 @@ static int namespace_create(struct ndctl_region *region)
+@@ -791,9 +791,13 @@ static int namespace_create(struct ndctl_region *region)
return -EAGAIN;
}
@@ -61,3 +63,6 @@
if (!available || p.size > available) {
debug("%s: insufficient capacity size: %llx avail: %llx\n",
devname, p.size, available);
+--
+2.22.0
+
++++++ ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch ++++++
--- /var/tmp/diff_new_pack.mPuYck/_old 2020-02-10 16:42:13.603736038 +0100
+++ /var/tmp/diff_new_pack.mPuYck/_new 2020-02-10 16:42:13.603736038 +0100
@@ -1,10 +1,10 @@
-From patchwork Wed Aug 7 17:51:39 2019
-X-Patchwork-Submitter: Dan Williams <dan.j.willi...@intel.com>
-X-Patchwork-Id: 11082723
-Subject: [ndctl PATCH] ndctl/lib: Fix duplicate bus detection
+From d961a474be65c8195bb069c470b01f951bd2eb90 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.willi...@intel.com>
-Date: Wed, 07 Aug 2019 10:51:39 -0700
-Message-ID:
<156520029994.1268132.13388510714364773911.st...@dwillia2-desk3.amr.corp.intel.com>
+Date: Wed, 7 Aug 2019 10:51:39 -0700
+Subject: [PATCH] ndctl/lib: Fix duplicate bus detection
+
+Patch-mainline: v67
+Git-commit: d961a474be65c8195bb069c470b01f951bd2eb90
After an ndctl_invalidate() event the next add_bus() invocation attempts
to rescan for new bus objects and drop duplicate instances that match
@@ -17,8 +17,9 @@
Reported-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
Tested-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
+Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com>
---
- ndctl/lib/libndctl.c | 4 +++-
+ ndctl/lib/libndctl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c
@@ -36,3 +37,6 @@
free_bus(bus, NULL);
free(path);
return bus_dup;
+--
+2.23.0
+
++++++ ndctl_check_Ensure_mmap_of_BTT_sections_work_with_64K_page-sizes.patch
++++++
--- /var/tmp/diff_new_pack.mPuYck/_old 2020-02-10 16:42:13.611736044 +0100
+++ /var/tmp/diff_new_pack.mPuYck/_new 2020-02-10 16:42:13.611736044 +0100
@@ -1,45 +1,42 @@
-From 7f10fd29826c8604b064a7344037473d773ff443 Mon Sep 17 00:00:00 2001
+From 28de2eec24e602f65fb2750f172f7c12c30a5aee Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vaib...@linux.ibm.com>
Date: Tue, 6 Aug 2019 16:20:12 +0530
-Subject: ndctl, check: Ensure mmap of BTT sections work with 64K page-sizes
+Subject: [PATCH] ndctl, check: Ensure mmap of BTT sections work with 64K
+ page-sizes
-On PPC64 which uses a 64K page-size, ndtl-check command fails on a BTT
+Patch-mainline: v66
+Git-commit: 28de2eec24e602f65fb2750f172f7c12c30a5aee
+
+On PPC64 which uses a 64K page-size, ndctl-check-namespace fails on a BTT
namespace with following error:
-$ sudo ndctl check-namespace namespace0.0 -vv
+ # ndctl check-namespace namespace0.0 -vv
namespace0.0: namespace_check: checking namespace0.0
namespace0.0: btt_discover_arenas: found 1 BTT arena
- namespace0.0: btt_create_mappings: mmap arena[0].info [sz = 0x1000, off =
0x1000] failed: Invalid argument
+ namespace0.0: btt_create_mappings: mmap arena[0].info [sz = 0x1000,
+ off = 0x1000] failed: Invalid argument
error checking namespaces: Invalid argument
checked 0 namespaces
-An error happens when btt_create_mappings() tries to mmap the sections
+An error occurs when btt_create_mappings() tries to mmap the sections
of the BTT device which are usually 4K offset aligned. However the
mmap() syscall expects the 'offset' argument to be in multiples of
page-size, hence it returns EINVAL causing the btt_create_mappings()
to error out.
-As a fix for the issue this patch proposes addition of two new
-functions to 'check.c' namely btt_mmap/btt_unmap that can be used to
-map/unmap parts of BTT device to ndctl process address-space. The
-functions tweaks the requested 'offset' argument to mmap() ensuring
-that its page-size aligned and then fix-ups the returned pointer such
-that it points to the requested offset within mmapped region.
-
-With these newly introduced functions the patch updates the call-sites
-in 'check.c' to use these functions instead of mmap/unmap syscalls.
-Also since btt_mmap returns NULL if mmap operation fails, the
-error check call-sites can be made against NULL instead of MAP_FAILED.
+To fix this, wrap mmap(2) and munmap(2) with helpers that perform the
+mmap to a system page boundary, and then adjust the returned pointers if
+needed, and update btt_create_mappings() to use these.
Reported-by: Harish Sriram <har...@linux.ibm.com>
Signed-off-by: Vaibhav Jain <vaib...@linux.ibm.com>
Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com>
---
- ndctl/check.c | 93 ++++++++++++++++++++++++++++++++++++++++++-----------------
+ ndctl/check.c | 93 +++++++++++++++++++++++++++++++++++++--------------
1 file changed, 67 insertions(+), 26 deletions(-)
diff --git a/ndctl/check.c b/ndctl/check.c
-index 8a71250..5969012 100644
+index 8a7125053865..5969012eba84 100644
--- a/ndctl/check.c
+++ b/ndctl/check.c
@@ -907,59 +907,100 @@ static int btt_discover_arenas(struct btt_chk *bttc)
@@ -186,5 +183,5 @@
}
--
-cgit 1.2-0.3.lf.el7
+2.22.0
