daxctl: add a new reconfigure-device command
Subsystems (2)
Vishal Verma
maintainercover daxctl: add a new reconfigure-device command
Add a new daxctl-reconfigure-device command that lets us reconfigure DAX devices back and forth between 'system-ram' and 'device-dax' modes. It also includes facilities to online any newly hot-plugged memory (default), and attempt to offline memory before converting away from the system-ram mode (not default, requires a --attempt-offline option).
Currently missing from this series is a way to persistently store which devices have been 'marked' for use as system-ram. This depends on a config system overhaul in ndctl, and patches for those will follow separately and are independent of this work.
Vishal Verma (8):
libdaxctl: add interfaces in support of device modes
libdaxctl: cache 'subsystem' in daxctl_ctx
daxctl: add libdaxctl interfaces to enable/disable devices
ndctl: add helpers to get/set the online state for a node
daxctl: add a new reconfigure-device command Documentation/daxctl: add a man page for daxctl-reconfigure-device contrib/ndctl: fix region-id completions for daxctl contrib/ndctl: add bash-completion for daxctl-reconfigure-device
Documentation/daxctl/Makefile.am | 3 +- .../daxctl/daxctl-reconfigure-device.txt | 74 +++ contrib/ndctl | 34 +- daxctl/Makefile.am | 2 + daxctl/builtin.h | 1 + daxctl/daxctl.c | 1 + daxctl/device.c | 217 ++++++++ daxctl/lib/Makefile.am | 3 +- daxctl/lib/libdaxctl-private.h | 21 + daxctl/lib/libdaxctl.c | 511 +++++++++++++++++- daxctl/lib/libdaxctl.sym | 13 + daxctl/libdaxctl.h | 15 + 12 files changed, 884 insertions(+), 11 deletions(-) create mode 100644 Documentation/daxctl/daxctl-reconfigure-device.txt create mode 100644 daxctl/device.c
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH 1/8 libdaxctl: add interfaces in support of device modes
In preparation for libdaxctl and daxctl to grow operational modes for DAX devices, add the following supporting APIs:
daxctl_dev_get_ctx
daxctl_dev_is_enabled
--- daxctl/lib/libdaxctl.c | 30 ++++++++++++++++++++++++++++++ daxctl/lib/libdaxctl.sym | 6 ++++++ daxctl/libdaxctl.h | 2 ++ 3 files changed, 38 insertions(+)
daxctl/lib/libdaxctl.c +30 -0
@@ -559,6 +559,36 @@ static void dax_regions_init(struct daxctl_ctx *ctx) } } +static int is_enabled (const char *drvpath) +{ +struct stat st; + +if (lstat (drvpath, &st) <0 || !S_ISLNK (st.st_mode)) +return 0 ; +else +return 1 ; +} + +DAXCTL_EXPORT int daxctl_dev_is_enabled(struct daxctl_dev *dev) +{ +struct daxctl_ctx *ctx =daxctl_dev_get_ctx (dev); +char *path = dev->dev_buf; +int len = dev->buf_len; + +if (snprintf (path, len,"%s/driver" , dev->dev_path) >= len) { +err (ctx,"%s: buffer too small!\n" , +daxctl_dev_get_devname (dev)); +return 0 ; + } + +return is_enabled (path); +} + +DAXCTL_EXPORT struct daxctl_ctx *daxctl_dev_get_ctx(struct daxctl_dev *dev) +{ +return dev->region->ctx; +} + DAXCTL_EXPORT struct daxctl_dev *daxctl_dev_get_first(struct daxctl_region *region) {dax_devices_init (region);
daxctl/lib/libdaxctl.sym +6 -0
@@ -50,3 +50,9 @@ LIBDAXCTL_5 { global: daxctl_region_get_path; } LIBDAXCTL_4; + +LIBDAXCTL_6 { +global: + daxctl_dev_get_ctx; + daxctl_dev_is_enabled; +} LIBDAXCTL_5;
daxctl/libdaxctl.h +2 -0
@@ -67,6 +67,8 @@ const char *daxctl_dev_get_devname(struct daxctl_dev *dev);int daxctl_dev_get_major (struct daxctl_dev *dev);int daxctl_dev_get_minor (struct daxctl_dev *dev);unsigned long long daxctl_dev_get_size (struct daxctl_dev *dev); +struct daxctl_ctx *daxctl_dev_get_ctx (struct daxctl_dev *dev); +int daxctl_dev_is_enabled (struct daxctl_dev *dev);#define daxctl_dev_foreach (region, dev) \ for (dev = daxctl_dev_get_first(region); \
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH 2/8 libdaxctl: cache 'subsystem' in daxctl_ctx
In reply to Vishal VermaThe 'DAX subsystem' in effect is determined at region or device init time, and dictates the sysfs base paths for all device/region operations. In preparation for adding bind/unbind functionality, cache the subsystem as determined at init time in the library context.
--- daxctl/lib/libdaxctl.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
daxctl/lib/libdaxctl.c +10 -2
@@ -46,6 +46,7 @@ struct daxctl_ctx {void *userdata;int regions_init;struct list_head regions; +enum dax_subsystem subsys; };/**
@@ -96,6 +97,7 @@ DAXCTL_EXPORT int daxctl_new(struct daxctl_ctx **ctx)dbg (c,"log_priority=%d\n" , c->ctx.log_priority); *ctx = c;list_head_init (&c->regions); + c->subsys =DAX_UNKNOWN ;return 0 ; }
@@ -454,14 +456,18 @@ static void dax_devices_init(struct daxctl_region *region)for (i =0 ; i <ARRAY_SIZE (dax_subsystems); i++) {char *region_path; -if (i ==DAX_BUS ) +if (i ==DAX_BUS ) { region_path = region->region_path; -else if (i ==DAX_CLASS ) { +if (ctx->subsys ==DAX_UNKNOWN ) + ctx->subsys =DAX_BUS ; + }else if (i ==DAX_CLASS ) {if (asprintf (®ion_path,"%s/dax" , region->region_path) <0 ) {dbg (ctx,"region path alloc fail\n" );continue ; } +if (ctx->subsys ==DAX_UNKNOWN ) + ctx->subsys =DAX_CLASS ; }else continue ; sysfs_device_parse(ctx, region_path, daxdev_fmt, region,
@@ -539,6 +545,8 @@ static void __dax_regions_init(struct daxctl_ctx *ctx, enum dax_subsystem subsysfree (dev_path);if (!region)err (ctx,"add_dax_region() for %s failed\n" , de->d_name); +if (ctx->subsys ==DAX_UNKNOWN ) + ctx->subsys = subsys; }closedir (dir); }
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH 3/8 daxctl: add libdaxctl interfaces to enable/disable devices
In reply to Vishal VermaAdd new libdaxctl interfaces to disable a device_dax based devices, and to enable it into a given mode. The modes available are 'device_dax', and 'system-ram', where device_dax is the normal device DAX mode used via a character device, and 'system-ram' uses the kernel's 'kmem' facility to hotplug the device into the system's memory space, and can be used as normal system memory.
This adds the following new interfaces:
daxctl_dev_disable;
daxctl_dev_enable_devdax;
daxctl_dev_enable_ram;
--- daxctl/lib/Makefile.am | 3 +- daxctl/lib/libdaxctl-private.h | 15 ++ daxctl/lib/libdaxctl.c | 241 +++++++++++++++++++++++++++++++++ daxctl/lib/libdaxctl.sym | 3 + daxctl/libdaxctl.h | 9 ++ 5 files changed, 270 insertions(+), 1 deletion(-)
daxctl/lib/Makefile.am +2 -1
@@ -16,7 +16,8 @@ libdaxctl_la_SOURCES =\ libdaxctl.c libdaxctl_la_LIBADD =\ - $(UUID_LIBS) + $(UUID_LIBS) \ + $(KMOD_LIBS) daxctl_modprobe_data_DATA = daxctl.conf
daxctl/lib/libdaxctl-private.h +15 -0
@@ -13,6 +13,8 @@#ifndef _LIBDAXCTL_PRIVATE_H_#define _LIBDAXCTL_PRIVATE_H_ +#include <libkmod.h> +#define DAXCTL_EXPORT __attribute__ ((visibility("default"))) enum dax_subsystem {
@@ -26,6 +28,11 @@ static const char *dax_subsystems[] = { [DAX_BUS] = "/sys/bus/dax/devices", }; +static const char *dax_modules[] = { + [DAXCTL_DEV_MODE_DEVDAX ] ="device_dax" , + [DAXCTL_DEV_MODE_RAM ] ="kmem" , +}; +/** * struct daxctl_region - container for dax_devices */
@@ -53,6 +60,14 @@ struct daxctl_dev {char *dev_path;struct list_node list;unsigned long long size; +struct kmod_module *module; +struct kmod_list *kmod_list; struct daxctl_region *region; }; + +static inline int check_kmod (struct kmod_ctx *kmod_ctx) +{ +return kmod_ctx ?0 : -ENXIO ; +} +#endif /* _LIBDAXCTL_PRIVATE_H_ */
daxctl/lib/libdaxctl.c +241 -0
309 lines not on this page · raw message
daxctl/lib/libdaxctl.sym +3 -0
@@ -55,4 +55,7 @@ LIBDAXCTL_6 { global: daxctl_dev_get_ctx; daxctl_dev_is_enabled; + daxctl_dev_disable; + daxctl_dev_enable_devdax; + daxctl_dev_enable_ram; } LIBDAXCTL_5;
daxctl/libdaxctl.h +9 -0
@@ -69,6 +69,9 @@ int daxctl_dev_get_minor(struct daxctl_dev *dev);unsigned long long daxctl_dev_get_size (struct daxctl_dev *dev);struct daxctl_ctx *daxctl_dev_get_ctx (struct daxctl_dev *dev);int daxctl_dev_is_enabled (struct daxctl_dev *dev); +int daxctl_dev_disable (struct daxctl_dev *dev); +int daxctl_dev_enable_devdax (struct daxctl_dev *dev); +int daxctl_dev_enable_ram (struct daxctl_dev *dev);#define daxctl_dev_foreach (region, dev) \ for (dev = daxctl_dev_get_first(region); \
@@ -81,6 +84,12 @@ int daxctl_dev_is_enabled(struct daxctl_dev *dev); region !=NULL ; \ region = daxctl_region_get_next(region)) +enum daxctl_dev_mode { +DAXCTL_DEV_MODE_UNKNOWN , +DAXCTL_DEV_MODE_RAM , +DAXCTL_DEV_MODE_DEVDAX , +}; + #ifdef __cplusplus }/* extern "C" */ #endif
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH 4/8 ndctl: add helpers to get/set the online state for a node
In reply to Vishal VermaIn preparation for converting DAX devices for use as system-ram via the kernel's 'kmem' facility, add libndctl helpers to manipulate the sysfs interfaces to get the target_node of a DAX device, and to online, offline, and query the state of hotplugged memory sections associated with a given node.
This adds the following new interfaces:
daxctl_dev_get_target_node
daxctl_dev_online_node
daxctl_dev_offline_node
daxctl_dev_node_is_online
--- daxctl/lib/libdaxctl-private.h | 6 + daxctl/lib/libdaxctl.c | 228 +++++++++++++++++++++++++++++++++ daxctl/lib/libdaxctl.sym | 4 + daxctl/libdaxctl.h | 4 + 4 files changed, 242 insertions(+)
daxctl/lib/libdaxctl-private.h +6 -0
@@ -33,6 +33,11 @@ static const char *dax_modules[] = { [DAXCTL_DEV_MODE_RAM] = "kmem", }; +enum node_state { +NODE_OFFLINE , +NODE_ONLINE , +}; +/** * struct daxctl_region - container for dax_devices */
@@ -63,6 +68,7 @@ struct daxctl_dev {struct kmod_module *module;struct kmod_list *kmod_list;struct daxctl_region *region; +int target_node; };static inline int check_kmod (struct kmod_ctx *kmod_ctx)
daxctl/lib/libdaxctl.c +228 -0
243 lines not on this page · raw message
daxctl/lib/libdaxctl.sym +4 -0
@@ -54,8 +54,12 @@ global: LIBDAXCTL_6 { global: daxctl_dev_get_ctx; + daxctl_dev_get_target_node; daxctl_dev_is_enabled; daxctl_dev_disable; daxctl_dev_enable_devdax; daxctl_dev_enable_ram; + daxctl_dev_online_node; + daxctl_dev_offline_node; + daxctl_dev_node_is_online; } LIBDAXCTL_5;
daxctl/libdaxctl.h +4 -0
@@ -68,10 +68,14 @@ int daxctl_dev_get_major(struct daxctl_dev *dev);int daxctl_dev_get_minor (struct daxctl_dev *dev);unsigned long long daxctl_dev_get_size (struct daxctl_dev *dev);struct daxctl_ctx *daxctl_dev_get_ctx (struct daxctl_dev *dev); +int daxctl_dev_get_target_node (struct daxctl_dev *dev);int daxctl_dev_is_enabled (struct daxctl_dev *dev);int daxctl_dev_disable (struct daxctl_dev *dev);int daxctl_dev_enable_devdax (struct daxctl_dev *dev);int daxctl_dev_enable_ram (struct daxctl_dev *dev); +int daxctl_dev_online_node (struct daxctl_dev *dev); +int daxctl_dev_offline_node (struct daxctl_dev *dev); +int daxctl_dev_node_is_online (struct daxctl_dev *dev);#define daxctl_dev_foreach (region, dev) \ for (dev = daxctl_dev_get_first(region); \
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH 5/8 daxctl: add a new reconfigure-device command
In reply to Vishal VermaAdd a new command 'daxctl-reconfigure-device'. This is used to switch the mode of a dax device between regular 'device_dax' and 'system-memory'. The command also uses the memory hotplug sysfs interfaces to online the newly available memory when converting to 'system-ram', and to attempt to offline the memory when converting back to a DAX device.
--- daxctl/Makefile.am | 2 + daxctl/builtin.h | 1 + daxctl/daxctl.c | 1 + daxctl/device.c | 217 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 221 insertions(+) create mode 100644 daxctl/device.c
daxctl/Makefile.am +2 -0
@@ -15,10 +15,12 @@ daxctl_SOURCES =\ daxctl.c \ list.c \ migrate.c \ + device.c \ ../util/json.c daxctl_LDADD =\ lib/libdaxctl.la \ ../libutil.a \ $(UUID_LIBS) \ + $(KMOD_LIBS) \ $(JSON_LIBS)
daxctl/builtin.h +1 -0
@@ -6,4 +6,5 @@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);#endif /* _DAXCTL_BUILTIN_H_ */
daxctl/daxctl.c +1 -0
@@ -71,6 +71,7 @@ static struct cmd_struct commands[] = { { "list", .d_fn = cmd_list }, { "help", .d_fn = cmd_help }, { "migrate-device-model", .d_fn = cmd_migrate }, + { "reconfigure-device", .d_fn = cmd_reconfig_device }, };int main (int argc,const char **argv)
daxctl/device.c new file +217 -0
217 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH 6/8 Documentation/daxctl: add a man page for daxctl-reconfigure-device
In reply to Vishal VermaAdd a man page describing the new daxctl-reconfigure-device command.
--- Documentation/daxctl/Makefile.am | 3 +- .../daxctl/daxctl-reconfigure-device.txt | 74 +++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 Documentation/daxctl/daxctl-reconfigure-device.txt
Documentation/daxctl/Makefile.am +2 -1
@@ -28,7 +28,8 @@ endif man1_MANS = \ daxctl.1 \ daxctl-list.1 \ - daxctl-migrate-device-model.1 + daxctl-migrate-device-model.1 \ + daxctl-reconfigure-device.1 CLEANFILES = $(man1_MANS)
Documentation/daxctl/daxctl-reconfigure-device.txt new file +74 -0
74 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH 7/8 contrib/ndctl: fix region-id completions for daxctl
In reply to Vishal VermaThe completion helpers for daxctl assumed the region arguments for specifying daxctl regions were the same as ndctl regions, i.e. "regionX". This is not true - daxctl region arguments are a simple numeric 'id'.
Add a new helper __daxctl_get_regions() to complete daxctl region IDs properly.
While at it, fix a useless use of 'echo' in __daxctl_get_devs() and quoting in __daxctl_comp_options()
--- contrib/ndctl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
contrib/ndctl +10 -4
@@ -528,8 +528,14 @@ _ndctl() __daxctl_get_devs() { - local opts="--devices $*" - echo "$(daxctl list $opts | grep -E "^\s*\"chardev\":" | cut -d\" -f4)" + local opts=("--devices" "$*") + daxctl list "${opts[@]}" | grep -E "^\s*\"chardev\":" | cut -d'"' -f4 +} + +__daxctl_get_regions() +{ + local opts=("--regions" "$*") + daxctl list "${opts[@]}" | grep -E "^\s*\"id\":" | grep -Eo "[0-9]+" } __daxctlcomp()
@@ -558,10 +564,10 @@ __daxctl_comp_options() local cur_arg=${cur##*=} case $cur_subopt in --region) - opts=$(__ndctl_get_regions -i) + opts="$(__daxctl_get_regions -i)" ;; --dev) - opts=$(__daxctl_get_devs -i) + opts="$(__daxctl_get_devs -i)" ;; *) return
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH 8/8 contrib/ndctl: add bash-completion for daxctl-reconfigure-device
In reply to Vishal VermaAdd bash completion helpers for the new daxctl-reconfigure-device command.
--- contrib/ndctl | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
contrib/ndctl +17 -3
@@ -544,7 +544,7 @@ __daxctlcomp() COMPREPLY=( $( compgen -W "$1" -- "$2" ) ) for cword in "${COMPREPLY[@]}"; do - if [[ "$cword" == @(--region|--dev) ]]; then + if [[ "$cword" == @(--region|--dev|--mode) ]]; then COMPREPLY[$i]="${cword}=" else COMPREPLY[$i]="${cword} "
@@ -569,6 +569,9 @@ __daxctl_comp_options() --dev) opts="$(__daxctl_get_devs -i)" ;; + --mode) + opts="system-ram devdax" + ;; *) return ;;
@@ -579,8 +582,19 @@ __daxctl_comp_options() __daxctl_comp_non_option_args() { - # there aren't any commands that accept non option arguments yet - return + local subcmd=$1 + local cur=$2 + local opts + + case $subcmd in + reconfigure-device) + opts="$(__daxctl_get_devs -i) all" + ;; + *) + return + ;; + esac + __daxctlcomp "$opts" "$cur" } __daxctl_main()
Signature · 6 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
This all looks quite nice to me. Thanks, Vishal!
One minor nit: for those of us new to daxctl and friends, they can be a bit hard to get started with. Could you maybe add a few example invocations to the Documentation, or even this cover letter to help us newbies get started?
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Verma, Vishal L
maintainerQuoted 7 lines · Dave Hansen
This all looks quite nice to me. Thanks, Vishal!
One minor nit: for those of us new to daxctl and friends, they can be a
bit hard to get started with. Could you maybe add a few example invocations to the Documentation, or even this cover letter to help us newbies get started?
Yes, good idea, I'll add an examples section to the Documentation page (other commands do this, and this should too), and add those to the cover letter as well for v2.
Thanks!
-Vishal
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Verma, Vishal L
maintainerQuoted 11 lines · Vishal L
Quoted 9 lines · Dave Hansen
This all looks quite nice to me. Thanks, Vishal!
One minor nit: for those of us new to daxctl and friends, they can be
a
bit hard to get started with. Could you maybe add a few example invocations to the Documentation, or even this cover letter to help us
newbies get started?
Quoted 3 lines
Yes, good idea, I'll add an examples section to the Documentation page (other commands do this, and this should too), and add those to the cover letter as well for v2.
I meant to add, for now, a few of the most useful invocations probably look like:
1. # daxctl reconfigure-device --mode=system-ram dax0.0 (this will also online the memory sections)
2. # daxctl reconfigure-device --mode=system-ram --no-online dax0.0 (this will *not* online the memory sections)
3. # daxctl reconfigure-device --mode=devdax --attempt-offline dax0.0 (this requires Pavel's patches for kmem-unbind, and won't work with vanilla v5.1)
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm