From: Vishal Verma <vishal.l.verma@intel.com>
To: linux-nvdimm@lists.01.org
Cc: Dave Hansen <dave.hansen@linux.intel.com>,
Pavel Tatashin <pasha.tatashin@soleen.com>
Subject: [ndctl PATCH v8 09/13] daxctl: add commands to online and offline memory
Date: Fri, 26 Jul 2019 19:52:08 -0600 [thread overview]
Message-ID: <20190727015212.27092-10-vishal.l.verma@intel.com> (raw)
In-Reply-To: <20190727015212.27092-1-vishal.l.verma@intel.com>
Add two new commands:
daxctl-online-memory
daxctl-offline-memory
to manage the state of hot-plugged memory from the system-ram mode for
dax devices. This provides a way for the user to online/offline the
memory as a separate step from the reconfiguration. Without this, a user
that reconfigures a device into the system-ram mode with the --no-online
option, would have no way to later online the memory, and would have to
resort to shell scripting to online them manually via sysfs.
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
daxctl/builtin.h | 2 ++
daxctl/daxctl.c | 2 ++
daxctl/device.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/daxctl/builtin.h b/daxctl/builtin.h
index 756ba2a..f5a0147 100644
--- a/daxctl/builtin.h
+++ b/daxctl/builtin.h
@@ -7,4 +7,6 @@ struct daxctl_ctx;
int cmd_list(int argc, const char **argv, struct daxctl_ctx *ctx);
int cmd_migrate(int argc, const char **argv, struct daxctl_ctx *ctx);
int cmd_reconfig_device(int argc, const char **argv, struct daxctl_ctx *ctx);
+int cmd_online_memory(int argc, const char **argv, struct daxctl_ctx *ctx);
+int cmd_offline_memory(int argc, const char **argv, struct daxctl_ctx *ctx);
#endif /* _DAXCTL_BUILTIN_H_ */
diff --git a/daxctl/daxctl.c b/daxctl/daxctl.c
index e1ba7b8..1ab0732 100644
--- a/daxctl/daxctl.c
+++ b/daxctl/daxctl.c
@@ -72,6 +72,8 @@ static struct cmd_struct commands[] = {
{ "help", .d_fn = cmd_help },
{ "migrate-device-model", .d_fn = cmd_migrate },
{ "reconfigure-device", .d_fn = cmd_reconfig_device },
+ { "online-memory", .d_fn = cmd_online_memory },
+ { "offline-memory", .d_fn = cmd_offline_memory },
};
int main(int argc, const char **argv)
diff --git a/daxctl/device.c b/daxctl/device.c
index 2629804..01d057e 100644
--- a/daxctl/device.c
+++ b/daxctl/device.c
@@ -39,6 +39,8 @@ static unsigned long flags;
enum device_action {
ACTION_RECONFIG,
+ ACTION_ONLINE,
+ ACTION_OFFLINE,
};
#define BASE_OPTIONS() \
@@ -59,6 +61,11 @@ static const struct option reconfig_options[] = {
OPT_END(),
};
+static const struct option memory_options[] = {
+ BASE_OPTIONS(),
+ OPT_END(),
+};
+
static const char *parse_device_options(int argc, const char **argv,
enum device_action action, const struct option *options,
const char *usage, struct daxctl_ctx *ctx)
@@ -79,6 +86,12 @@ static const char *parse_device_options(int argc, const char **argv,
case ACTION_RECONFIG:
action_string = "reconfigure";
break;
+ case ACTION_ONLINE:
+ action_string = "online memory for";
+ break;
+ case ACTION_OFFLINE:
+ action_string = "offline memory for";
+ break;
default:
action_string = "<>";
break;
@@ -122,6 +135,10 @@ static const char *parse_device_options(int argc, const char **argv,
}
}
break;
+ case ACTION_ONLINE:
+ case ACTION_OFFLINE:
+ /* nothing special */
+ break;
}
if (rc) {
usage_with_options(u, options);
@@ -442,6 +459,33 @@ static int do_reconfig(struct daxctl_dev *dev, enum dev_mode mode,
return rc;
}
+static int do_xline(struct daxctl_dev *dev, enum device_action action)
+{
+ struct daxctl_memory *mem = daxctl_dev_get_memory(dev);
+ const char *devname = daxctl_dev_get_devname(dev);
+ int rc;
+
+ if (!mem) {
+ fprintf(stderr,
+ "%s: memory operations are not applicable in devdax mode\n",
+ devname);
+ return -ENXIO;
+ }
+
+ switch (action) {
+ case ACTION_ONLINE:
+ rc = dev_online_memory(dev);
+ break;
+ case ACTION_OFFLINE:
+ rc = dev_offline_memory(dev);
+ break;
+ default:
+ fprintf(stderr, "%s: invalid action: %d\n", devname, action);
+ rc = -EINVAL;
+ }
+ return rc;
+}
+
static int do_xaction_device(const char *device, enum device_action action,
struct daxctl_ctx *ctx, int *processed)
{
@@ -467,6 +511,16 @@ static int do_xaction_device(const char *device, enum device_action action,
if (rc == 0)
(*processed)++;
break;
+ case ACTION_ONLINE:
+ rc = do_xline(dev, action);
+ if (rc == 0)
+ (*processed)++;
+ break;
+ case ACTION_OFFLINE:
+ rc = do_xline(dev, action);
+ if (rc == 0)
+ (*processed)++;
+ break;
default:
rc = -EINVAL;
break;
@@ -501,3 +555,37 @@ int cmd_reconfig_device(int argc, const char **argv, struct daxctl_ctx *ctx)
processed == 1 ? "" : "s");
return rc;
}
+
+int cmd_online_memory(int argc, const char **argv, struct daxctl_ctx *ctx)
+{
+ char *usage = "daxctl online-memory <device> [<options>]";
+ const char *device = parse_device_options(argc, argv, ACTION_ONLINE,
+ memory_options, usage, ctx);
+ int processed, rc;
+
+ rc = do_xaction_device(device, ACTION_ONLINE, ctx, &processed);
+ if (rc < 0)
+ fprintf(stderr, "error onlining memory: %s\n",
+ strerror(-rc));
+
+ fprintf(stderr, "onlined memory for %d device%s\n", processed,
+ processed == 1 ? "" : "s");
+ return rc;
+}
+
+int cmd_offline_memory(int argc, const char **argv, struct daxctl_ctx *ctx)
+{
+ char *usage = "daxctl offline-memory <device> [<options>]";
+ const char *device = parse_device_options(argc, argv, ACTION_OFFLINE,
+ memory_options, usage, ctx);
+ int processed, rc;
+
+ rc = do_xaction_device(device, ACTION_OFFLINE, ctx, &processed);
+ if (rc < 0)
+ fprintf(stderr, "error offlining memory: %s\n",
+ strerror(-rc));
+
+ fprintf(stderr, "offlined memory for %d device%s\n", processed,
+ processed == 1 ? "" : "s");
+ return rc;
+}
--
2.20.1
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2019-07-27 1:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-27 1:51 [ndctl PATCH v8 00/13] daxctl: add a new reconfigure-device command Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 01/13] libdaxctl: add interfaces to get ctx and check device state Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 02/13] libdaxctl: add interfaces to enable/disable devices Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 03/13] libdaxctl: add an interface to retrieve the device resource Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 04/13] libdaxctl: add a 'daxctl_memory' object for memory based operations Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 05/13] daxctl/list: add target_node for device listings Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 06/13] daxctl/list: display the mode for a dax device Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 07/13] daxctl: add a new reconfigure-device command Vishal Verma
2019-07-30 17:47 ` Verma, Vishal L
2019-07-31 22:53 ` Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 08/13] Documentation/daxctl: add a man page for daxctl-reconfigure-device Vishal Verma
2019-07-27 1:52 ` Vishal Verma [this message]
2019-07-27 1:52 ` [ndctl PATCH v8 10/13] Documentation: Add man pages for daxctl-{on, off}line-memory Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 11/13] contrib/ndctl: fix region-id completions for daxctl Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 12/13] contrib/ndctl: add bash-completion for the new daxctl commands Vishal Verma
2019-07-27 1:52 ` [ndctl PATCH v8 13/13] test: Add a unit test for daxctl-reconfigure-device and friends Vishal Verma
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=20190727015212.27092-10-vishal.l.verma@intel.com \
--to=vishal.l.verma@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=linux-nvdimm@lists.01.org \
--cc=pasha.tatashin@soleen.com \
/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).