On 07/30, Verma, Vishal L wrote: > On Fri, 2019-07-26 at 19:52 -0600, Vishal Verma wrote: > > Add 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. > > > > Cc: Pavel Tatashin <[email protected]> > > Cc: Dave Hansen <[email protected]> > > Cc: Dan Williams <[email protected]> > > Signed-off-by: Vishal Verma <[email protected]> > > --- > > daxctl/Makefile.am | 2 + > > daxctl/builtin.h | 1 + > > daxctl/daxctl.c | 1 + > > daxctl/device.c | 503 +++++++++++++++++++++++++++++++++++++++++++++ > > 4 files changed, 507 insertions(+) > > create mode 100644 daxctl/device.c > > > > +static int verify_dax_bus_model(struct daxctl_dev *dev) > > +{ > > I suspect this check is screaming to be moved into the library, and be > invoked internally by the 'enable' and 'is_enabled' routines. > > When in the dax-class model, a listing of the dax device will currently > show: > > { > "chardev":"dax1.0", > "size":799063146496, > "target_node":3, > "mode":"devdax", > "state":"disabled" > } > > Where the state: disabled is misleading. >
I think I have all the dax-class oddness fixed with the attached incremental patch (on top of the series). I'll send a new set with these changes folded in. >From de16d2c286fac61f25ddfc37943161932cd72bd4 Mon Sep 17 00:00:00 2001 From: Vishal Verma <[email protected]> Date: Wed, 31 Jul 2019 16:47:53 -0600 Subject: [ndctl PATCH] fixup --- .../daxctl/daxctl-reconfigure-device.txt | 5 +- daxctl/device.c | 56 +------------ daxctl/lib/libdaxctl.c | 78 +++++++++++++++---- 3 files changed, 70 insertions(+), 69 deletions(-) diff --git a/Documentation/daxctl/daxctl-reconfigure-device.txt b/Documentation/daxctl/daxctl-reconfigure-device.txt index fe87762..196d692 100644 --- a/Documentation/daxctl/daxctl-reconfigure-device.txt +++ b/Documentation/daxctl/daxctl-reconfigure-device.txt @@ -91,8 +91,9 @@ in use (via the dax_pmem_compat driver), the reconfiguration will fail with an error such as the following: ---- # daxctl reconfigure-device --mode=system-ram --region=0 all -dax3.0: dax-class device model unsupported -error reconfiguring devices: No such device or address +libdaxctl: daxctl_dev_disable: dax3.0: error: device model is dax-class +dax3.0: disable failed: Operation not supported +error reconfiguring devices: Operation not supported reconfigured 0 devices ---- diff --git a/daxctl/device.c b/daxctl/device.c index 01d057e..4887ccf 100644 --- a/daxctl/device.c +++ b/daxctl/device.c @@ -378,51 +378,6 @@ static int reconfig_mode_devdax(struct daxctl_dev *dev) return 0; } -static int verify_dax_bus_model(struct daxctl_dev *dev) -{ - const char *devname = daxctl_dev_get_devname(dev); - char *dev_path, *subsys_path, *resolved; - struct stat sb; - int rc; - - if (asprintf(&dev_path, "/dev/%s", devname) < 0) - return -ENOMEM; - - rc = lstat(dev_path, &sb); - if (rc < 0) { - rc = -errno; - fprintf(stderr, "%s: stat for %s failed: %s\n", - devname, dev_path, strerror(-rc)); - goto out_dev;; - } - - if (asprintf(&subsys_path, "/sys/dev/char/%d:%d/subsystem", - major(sb.st_rdev), minor(sb.st_rdev)) < 0) { - rc = -ENOMEM; - goto out_dev; - } - - resolved = realpath(subsys_path, NULL); - if (!resolved) { - rc = -errno; - fprintf(stderr, "%s: unable to determine subsys: %s\n", - devname, strerror(errno)); - goto out_subsys; - } - - if (strcmp(resolved, "/sys/bus/dax") == 0) - rc = 0; - else - rc = -ENXIO; - - free(resolved); -out_subsys: - free(subsys_path); -out_dev: - free(dev_path); - return rc; -} - static int do_reconfig(struct daxctl_dev *dev, enum dev_mode mode, struct json_object **jdevs) { @@ -430,12 +385,6 @@ static int do_reconfig(struct daxctl_dev *dev, enum dev_mode mode, struct json_object *jdev; int rc = 0; - if (verify_dax_bus_model(dev) != 0) { - fprintf(stderr, "%s: dax-class device model unsupported\n", - devname); - return -ENXIO; - } - switch (mode) { case DAXCTL_DEV_MODE_RAM: rc = reconfig_mode_system_ram(dev); @@ -449,6 +398,9 @@ static int do_reconfig(struct daxctl_dev *dev, enum dev_mode mode, rc = -EINVAL; } + if (rc) + return rc; + *jdevs = json_object_new_array(); if (*jdevs) { jdev = util_daxctl_dev_to_json(dev, flags); @@ -456,7 +408,7 @@ static int do_reconfig(struct daxctl_dev *dev, enum dev_mode mode, json_object_array_add(*jdevs, jdev); } - return rc; + return 0; } static int do_xline(struct daxctl_dev *dev, enum device_action action) diff --git a/daxctl/lib/libdaxctl.c b/daxctl/lib/libdaxctl.c index c2a2a50..066f718 100644 --- a/daxctl/lib/libdaxctl.c +++ b/daxctl/lib/libdaxctl.c @@ -355,39 +355,74 @@ static struct kmod_list *to_module_list(struct daxctl_ctx *ctx, return list; } -static int dev_is_system_ram_capable(struct daxctl_dev *dev) +static bool device_model_is_dax_bus(struct daxctl_dev *dev) +{ + const char *devname = daxctl_dev_get_devname(dev); + struct daxctl_ctx *ctx = daxctl_dev_get_ctx(dev); + char *path = dev->dev_buf, *resolved; + size_t len = dev->buf_len; + struct stat sb; + + if (snprintf(path, len, "/dev/%s", devname) < 0) + return false; + + if (lstat(path, &sb) < 0) { + err(ctx, "%s: stat for %s failed: %s\n", + devname, path, strerror(errno)); + return false; + } + + if (snprintf(path, len, "/sys/dev/char/%d:%d/subsystem", + major(sb.st_rdev), minor(sb.st_rdev)) < 0) + return false; + + resolved = realpath(path, NULL); + if (!resolved) { + err(ctx, "%s: unable to determine subsys: %s\n", + devname, strerror(errno)); + return false; + } + + if (strcmp(resolved, "/sys/bus/dax") == 0) { + free(resolved); + return true; + } + + free(resolved); + return false; +} + +static bool dev_is_system_ram_capable(struct daxctl_dev *dev) { const char *devname = daxctl_dev_get_devname(dev); struct daxctl_ctx *ctx = daxctl_dev_get_ctx(dev); char *mod_path, *mod_base; char path[200]; - int rc = 0; const int len = sizeof(path); + if (!device_model_is_dax_bus(dev)) + return false; + if (!daxctl_dev_is_enabled(dev)) - return rc; + return false; if (snprintf(path, len, "%s/driver/module", dev->dev_path) >= len) { err(ctx, "%s: buffer too small!\n", devname); - return -ENXIO; + return false; } mod_path = realpath(path, NULL); - if (!mod_path) { - rc = -errno; - err(ctx, "%s: unable to determine module: %s\n", devname, - strerror(errno)); - return rc; - } + if (!mod_path) + return false; mod_base = basename(mod_path); - if (strcmp(mod_base, dax_modules[DAXCTL_DEV_MODE_RAM]) == 0) - rc = 1; - else if (strcmp(mod_base, dax_modules[DAXCTL_DEV_MODE_DEVDAX]) == 0) - rc = 0; + if (strcmp(mod_base, dax_modules[DAXCTL_DEV_MODE_RAM]) == 0) { + free(mod_path); + return true; + } free(mod_path); - return rc; + return false; } /* @@ -821,6 +856,9 @@ DAXCTL_EXPORT int daxctl_dev_is_enabled(struct daxctl_dev *dev) char *path = dev->dev_buf; int len = dev->buf_len; + if (!device_model_is_dax_bus(dev)) + return 1; + if (snprintf(path, len, "%s/driver", dev->dev_path) >= len) { err(ctx, "%s: buffer too small!\n", daxctl_dev_get_devname(dev)); @@ -877,6 +915,11 @@ static int daxctl_dev_enable(struct daxctl_dev *dev, enum daxctl_dev_mode mode) const char *mod_name = dax_modules[mode]; int rc; + if (!device_model_is_dax_bus(dev)) { + err(ctx, "%s: error: device model is dax-class\n", devname); + return -EOPNOTSUPP; + } + if (daxctl_dev_is_enabled(dev)) return 0; @@ -917,6 +960,11 @@ DAXCTL_EXPORT int daxctl_dev_disable(struct daxctl_dev *dev) const char *devname = daxctl_dev_get_devname(dev); struct daxctl_ctx *ctx = daxctl_dev_get_ctx(dev); + if (!device_model_is_dax_bus(dev)) { + err(ctx, "%s: error: device model is dax-class\n", devname); + return -EOPNOTSUPP; + } + if (!daxctl_dev_is_enabled(dev)) return 0; -- 2.20.1 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
