From: Vishal Verma <vishal.l.verma@intel.com>
To: <linux-nvdimm@lists.01.org>
Cc: Ben Olson <ben.olson@intel.com>,
Dave Hansen <dave.hansen@linux.intel.com>
Subject: [ndctl PATCH v2 09/10] libdaxctl: add an API to online memory in a non-movable state
Date: Sat, 19 Oct 2019 21:23:31 -0600 [thread overview]
Message-ID: <20191020032332.16776-10-vishal.l.verma@intel.com> (raw)
In-Reply-To: <20191020032332.16776-1-vishal.l.verma@intel.com>
Some users may want additional control over the state in which memory
gets onlined - specifically, controlling the 'movable' aspect of the
resulting memory blocks.
Until now, libdaxctl only brought up memory in the 'movable' state. Add
a new interface to online memory in the non-movable state.
Link: https://github.com/pmem/ndctl/issues/110
Cc: Ben Olson <ben.olson@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
daxctl/lib/libdaxctl-private.h | 6 +++++
daxctl/lib/libdaxctl.c | 47 ++++++++++++++++++++++++++++------
daxctl/lib/libdaxctl.sym | 1 +
daxctl/libdaxctl.h | 1 +
4 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/daxctl/lib/libdaxctl-private.h b/daxctl/lib/libdaxctl-private.h
index ebaecb8..9f9c70d 100644
--- a/daxctl/lib/libdaxctl-private.h
+++ b/daxctl/lib/libdaxctl-private.h
@@ -42,6 +42,7 @@ static const char *dax_modules[] = {
enum memory_op {
MEM_SET_OFFLINE,
MEM_SET_ONLINE,
+ MEM_SET_ONLINE_NO_MOVABLE,
MEM_IS_ONLINE,
MEM_COUNT,
MEM_GET_ZONE,
@@ -65,6 +66,11 @@ static const char *zone_strings[] = {
[MEM_ZONE_MOVABLE] = "Movable",
};
+static const char *state_strings[] = {
+ [MEM_ZONE_NORMAL] = "online",
+ [MEM_ZONE_MOVABLE] = "online_movable",
+};
+
/**
* struct daxctl_region - container for dax_devices
*/
diff --git a/daxctl/lib/libdaxctl.c b/daxctl/lib/libdaxctl.c
index 49986ca..ee4a069 100644
--- a/daxctl/lib/libdaxctl.c
+++ b/daxctl/lib/libdaxctl.c
@@ -1080,11 +1080,10 @@ static int memblock_is_online(struct daxctl_memory *mem, char *memblock)
}
static int online_one_memblock(struct daxctl_memory *mem, char *memblock,
- int *status)
+ enum memory_zones zone, int *status)
{
struct daxctl_dev *dev = daxctl_memory_get_dev(mem);
struct daxctl_ctx *ctx = daxctl_dev_get_ctx(dev);
- const char *mode = "online_movable";
int len = mem->buf_len, rc;
char *path = mem->mem_buf;
const char *node_path;
@@ -1101,7 +1100,14 @@ static int online_one_memblock(struct daxctl_memory *mem, char *memblock,
if (rc)
return rc;
- rc = sysfs_write_attr_quiet(ctx, path, mode);
+ switch (zone) {
+ case MEM_ZONE_MOVABLE:
+ case MEM_ZONE_NORMAL:
+ rc = sysfs_write_attr_quiet(ctx, path, state_strings[zone]);
+ break;
+ default:
+ rc = -EINVAL;
+ }
if (rc) {
/*
* If the block got onlined, potentially by some other agent,
@@ -1266,7 +1272,11 @@ static int op_for_one_memblock(struct daxctl_memory *mem, char *memblock,
switch (op) {
case MEM_SET_ONLINE:
- return online_one_memblock(mem, memblock, status);
+ return online_one_memblock(mem, memblock, MEM_ZONE_MOVABLE,
+ status);
+ case MEM_SET_ONLINE_NO_MOVABLE:
+ return online_one_memblock(mem, memblock, MEM_ZONE_NORMAL,
+ status);
case MEM_SET_OFFLINE:
return offline_one_memblock(mem, memblock);
case MEM_IS_ONLINE:
@@ -1344,14 +1354,25 @@ out_dir:
/*
* daxctl_memory_online() will online to ZONE_MOVABLE by default
*/
-DAXCTL_EXPORT int daxctl_memory_online(struct daxctl_memory *mem)
+static int daxctl_memory_online_with_zone(struct daxctl_memory *mem,
+ enum memory_zones zone)
{
struct daxctl_dev *dev = daxctl_memory_get_dev(mem);
const char *devname = daxctl_dev_get_devname(dev);
struct daxctl_ctx *ctx = daxctl_dev_get_ctx(dev);
int rc;
- rc = daxctl_memory_op(mem, MEM_SET_ONLINE);
+ switch (zone) {
+ case MEM_ZONE_MOVABLE:
+ rc = daxctl_memory_op(mem, MEM_SET_ONLINE);
+ break;
+ case MEM_ZONE_NORMAL:
+ rc = daxctl_memory_op(mem, MEM_SET_ONLINE_NO_MOVABLE);
+ break;
+ default:
+ err(ctx, "%s: BUG: invalid zone for onlining\n", devname);
+ rc = -EINVAL;
+ }
if (rc)
return rc;
@@ -1361,10 +1382,10 @@ DAXCTL_EXPORT int daxctl_memory_online(struct daxctl_memory *mem)
* any of the blocks are not in ZONE_MOVABLE, emit a warning.
*/
mem->zone = 0;
- rc = daxctl_memory_op(mem, MEM_FIND_ZONE);
+ rc = daxctl_memory_op(mem, MEM_GET_ZONE);
if (rc)
return rc;
- if (mem->zone != MEM_ZONE_MOVABLE) {
+ if (mem->zone != zone) {
err(ctx,
"%s:\n WARNING: detected a race while onlining memory\n"
" See 'man daxctl-reconfigure-device' for more details\n",
@@ -1375,6 +1396,16 @@ DAXCTL_EXPORT int daxctl_memory_online(struct daxctl_memory *mem)
return rc;
}
+DAXCTL_EXPORT int daxctl_memory_online(struct daxctl_memory *mem)
+{
+ return daxctl_memory_online_with_zone(mem, MEM_ZONE_MOVABLE);
+}
+
+DAXCTL_EXPORT int daxctl_memory_online_no_movable(struct daxctl_memory *mem)
+{
+ return daxctl_memory_online_with_zone(mem, MEM_ZONE_NORMAL);
+}
+
DAXCTL_EXPORT int daxctl_memory_offline(struct daxctl_memory *mem)
{
return daxctl_memory_op(mem, MEM_SET_OFFLINE);
diff --git a/daxctl/lib/libdaxctl.sym b/daxctl/lib/libdaxctl.sym
index 041d9a5..87d0236 100644
--- a/daxctl/lib/libdaxctl.sym
+++ b/daxctl/lib/libdaxctl.sym
@@ -73,4 +73,5 @@ global:
LIBDAXCTL_7 {
global:
daxctl_memory_is_movable;
+ daxctl_memory_online_no_movable;
} LIBDAXCTL_6;
diff --git a/daxctl/libdaxctl.h b/daxctl/libdaxctl.h
index 8d5f8b7..6c545e1 100644
--- a/daxctl/libdaxctl.h
+++ b/daxctl/libdaxctl.h
@@ -85,6 +85,7 @@ int daxctl_memory_offline(struct daxctl_memory *mem);
int daxctl_memory_is_online(struct daxctl_memory *mem);
int daxctl_memory_num_sections(struct daxctl_memory *mem);
int daxctl_memory_is_movable(struct daxctl_memory *mem);
+int daxctl_memory_online_no_movable(struct daxctl_memory *mem);
#define daxctl_dev_foreach(region, dev) \
for (dev = daxctl_dev_get_first(region); \
--
2.20.1
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
next prev parent reply other threads:[~2019-10-20 3:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-20 3:23 [ndctl PATCH v2 00/10] fixes and movability for system-ram mode Vishal Verma
2019-10-20 3:23 ` [ndctl PATCH v2 01/10] libdaxctl: refactor path construction in op_for_one_memblock() Vishal Verma
2019-10-20 3:23 ` [ndctl PATCH v2 02/10] libdaxctl: refactor memblock_is_online() checks Vishal Verma
2019-10-20 3:23 ` [ndctl PATCH v2 03/10] daxctl/device.c: fix json output omission for reconfigure-device Vishal Verma
2019-10-20 3:23 ` [ndctl PATCH v2 04/10] libdaxctl: add an API to determine if memory is movable Vishal Verma
2019-10-20 3:23 ` [ndctl PATCH v2 05/10] libdaxctl: allow memblock_in_dev() to return an error Vishal Verma
2019-10-20 3:23 ` [ndctl PATCH v2 06/10] daxctl: show a 'movable' attribute in device listings Vishal Verma
2019-10-20 3:23 ` [ndctl PATCH v2 07/10] daxctl: detect races when onlining memory blocks Vishal Verma
2019-10-20 3:23 ` [ndctl PATCH v2 08/10] Documentation: clarify memory movablity for reconfigure-device Vishal Verma
2019-10-20 3:23 ` Vishal Verma [this message]
2019-10-20 3:23 ` [ndctl PATCH v2 10/10] daxctl: add --no-movable option for onlining memory Vishal Verma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191020032332.16776-10-vishal.l.verma@intel.com \
--to=vishal.l.verma@intel.com \
--cc=ben.olson@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=linux-nvdimm@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).