From: Alison Schofield <[email protected]>
Add information useful for managing memdev partitions to cxl-list
output. Include all of the fields from GET_PARTITION_INFO and the
partitioning related fields from the IDENTIFY mailbox command.
"partition":{
"active_volatile_capacity":273535729664,
"active_persistent_capacity":0,
"next_volatile_capacity":0,
"next_persistent_capacity":0,
"total_capacity":273535729664,
"volatile_only_capacity":0,
"persistent_only_capacity":0,
"partition_alignment":268435456
}
Signed-off-by: Alison Schofield <[email protected]>
---
Documentation/cxl/cxl-list.txt | 23 +++++++
util/json.h | 1 +
cxl/list.c | 5 ++
util/json.c | 112 +++++++++++++++++++++++++++++++++
4 files changed, 141 insertions(+)
diff --git a/Documentation/cxl/cxl-list.txt b/Documentation/cxl/cxl-list.txt
index c8d10fb..e65e944 100644
--- a/Documentation/cxl/cxl-list.txt
+++ b/Documentation/cxl/cxl-list.txt
@@ -85,6 +85,29 @@ OPTIONS
}
]
----
+-P::
+--partition::
+ Include partition information in the memdev listing. Example listing:
+----
+# cxl list -m mem0 -P
+[
+ {
+ "memdev":"mem0",
+ "pmem_size":0,
+ "ram_size":273535729664,
+ "partition":{
+ "active_volatile_capacity":273535729664,
+ "active_persistent_capacity":0,
+ "next_volatile_capacity":0,
+ "next_persistent_capacity":0,
+ "total_capacity":273535729664,
+ "volatile_only_capacity":0,
+ "persistent_only_capacity":0,
+ "partition_alignment":268435456
+ }
+ }
+]
+----
include::human-option.txt[]
diff --git a/util/json.h b/util/json.h
index ce575e6..76a8816 100644
--- a/util/json.h
+++ b/util/json.h
@@ -20,6 +20,7 @@ enum util_json_flags {
UTIL_JSON_FIRMWARE = (1 << 8),
UTIL_JSON_DAX_MAPPINGS = (1 << 9),
UTIL_JSON_HEALTH = (1 << 10),
+ UTIL_JSON_PARTITION = (1 << 11),
};
struct json_object;
diff --git a/cxl/list.c b/cxl/list.c
index b1468b7..368ec21 100644
--- a/cxl/list.c
+++ b/cxl/list.c
@@ -17,6 +17,7 @@ static struct {
bool idle;
bool human;
bool health;
+ bool partition;
} list;
static unsigned long listopts_to_flags(void)
@@ -29,6 +30,8 @@ static unsigned long listopts_to_flags(void)
flags |= UTIL_JSON_HUMAN;
if (list.health)
flags |= UTIL_JSON_HEALTH;
+ if (list.partition)
+ flags |= UTIL_JSON_PARTITION;
return flags;
}
@@ -62,6 +65,8 @@ int cmd_list(int argc, const char **argv, struct cxl_ctx *ctx)
"use human friendly number formats "),
OPT_BOOLEAN('H', "health", &list.health,
"include memory device health information "),
+ OPT_BOOLEAN('P', "partition", &list.partition,
+ "include memory device partition information "),
OPT_END(),
};
const char * const u[] = {
diff --git a/util/json.c b/util/json.c
index f97cf07..4254dea 100644
--- a/util/json.c
+++ b/util/json.c
@@ -1616,6 +1616,113 @@ 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_info(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_get_partition_info_get_active_volatile_cap(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "active_volatile_capacity", jobj);
+ }
+ cap = cxl_cmd_get_partition_info_get_active_persistent_cap(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "active_persistent_capacity", jobj);
+ }
+ cap = cxl_cmd_get_partition_info_get_next_volatile_cap(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "next_volatile_capacity", jobj);
+ }
+ cap = cxl_cmd_get_partition_info_get_next_persistent_cap(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "next_persistent_capacity", 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_capacity(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart, "total_capacity", jobj);
+ }
+ cap = cxl_cmd_identify_get_volatile_only_capacity(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "volatile_only_capacity", jobj);
+ }
+ cap = cxl_cmd_identify_get_persistent_only_capacity(cmd);
+ if (cap != ULLONG_MAX) {
+ jobj = util_json_object_size(cap, flags);
+ if (jobj)
+ json_object_object_add(jpart,
+ "persistent_only_capacity", 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", jobj);
+
+ 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)
{
@@ -1643,5 +1750,10 @@ struct json_object *util_cxl_memdev_to_json(struct
cxl_memdev *memdev,
if (jobj)
json_object_object_add(jdev, "health", jobj);
}
+ if (flags & UTIL_JSON_PARTITION) {
+ jobj = util_cxl_memdev_partition_to_json(memdev, flags);
+ if (jobj)
+ json_object_object_add(jdev, "partition", jobj);
+ }
return jdev;
}
--
2.31.1
