Add a 'enable-device' command, required prior to reconfiguration of the dax device.
Mimics the same functionality as seen in ndctl-enable-namespace. Signed-off-by: Joao Martins <[email protected]> Signed-off-by: Dan Williams <[email protected]> --- Documentation/daxctl/Makefile.am | 3 +- Documentation/daxctl/daxctl-enable-device.txt | 59 +++++++++++++++++++++++++++ daxctl/builtin.h | 1 + daxctl/daxctl.c | 1 + daxctl/device.c | 40 ++++++++++++++++++ 5 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 Documentation/daxctl/daxctl-enable-device.txt diff --git a/Documentation/daxctl/Makefile.am b/Documentation/daxctl/Makefile.am index 1f070771cd95..e43d34183142 100644 --- a/Documentation/daxctl/Makefile.am +++ b/Documentation/daxctl/Makefile.am @@ -32,7 +32,8 @@ man1_MANS = \ daxctl-reconfigure-device.1 \ daxctl-online-memory.1 \ daxctl-offline-memory.1 \ - daxctl-disable-device.1 + daxctl-disable-device.1 \ + daxctl-enable-device.1 EXTRA_DIST = $(man1_MANS) diff --git a/Documentation/daxctl/daxctl-enable-device.txt b/Documentation/daxctl/daxctl-enable-device.txt new file mode 100644 index 000000000000..6410d92cafe9 --- /dev/null +++ b/Documentation/daxctl/daxctl-enable-device.txt @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0 + +daxctl-enable-device(1) +======================= + +NAME +---- +daxctl-enable-device - Enable a devdax device + +SYNOPSIS +-------- +[verse] +'daxctl enable-device' <dax0.0> [<dax1.0>...<daxY.Z>] [<options>] + +EXAMPLES +-------- + +* Enables dax0.1 +---- +# daxctl enable-device dax0.1 +enabled 1 device +---- + +* Enables all devices in region id 0 +---- +# daxctl enable-device -r 0 all +enabled 3 devices +---- + +DESCRIPTION +----------- + +Enables a dax device in 'devdax' mode. + +OPTIONS +------- +-r:: +--region=:: + Restrict the operation to devices belonging to the specified region(s). + A device-dax region is a contiguous range of memory that hosts one or + more /dev/daxX.Y devices, where X is the region id and Y is the device + instance id. + +-u:: +--human:: + By default the command will output machine-friendly raw-integer + data. Instead, with this flag, numbers representing storage size + will be formatted as human readable strings with units, other + fields are converted to hexadecimal strings. + +-v:: +--verbose:: + Emit more debug messages + +include::../copyright.txt[] + +SEE ALSO +-------- +linkdaxctl:daxctl-list[1],daxctl-reconfigure-device[1],daxctl-create-device[1] diff --git a/daxctl/builtin.h b/daxctl/builtin.h index c9848953bbd8..8f344f86ad20 100644 --- a/daxctl/builtin.h +++ b/daxctl/builtin.h @@ -8,6 +8,7 @@ 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_disable_device(int argc, const char **argv, struct daxctl_ctx *ctx); +int cmd_enable_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 1707a9ff0791..a4699b3780bd 100644 --- a/daxctl/daxctl.c +++ b/daxctl/daxctl.c @@ -75,6 +75,7 @@ static struct cmd_struct commands[] = { { "online-memory", .d_fn = cmd_online_memory }, { "offline-memory", .d_fn = cmd_offline_memory }, { "disable-device", .d_fn = cmd_disable_device }, + { "enable-device", .d_fn = cmd_enable_device }, }; int main(int argc, const char **argv) diff --git a/daxctl/device.c b/daxctl/device.c index 20df2b844774..05a9247ecfde 100644 --- a/daxctl/device.c +++ b/daxctl/device.c @@ -50,6 +50,7 @@ enum device_action { ACTION_ONLINE, ACTION_OFFLINE, ACTION_DISABLE, + ACTION_ENABLE, }; #define BASE_OPTIONS() \ @@ -95,6 +96,11 @@ static const struct option disable_options[] = { OPT_END(), }; +static const struct option enable_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) @@ -125,6 +131,9 @@ static const char *parse_device_options(int argc, const char **argv, case ACTION_DISABLE: action_string = "disable"; break; + case ACTION_ENABLE: + action_string = "enable"; + break; default: action_string = "<>"; break; @@ -178,6 +187,7 @@ static const char *parse_device_options(int argc, const char **argv, /* fall through */ case ACTION_OFFLINE: case ACTION_DISABLE: + case ACTION_ENABLE: /* nothing special */ break; } @@ -521,6 +531,14 @@ static int do_xble(struct daxctl_dev *dev, enum device_action action) } switch (action) { + case ACTION_ENABLE: + rc = daxctl_dev_enable_devdax(dev); + if (rc) { + fprintf(stderr, "%s: enable failed: %s\n", + daxctl_dev_get_devname(dev), strerror(-rc)); + return rc; + } + break; case ACTION_DISABLE: rc = daxctl_dev_disable(dev); if (rc) { @@ -570,6 +588,11 @@ static int do_xaction_device(const char *device, enum device_action action, if (rc == 0) (*processed)++; break; + case ACTION_ENABLE: + rc = do_xble(dev, action); + if (rc == 0) + (*processed)++; + break; case ACTION_DISABLE: rc = do_xble(dev, action); if (rc == 0) @@ -627,6 +650,23 @@ int cmd_disable_device(int argc, const char **argv, struct daxctl_ctx *ctx) return rc; } +int cmd_enable_device(int argc, const char **argv, struct daxctl_ctx *ctx) +{ + char *usage = "daxctl enable-device <device>"; + const char *device = parse_device_options(argc, argv, ACTION_DISABLE, + enable_options, usage, ctx); + int processed, rc; + + rc = do_xaction_device(device, ACTION_ENABLE, ctx, &processed); + if (rc < 0) + fprintf(stderr, "error enabling device: %s\n", + strerror(-rc)); + + fprintf(stderr, "enabled %d device%s\n", processed, + 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>]"; -- 1.8.3.1 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
