From: Alison Schofield <[email protected]>
The CXL PMEM provisioning model depends upon the values reported in
both the CXL IDENTIFY and GET_PARTITION_INFO mailbox commands when
changing the partitioning between volatile and persistent capacity.
Add an option to the 'cxl list' command to display partition information.
Include all of the fields from GET_PARTITION_INFO and the partitioning
related fields from the IDENTIFY mailbox command.
Example:
"partition_info":{
"active_volatile_size":273535729664,
"active_persistent_size":0,
"next_volatile_size":0,
"next_persistent_size":0,
"total_size":273535729664,
"volatile_only_size":0,
"persistent_only_size":0,
"partition_alignment_size":268435456
}
Signed-off-by: Alison Schofield <[email protected]>
Reviewed-by: Dan Williams <[email protected]>
---
Documentation/cxl/cxl-list.txt | 23 +++++++
cxl/filter.c | 2 +
cxl/filter.h | 1 +
cxl/json.c | 113 +++++++++++++++++++++++++++++++++
cxl/list.c | 2 +
util/json.h | 1 +
6 files changed, 142 insertions(+)
diff --git a/Documentation/cxl/cxl-list.txt b/Documentation/cxl/cxl-list.txt
index 90e6d9f..86fc4e7 100644
--- a/Documentation/cxl/cxl-list.txt
+++ b/Documentation/cxl/cxl-list.txt
@@ -196,6 +196,29 @@ OPTIONS
}
]
----
+-I::
+--partition::
+ Include partition information in the memdev listing. Example listing:
+----
+# cxl list -m mem0 -I
+[
+ {
+ "memdev":"mem0",
+ "pmem_size":0,
+ "ram_size":273535729664,
+ "partition_info":{
+ "active_volatile_size":273535729664,
+ "active_persistent_size":0,
+ "next_volatile_size":0,
+ "next_persistent_size":0,
+ "total_size":273535729664,
+ "volatile_only_size":0,
+ "persistent_only_size":0,
+ "partition_alignment_size":268435456
+ }
+ }
+]
+----
-B::
--buses::
diff --git a/cxl/filter.c b/cxl/filter.c
index 925bf3a..b339642 100644
--- a/cxl/filter.c
+++ b/cxl/filter.c
@@ -581,6 +581,8 @@ static unsigned long params_to_flags(struct
cxl_filter_params *param)
flags |= UTIL_JSON_HEALTH;
if (param->targets)
flags |= UTIL_JSON_TARGETS;
+ if (param->partition)
+ flags |= UTIL_JSON_PARTITION;
return flags;
}
diff --git a/cxl/filter.h b/cxl/filter.h
index 5deabb3..697b777 100644
--- a/cxl/filter.h
+++ b/cxl/filter.h
@@ -23,6 +23,7 @@ struct cxl_filter_params {
bool idle;
bool human;
bool health;
+ bool partition;
struct log_ctx ctx;
};
diff --git a/cxl/json.c b/cxl/json.c
index f3b536e..69671b3 100644
--- a/cxl/json.c
+++ b/cxl/json.c
@@ -185,6 +185,114 @@ err_jobj:
return NULL;
}
+/*
+ * Present complete view of memdev partition by presenting fields from
+ * both GET_PARTITION_INFO and IDENTIFY mailbox commands.
+ */
+static struct json_object *util_cxl_memdev_partition_to_json(struct cxl_memdev
*memdev,
+ unsigned long flags)
+{
+ struct json_object *jobj = NULL;
+ struct json_object *jpart;
+ unsigned long long cap;
+ struct cxl_cmd *cmd;
+ int rc;
+
+ jpart = json_object_new_object();
+ if (!jpart)
+ return NULL;
+ if (!memdev)
+ goto err_jobj;
+
+ /* Retrieve partition info in GET_PARTITION_INFO mbox cmd */
+ cmd = cxl_cmd_new_get_partition(memdev);
+ if (!cmd)
+ goto err_jobj;
+
+ rc = cxl_cmd_submit(cmd);
+ if (rc < 0)
+ goto err_cmd;
+ rc = cxl_cmd_get_mbox_status(cmd);
+ if (rc != 0)
+ goto err_cmd;
+
+ cap = cxl_cmd_partition_get_active_volatile_size(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "active_volatile_size", jobj);
+ }
+ cap = cxl_cmd_partition_get_active_persistent_size(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "active_persistent_size", jobj);
+ }
+ cap = cxl_cmd_partition_get_next_volatile_size(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "next_volatile_size", jobj);
+ }
+ cap = cxl_cmd_partition_get_next_persistent_size(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "next_persistent_size", jobj);
+ }
+ cxl_cmd_unref(cmd);
+
+ /* Retrieve partition info in the IDENTIFY mbox cmd */
+ cmd = cxl_cmd_new_identify(memdev);
+ if (!cmd)
+ goto err_jobj;
+
+ rc = cxl_cmd_submit(cmd);
+ if (rc < 0)
+ goto err_cmd;
+ rc = cxl_cmd_get_mbox_status(cmd);
+ if (rc != 0)
+ goto err_cmd;
+
+ cap = cxl_cmd_identify_get_total_size(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart, "total_size", jobj);
+ }
+ cap = cxl_cmd_identify_get_volatile_only_size(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "volatile_only_size", jobj);
+ }
+ cap = cxl_cmd_identify_get_persistent_only_size(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "persistent_only_size", jobj);
+ }
+ cap = cxl_cmd_identify_get_partition_align(cmd);
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart, "partition_alignment_size", jobj);
+
+ cxl_cmd_unref(cmd);
+ return jpart;
+
+err_cmd:
+ cxl_cmd_unref(cmd);
+err_jobj:
+ json_object_put(jpart);
+ return NULL;
+}
+
struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev,
unsigned long flags)
{
@@ -239,6 +347,11 @@ struct json_object *util_cxl_memdev_to_json(struct
cxl_memdev *memdev,
json_object_object_add(jdev, "state", jobj);
}
+ if (flags & UTIL_JSON_PARTITION) {
+ jobj = util_cxl_memdev_partition_to_json(memdev, flags);
+ if (jobj)
+ json_object_object_add(jdev, "partition_info", jobj);
+ }
return jdev;
}
diff --git a/cxl/list.c b/cxl/list.c
index de96ff9..1e9d441 100644
--- a/cxl/list.c
+++ b/cxl/list.c
@@ -48,6 +48,8 @@ static const struct option options[] = {
"use human friendly number formats "),
OPT_BOOLEAN('H', "health", ¶m.health,
"include memory device health information "),
+ OPT_BOOLEAN('I', "partition", ¶m.partition,
+ "include memory device partition information "),
#ifdef ENABLE_DEBUG
OPT_BOOLEAN(0, "debug", &debug, "debug list walk"),
#endif
diff --git a/util/json.h b/util/json.h
index e026df1..73bb9f0 100644
--- a/util/json.h
+++ b/util/json.h
@@ -19,6 +19,7 @@ enum util_json_flags {
UTIL_JSON_DAX_MAPPINGS = (1 << 9),
UTIL_JSON_HEALTH = (1 << 10),
UTIL_JSON_TARGETS = (1 << 11),
+ UTIL_JSON_PARTITION = (1 << 12),
};
void util_display_json_array(FILE *f_out, struct json_object *jarray,
--
2.31.1
