@@ -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_ */
@@ -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)
@@ -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);
@@ -394,6 +411,33 @@ static int do_reconfig(struct daxctl_dev *dev, enum dev_mode mode,
return 0;
}
+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)
{
@@ -419,6 +463,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;
@@ -453,3 +507,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;
+}
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(+)