diff mbox series

[ndctl,v7,09/13] daxctl: add commands to online and offline memory

Message ID 20190724215741.18556-10-vishal.l.verma@intel.com (mailing list archive)
State Superseded
Headers show
Series daxctl: add a new reconfigure-device command | expand

Commit Message

Verma, Vishal L July 24, 2019, 9:57 p.m. UTC 
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  | 131 ++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 134 insertions(+), 1 deletion(-)

Comments

Dan Williams July 26, 2019, 2:51 a.m. UTC | #1 
On Wed, Jul 24, 2019 at 2:58 PM Vishal Verma <vishal.l.verma@intel.com> wrote:
>
> 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  | 131 ++++++++++++++++++++++++++++++++++++++++++++++-
>  3 files changed, 134 insertions(+), 1 deletion(-)
>
> 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 a71ebbe..64eff04 100644
> --- a/daxctl/device.c
> +++ b/daxctl/device.c
> @@ -36,6 +36,8 @@ static unsigned long flags;
>
>  enum device_action {
>         ACTION_RECONFIG,
> +       ACTION_ONLINE,
> +       ACTION_OFFLINE,
>  };
>
>  #define BASE_OPTIONS() \
> @@ -56,6 +58,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)
> @@ -76,6 +83,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;
> @@ -124,6 +137,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);
> @@ -286,10 +303,75 @@ 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, num_online;
> +
> +       if (!daxctl_dev_is_enabled(dev)) {

Can this fail if daxctl_dev_get_memory() succeeded?

Other than that potential code reduction looks good to me.
Verma, Vishal L July 26, 2019, 11:15 p.m. UTC | #2 
On Thu, 2019-07-25 at 19:51 -0700, Dan Williams wrote:
> On Wed, Jul 24, 2019 at 2:58 PM Vishal Verma <vishal.l.verma@intel.com
> > wrote:
> > 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  | 131
> > ++++++++++++++++++++++++++++++++++++++++++++++-
> >  3 files changed, 134 insertions(+), 1 deletion(-)
> > 
> > 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 a71ebbe..64eff04 100644
> > --- a/daxctl/device.c
> > +++ b/daxctl/device.c
> > @@ -36,6 +36,8 @@ static unsigned long flags;
> > 
> >  enum device_action {
> >         ACTION_RECONFIG,
> > +       ACTION_ONLINE,
> > +       ACTION_OFFLINE,
> >  };
> > 
> >  #define BASE_OPTIONS() \
> > @@ -56,6 +58,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)
> > @@ -76,6 +83,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;
> > @@ -124,6 +137,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);
> > @@ -286,10 +303,75 @@ 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, num_online;
> > +
> > +       if (!daxctl_dev_is_enabled(dev)) {
> 
> Can this fail if daxctl_dev_get_memory() succeeded?
> 
> Other than that potential code reduction looks good to me.

Nope, not needed. Removed, and got even more code
reduction/consolidation as a result of adding the section count
interface.
diff mbox series

Patch

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 a71ebbe..64eff04 100644
--- a/daxctl/device.c
+++ b/daxctl/device.c
@@ -36,6 +36,8 @@  static unsigned long flags;
 
 enum device_action {
 	ACTION_RECONFIG,
+	ACTION_ONLINE,
+	ACTION_OFFLINE,
 };
 
 #define BASE_OPTIONS() \
@@ -56,6 +58,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)
@@ -76,6 +83,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;
@@ -124,6 +137,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);
@@ -286,10 +303,75 @@  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, num_online;
+
+	if (!daxctl_dev_is_enabled(dev)) {
+		fprintf(stderr,
+			"%s: memory operations not possible when disabled\n",
+			devname);
+		return -ENXIO;
+	}
+
+	if (!mem) {
+		fprintf(stderr,
+			"%s: memory operations are not applicable in devdax mode\n",
+			devname);
+		return -ENXIO;
+	}
+
+	/* We are enabled, and in the correct mode. Proceed. */
+	num_online = daxctl_memory_is_online(mem);
+	if (num_online < 0) {
+		fprintf(stderr, "%s: unable to determine online state: %s\n",
+			devname, strerror(-num_online));
+		return num_online;
+	}
+
+	switch (action) {
+	case ACTION_ONLINE:
+		if (num_online > 0)
+			fprintf(stderr, "%s: %d section%s already online\n",
+				devname, num_online,
+				num_online == 1 ? "" : "s");
+		rc = daxctl_memory_set_online(mem);
+		if (rc < 0) {
+			fprintf(stderr, "%s: unable to online memory: %s\n",
+				devname, strerror(-rc));
+			return rc;
+		}
+		fprintf(stderr, "%s: %d new section%s onlined\n", devname, rc,
+				rc == 1 ? "" : "s");
+		break;
+	case ACTION_OFFLINE:
+		if (num_online == 0) {
+			fprintf(stderr, "%s: all sections already offline\n",
+				devname);
+			return 0;
+		}
+		rc = daxctl_memory_set_offline(mem);
+		if (rc < 0) {
+			fprintf(stderr, "%s: unable to offline memory: %s\n",
+				devname, strerror(-rc));
+			return rc;
+		}
+		fprintf(stderr, "%s: %d section%s offlined\n", devname, rc,
+				rc == 1 ? "" : "s");
+		break;
+	default:
+		fprintf(stderr, "%s: invalid action: %d\n", devname, action);
+		return -EINVAL;
+	}
+	return 0;
+}
+
 static int do_xaction_device(const char *device, enum device_action action,
 		struct daxctl_ctx *ctx, int *processed)
 {
-	struct json_object *jdevs = json_object_new_array();
+	struct json_object *jdevs = NULL;
 	struct daxctl_region *region;
 	struct daxctl_dev *dev;
 	int rc = -ENXIO;
@@ -307,10 +389,23 @@  static int do_xaction_device(const char *device, enum device_action action,
 
 			switch (action) {
 			case ACTION_RECONFIG:
+				/* reconfig needs jdevs, initialize it once */
+				if (!jdevs)
+					jdevs = json_object_new_array();
 				rc = do_reconfig(dev, reconfig_mode, jdevs);
 				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;
@@ -345,3 +440,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;
+}