linux-nvdimm.lists.01.org archive mirror
 help / color / mirror / Atom feed
From: Vishal Verma <vishal.l.verma@intel.com>
To: <linux-nvdimm@lists.01.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Subject: [ndctl PATCH v2 1/2] ndctl/namespace: Rework counts reported by enable-namespace
Date: Tue,  5 Nov 2019 10:27:12 -0700	[thread overview]
Message-ID: <20191105172713.3628-1-vishal.l.verma@intel.com> (raw)

Add detection of 'seed' namespaces
(ndctl_namespace_is_configuration_idle()) to the enable-namespace
operatiuon and libndctl API. In libndctl, return a '1' for seed
namespaces. In namespace.c, reinterpret a '1' based on a check for a
seed namespace, and decide on skip vs success accordingly. Collect this
into a new namespace_enable helper, and make the reported count
consistent by also skipping namespaces that were already enabled.

Link: https://github.com/pmem/ndctl/issues/119
Reported-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---

Changes in v2:
- The kernel is the ultimate authority on enabling namespaces, so we
  should let it make the decision of how to handle seed namespaces
  instead of preemptively skipping them. Let the kernel make that
  decision, and fix up error reporting after the fact.

 ndctl/lib/libndctl.c |  9 +++++++--
 ndctl/namespace.c    | 37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c
index d6a2800..cde58ff 100644
--- a/ndctl/lib/libndctl.c
+++ b/ndctl/lib/libndctl.c
@@ -4045,8 +4045,13 @@ NDCTL_EXPORT int ndctl_namespace_enable(struct ndctl_namespace *ndns)
 			return 1;
 		}
 
-		err(ctx, "%s: failed to enable\n", devname);
-		return rc ? rc : -ENXIO;
+		if (ndctl_namespace_is_configuration_idle(ndns)) {
+			dbg(ctx, "%s: skip seed namespace\n", devname);
+			return 1;
+		} else {
+			err(ctx, "%s: failed to enable\n", devname);
+			return rc ? rc : -ENXIO;
+		}
 	}
 	rc = 0;
 	dbg(ctx, "%s: enabled\n", devname);
diff --git a/ndctl/namespace.c b/ndctl/namespace.c
index a07d7e2..f2987ca 100644
--- a/ndctl/namespace.c
+++ b/ndctl/namespace.c
@@ -961,6 +961,36 @@ out:
 	return rc;
 }
 
+/*
+ * Adjust the return convention slightly differently from
+ * ndctl_namespace_enable(). We don't care as much if the enable resulted in
+ * a different namespace personality being attached. We care more about success,
+ * failure, or skipped.
+ * return 0 for success
+ * return < 0 for failure
+ * return > 0 for skipped
+ */
+static int namespace_enable(struct ndctl_namespace *ndns)
+{
+	int rc;
+
+	if (ndctl_namespace_is_enabled(ndns))
+		return 1;
+
+	rc = ndctl_namespace_enable(ndns);
+	if (rc < 0)
+		return rc;
+
+	/*
+	 * ndctl_namespace_enable() returns 'success' even for seed namespaces.
+	 * Reinterpret it to determine success vs. skipped.
+	 */
+	if (ndctl_namespace_is_configuration_idle(ndns))
+		return 1;
+
+	return 0;
+}
+
 static int enable_labels(struct ndctl_region *region)
 {
 	int mappings = ndctl_region_get_mappings(region);
@@ -1401,11 +1431,12 @@ static int do_xaction_namespace(const char *namespace,
 						(*processed)++;
 					break;
 				case ACTION_ENABLE:
-					rc = ndctl_namespace_enable(ndns);
-					if (rc >= 0) {
+					rc = namespace_enable(ndns);
+					if (rc == 0)
 						(*processed)++;
+					/* return success if skipped */
+					if (rc > 0)
 						rc = 0;
-					}
 					break;
 				case ACTION_DESTROY:
 					rc = namespace_destroy(region, ndns);
-- 
2.20.1
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org

             reply	other threads:[~2019-11-05 17:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-05 17:27 Vishal Verma [this message]
2019-11-05 17:27 ` [ndctl PATCH v2 2/2] ndctl/namespace: fix reported count for disable-namespace Vishal Verma
2019-11-12 19:23 ` [ndctl PATCH v2 1/2] ndctl/namespace: Rework counts reported by enable-namespace Verma, Vishal L

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191105172713.3628-1-vishal.l.verma@intel.com \
    --to=vishal.l.verma@intel.com \
    --cc=aneesh.kumar@linux.ibm.com \
    --cc=linux-nvdimm@lists.01.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).