@@ -119,6 +119,10 @@ recommended to use the --no-online option described below. This will abridge
the device reconfiguration operation to just hotplugging the memory, and
refrain from then onlining it.
+In case daxctl detects that there is a kernel policy to auto-online blocks
+(via /sys/devices/system/memory/auto_online_blocks), then reconfiguring to
+system-ram will result in a failure. This can be overridden with '--force'.
+
OPTIONS
-------
include::region-option.txt[]
@@ -162,12 +166,18 @@ include::movable-options.txt[]
-f::
--force::
- When converting from "system-ram" mode to "devdax", it is expected
+ - When converting from "system-ram" mode to "devdax", it is expected
that all the memory sections are first made offline. By default,
daxctl won't touch online memory. However with this option, attempt
to offline the memory on the NUMA node associated with the dax device
before converting it back to "devdax" mode.
+ - Additionally, if a kernel policy to auto-online blocks is detected,
+ reconfiguration to system-ram fails. With this option, the failure can
+ be overridden to allow reconfiguration regardless of kernel policy.
+ Doing this may result in a successful reconfiguration, but it may
+ not be possible to subsequently offline the memory without a reboot.
+
include::human-option.txt[]
@@ -111,6 +111,7 @@ struct daxctl_memory {
char *node_path;
unsigned long block_size;
enum memory_zones zone;
+ bool auto_online;
};
@@ -1644,3 +1644,24 @@ DAXCTL_EXPORT int daxctl_memory_is_movable(struct daxctl_memory *mem)
return rc;
return (mem->zone == MEM_ZONE_MOVABLE) ? 1 : 0;
}
+
+DAXCTL_EXPORT int daxctl_dev_will_auto_online_memory(struct daxctl_dev *dev)
+{
+ const char *auto_path = "/sys/devices/system/memory/auto_online_blocks";
+ const char *devname = daxctl_dev_get_devname(dev);
+ struct daxctl_ctx *ctx = daxctl_dev_get_ctx(dev);
+ char buf[SYSFS_ATTR_SIZE];
+
+ /*
+ * If we can't read the policy for some reason, don't fail yet. Assume
+ * the auto-onlining policy is absent, and carry on. If onlining blocks
+ * does result in the memory being in an inconsistent state, we have a
+ * check and warning for it after the fact
+ */
+ if (sysfs_read_attr(ctx, auto_path, buf) != 0)
+ err(ctx, "%s: Unable to determine auto-online policy: %s\n",
+ devname, strerror(errno));
+
+ /* match both "online" and "online_movable" */
+ return !strncmp(buf, "online", 6);
+}
@@ -71,6 +71,7 @@ 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_get_target_node(struct daxctl_dev *dev);
+int daxctl_dev_will_auto_online_memory(struct daxctl_dev *dev);
struct daxctl_memory;
struct daxctl_memory *daxctl_dev_get_memory(struct daxctl_dev *dev);
@@ -541,8 +541,18 @@ static int disable_devdax_device(struct daxctl_dev *dev)
static int reconfig_mode_system_ram(struct daxctl_dev *dev)
{
+ const char *devname = daxctl_dev_get_devname(dev);
int rc, skip_enable = 0;
+ if (param.no_online || !param.no_movable) {
+ if (!param.force && daxctl_dev_will_auto_online_memory(dev)) {
+ fprintf(stderr,
+ "%s: error: kernel policy will auto-online memory, aborting\n",
+ devname);
+ return -EBUSY;
+ }
+ }
+
if (daxctl_dev_is_enabled(dev)) {
rc = disable_devdax_device(dev);
if (rc < 0)
@@ -91,3 +91,8 @@ global:
daxctl_mapping_get_size;
daxctl_dev_set_mapping;
} LIBDAXCTL_7;
+
+LIBDAXCTL_9 {
+global:
+ daxctl_dev_will_auto_online_memory;
+} LIBDAXCTL_8;
@@ -64,6 +64,26 @@ daxctl_get_mode()
"$DAXCTL" list -d "$1" | jq -er '.[].mode'
}
+set_online_policy()
+{
+ echo "online" > /sys/devices/system/memory/auto_online_blocks
+}
+
+unset_online_policy()
+{
+ echo "offline" > /sys/devices/system/memory/auto_online_blocks
+}
+
+save_online_policy()
+{
+ saved_policy="$(cat /sys/devices/system/memory/auto_online_blocks)"
+}
+
+restore_online_policy()
+{
+ echo "$saved_policy" > /sys/devices/system/memory/auto_online_blocks
+}
+
daxctl_test()
{
local daxdev
@@ -71,6 +91,9 @@ daxctl_test()
daxdev=$(daxctl_get_dev "$testdev")
test -n "$daxdev"
+ # these tests need to run with kernel onlining policy turned off
+ save_online_policy
+ unset_online_policy
"$DAXCTL" reconfigure-device -N -m system-ram "$daxdev"
[[ $(daxctl_get_mode "$daxdev") == "system-ram" ]]
"$DAXCTL" online-memory "$daxdev"
@@ -81,6 +104,19 @@ daxctl_test()
[[ $(daxctl_get_mode "$daxdev") == "system-ram" ]]
"$DAXCTL" reconfigure-device -f -m devdax "$daxdev"
[[ $(daxctl_get_mode "$daxdev") == "devdax" ]]
+
+ # this tests for reconfiguration failure if an online-policy is set
+ set_online_policy
+ : "This command is expected to fail:"
+ if ! "$DAXCTL" reconfigure-device -N -m system-ram "$daxdev"; then
+ echo "reconfigure failed as expected"
+ else
+ echo "reconfigure succeded, expected failure"
+ restore_online_policy
+ return 1
+ fi
+
+ restore_online_policy
}
find_testdev
If the kernel has a policy set to auto-online any new memory blocks, we know that an attempt to reconfigure a device either in ZONE_MOVABLE, or with the --no-online is going to fail. While we detect this race after the fact, and print a warning, that is often insufficient as the user may be forced to reboot to get out of the situation, resulting in an unpleasant experience. Detect whether the kernel policy is set to auto-online. If so, fail device reconfigure operations that we know can't be satisfied. Allow for overriding this safety check via the -f (--force) option. Update the man page to talk about this, and the unit test to test for an expected failure by enabling auto-onlining. Cc: Dave Hansen <dave.hansen@intel.com> Reported-by: Chunye Xu <chunye.xu@intel.com> Reported-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> --- .../daxctl/daxctl-reconfigure-device.txt | 12 ++++++- daxctl/lib/libdaxctl-private.h | 1 + daxctl/lib/libdaxctl.c | 21 +++++++++++ daxctl/libdaxctl.h | 1 + daxctl/device.c | 10 ++++++ daxctl/lib/libdaxctl.sym | 5 +++ test/daxctl-devices.sh | 36 +++++++++++++++++++ 7 files changed, 85 insertions(+), 1 deletion(-)