From: Dan Williams <dan.j.williams@intel.com>
To: linux-nvdimm@lists.01.org
Subject: [ndctl PATCH 2/8] ndctl: new 'destroy-namespace' utility
Date: Fri, 22 Apr 2016 12:47:12 -0700 [thread overview]
Message-ID: <146135443293.4228.17853843190824352266.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)
In-Reply-To: <146135442234.4228.904225076597683142.stgit@dwillia2-desk3.amr.corp.intel.com>
Undo a create-namespace operation. Zero any info blocks, revoke all
claims, and unallocate the region capacity.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
Documentation/Makefile.am | 1
Documentation/ndctl-destroy-namespace.txt | 27 ++++++++++
builtin-xaction-namespace.c | 79 ++++++++++++++++++++++-------
builtin.h | 1
ndctl.c | 3 +
5 files changed, 92 insertions(+), 19 deletions(-)
create mode 100644 Documentation/ndctl-destroy-namespace.txt
diff --git a/Documentation/Makefile.am b/Documentation/Makefile.am
index 7fb49b8e4538..470f5d003f6c 100644
--- a/Documentation/Makefile.am
+++ b/Documentation/Makefile.am
@@ -7,6 +7,7 @@ man1_MANS = \
ndctl-enable-namespace.1 \
ndctl-disable-namespace.1 \
ndctl-create-namespace.1 \
+ ndctl-destroy-namespace.1 \
ndctl-list.1
CLEANFILES = $(man1_MANS)
diff --git a/Documentation/ndctl-destroy-namespace.txt b/Documentation/ndctl-destroy-namespace.txt
new file mode 100644
index 000000000000..623820533cec
--- /dev/null
+++ b/Documentation/ndctl-destroy-namespace.txt
@@ -0,0 +1,27 @@
+ndctl-destroy-namespace(1)
+=========================
+
+NAME
+----
+ndctl-destroy-namespace - destroy the given namespace(s)
+
+SYNOPSIS
+--------
+[verse]
+'ndctl destroy-namespace' <namespace> [<options>]
+
+include::namespace-description.txt[]
+
+OPTIONS
+-------
+include::xable-namespace-options.txt[]
+-f::
+--force::
+ Unless this option is specified the 'destroy namespace'
+ operation will fail if the namespace is presently active.
+ Specifying --force causes the namespace to be disabled before
+ the operation is attempted.
+
+SEE ALSO
+--------
+linkndctl:ndctl-create-namespace[1]
diff --git a/builtin-xaction-namespace.c b/builtin-xaction-namespace.c
index 3e13a1c0c3a1..53ff82bc2c8d 100644
--- a/builtin-xaction-namespace.c
+++ b/builtin-xaction-namespace.c
@@ -61,11 +61,11 @@ struct parsed_parameters {
};
#define debug(fmt, ...) \
- if (verbose) { \
+ ({if (verbose) { \
fprintf(stderr, "%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__); \
} else { \
do { } while (0); \
- }
+ }})
#define BASE_OPTIONS() \
OPT_STRING('b', "bus", ¶m.bus, "bus-id", \
@@ -98,6 +98,13 @@ static const struct option base_options[] = {
OPT_END(),
};
+static const struct option destroy_options[] = {
+ BASE_OPTIONS(),
+ OPT_BOOLEAN('f', "force", &force,
+ "destroy namespace even if currently active"),
+ OPT_END(),
+};
+
static const struct option create_options[] = {
BASE_OPTIONS(),
CREATE_OPTIONS(),
@@ -108,9 +115,10 @@ enum namespace_action {
ACTION_ENABLE,
ACTION_DISABLE,
ACTION_CREATE,
+ ACTION_DESTROY,
};
-static int set_defaults(void)
+static int set_defaults(enum namespace_action mode)
{
int rc = 0;
@@ -124,7 +132,7 @@ static int set_defaults(void)
param.type);
rc = -EINVAL;
}
- } else if (!param.reconfig)
+ } else if (!param.reconfig && mode == ACTION_CREATE)
param.type = "pmem";
if (param.mode) {
@@ -140,7 +148,7 @@ static int set_defaults(void)
error("invalid mode '%s'\n", param.mode);
rc = -EINVAL;
}
- } else if (!param.reconfig) {
+ } else if (!param.reconfig && param.type) {
if (strcmp(param.type, "pmem") == 0)
param.mode = "memory";
else
@@ -220,7 +228,7 @@ static const char *parse_namespace_options(int argc, const char **argv,
param.do_scan = argc == 1;
argc = parse_options(argc, argv, options, u, 0);
- rc = set_defaults();
+ rc = set_defaults(mode);
if (argc == 0 && mode != ACTION_CREATE) {
error("specify a namespace to %s, or \"all\"\n",
@@ -498,20 +506,16 @@ static int zero_info_block(struct ndctl_namespace *ndns)
return rc;
}
-static int namespace_reconfig(struct ndctl_region *region,
+static int namespace_destroy(struct ndctl_region *region,
struct ndctl_namespace *ndns)
{
const char *devname = ndctl_namespace_get_devname(ndns);
struct ndctl_pfn *pfn = ndctl_namespace_get_pfn(ndns);
struct ndctl_btt *btt = ndctl_namespace_get_btt(ndns);
- struct parsed_parameters p;
const char *bdev = NULL;
char path[50];
int fd, rc;
- if (validate_namespace_options(ndns, &p))
- return -EINVAL;
-
if (ndctl_region_get_ro(region)) {
error("%s: read-only, re-configuration disabled\n",
devname);
@@ -557,14 +561,29 @@ static int namespace_reconfig(struct ndctl_region *region,
}
rc = ndctl_namespace_delete(ndns);
- if (rc) {
- error("%s: failed to reclaim\n", devname);
+ if (rc)
+ debug("%s: failed to reclaim\n", devname);
+
+ return 0;
+}
+
+static int namespace_reconfig(struct ndctl_region *region,
+ struct ndctl_namespace *ndns)
+{
+ struct parsed_parameters p;
+ int rc;
+
+ if (validate_namespace_options(ndns, &p))
+ return -EINVAL;
+
+ rc = namespace_destroy(region, ndns);
+ if (rc)
return rc;
- }
ndns = ndctl_region_get_namespace_seed(region);
if (is_namespace_active(ndns)) {
- debug("%s: no %s namespace seed\n", devname,
+ debug("%s: no %s namespace seed\n",
+ ndctl_region_get_devname(region),
ndns ? "idle" : "available");
return -ENODEV;
}
@@ -575,8 +594,8 @@ static int namespace_reconfig(struct ndctl_region *region,
static int do_xaction_namespace(const char *namespace,
enum namespace_action action)
{
+ struct ndctl_namespace *ndns, *_n;
int rc = -ENXIO, success = 0;
- struct ndctl_namespace *ndns;
struct ndctl_region *region;
const char *ndns_name;
struct ndctl_ctx *ctx;
@@ -623,7 +642,7 @@ static int do_xaction_namespace(const char *namespace,
rc = 1;
goto done;
}
- ndctl_namespace_foreach(region, ndns) {
+ ndctl_namespace_foreach_safe(region, ndns, _n) {
ndns_name = ndctl_namespace_get_devname(ndns);
if (strcmp(namespace, "all") != 0
@@ -636,6 +655,9 @@ static int do_xaction_namespace(const char *namespace,
case ACTION_ENABLE:
rc = ndctl_namespace_enable(ndns);
break;
+ case ACTION_DESTROY:
+ rc = namespace_destroy(region, ndns);
+ break;
case ACTION_CREATE:
rc = namespace_reconfig(region, ndns);
if (rc < 0)
@@ -711,7 +733,7 @@ int cmd_create_namespace(int argc, const char **argv)
*/
memset(¶m, 0, sizeof(param));
param.type = "blk";
- set_defaults();
+ set_defaults(ACTION_CREATE);
created = do_xaction_namespace(NULL, ACTION_CREATE);
}
@@ -726,3 +748,24 @@ int cmd_create_namespace(int argc, const char **argv)
return created;
return 0;
}
+
+int cmd_destroy_namespace(int argc , const char **argv)
+{
+ char *xable_usage = "ndctl destroy-namespace <namespace> [<options>]";
+ const char *namespace = parse_namespace_options(argc, argv,
+ ACTION_DESTROY, destroy_options, xable_usage);
+ int destroyed = do_xaction_namespace(namespace, ACTION_DESTROY);
+
+ if (destroyed < 0) {
+ fprintf(stderr, "error destroying namespaces: %s\n",
+ strerror(-destroyed));
+ return destroyed;
+ } else if (destroyed == 0) {
+ fprintf(stderr, "destroyed 0 namespaces\n");
+ return 0;
+ } else {
+ fprintf(stderr, "destroyed %d namespace%s\n", destroyed,
+ destroyed > 1 ? "s" : "");
+ return 0;
+ }
+}
diff --git a/builtin.h b/builtin.h
index 9c207552b254..53ec25b8a76a 100644
--- a/builtin.h
+++ b/builtin.h
@@ -11,6 +11,7 @@ struct cmd_struct {
int cmd_create_nfit(int argc, const char **argv);
int cmd_enable_namespace(int argc, const char **argv);
int cmd_create_namespace(int argc, const char **argv);
+int cmd_destroy_namespace(int argc, const char **argv);
int cmd_disable_namespace(int argc, const char **argv);
int cmd_enable_region(int argc, const char **argv);
int cmd_disable_region(int argc, const char **argv);
diff --git a/ndctl.c b/ndctl.c
index bed194979cc0..6db1b2ffa0c0 100644
--- a/ndctl.c
+++ b/ndctl.c
@@ -26,8 +26,9 @@ static struct cmd_struct commands[] = {
{ "version", cmd_version },
{ "create-nfit", cmd_create_nfit },
{ "enable-namespace", cmd_enable_namespace },
- { "create-namespace", cmd_create_namespace },
{ "disable-namespace", cmd_disable_namespace },
+ { "create-namespace", cmd_create_namespace },
+ { "destroy-namespace", cmd_destroy_namespace },
{ "enable-region", cmd_enable_region },
{ "disable-region", cmd_disable_region },
{ "zero-labels", cmd_zero_labels },
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2016-04-22 19:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-22 19:47 [ndctl PATCH 0/8] create-namespace fixes, and a misc build fix Dan Williams
2016-04-22 19:47 ` [ndctl PATCH 1/8] ndctl, create-namespace: make zero_info_block() more robust Dan Williams
2016-04-22 19:47 ` Dan Williams [this message]
2016-04-22 19:47 ` [ndctl PATCH 3/8] ndctl: fix build on systems where /bin/sh is not a link to bash Dan Williams
2016-04-22 19:47 ` [ndctl PATCH 4/8] ndctl, create-namespace: report failures due to namespace being mounted Dan Williams
2016-04-22 23:00 ` Linda Knippers
2016-04-22 23:10 ` Dan Williams
2016-04-22 19:47 ` [ndctl PATCH 5/8] ndctl, xaction-namespace: make 'verbose' option available in all sub-commands Dan Williams
2016-04-22 19:47 ` [ndctl PATCH 6/8] ndctl, create-namespace: fix memmap location reconfiguration Dan Williams
2016-04-22 19:47 ` [ndctl PATCH 7/8] ndctl, create-namespace: fix sector mode default for pmem namespaces Dan Williams
2016-04-22 23:07 ` Linda Knippers
2016-04-22 19:47 ` [ndctl PATCH 8/8] ndctl, create-namespace: check for ZONE_DEVICE=n kernels Dan Williams
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=146135443293.4228.17853843190824352266.stgit@dwillia2-desk3.amr.corp.intel.com \
--to=dan.j.williams@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.