From: Jonathan Zhang <jonzhang@fb.com>
To: <linux-cxl@vger.kernel.org>, <vishal.l.verma@intel.com>,
<wzhang@meta.com>
Cc: Jonathan Zhang <jonzhang@meta.com>
Subject: [PATCH 2/2] cxl: display alert configuratin fields in list command
Date: Mon, 3 Oct 2022 16:23:06 -0700 [thread overview]
Message-ID: <20221003232306.1326511-3-jonzhang@fb.com> (raw)
In-Reply-To: <20221003232306.1326511-1-jonzhang@fb.com>
From: Jonathan Zhang <jonzhang@meta.com>
When list commands are issued, display alert config:
Signed-off-by: Jonathan Zhang <jonzhang@meta.com>
---
Documentation/cxl/cxl-list.txt | 33 +++++++++
cxl/filter.c | 2 +
cxl/filter.h | 1 +
cxl/json.c | 131 +++++++++++++++++++++++++++++++++
cxl/list.c | 3 +
util/json.h | 1 +
6 files changed, 171 insertions(+)
diff --git a/Documentation/cxl/cxl-list.txt b/Documentation/cxl/cxl-list.txt
index 14a2b4b..66dfa15 100644
--- a/Documentation/cxl/cxl-list.txt
+++ b/Documentation/cxl/cxl-list.txt
@@ -219,6 +219,39 @@ OPTIONS
}
]
----
+-A::
+--alert::
+ Include alert configuration in the memdev listing. Example listing:
+----
+# cxl list -m mem0 -A
+[
+ {
+ "memdev":"mem0",
+ "pmem_size":0,
+ "ram_size":273535729664,
+ "alert":{
+ "life_used_prog_warn_threshold_valid":false,
+ "dev_over_temp_prog_warn_threshold_valid":false,
+ "dev_under_temp_prog_warn_threshold_valid":false,
+ "corr_vol_mem_err_prog_warn_threshold_valid":true,
+ "corr_pers_mem_err_prog_warn_threshold_valid":false,
+ "life_used_prog_warn_threshold_programmable":false,
+ "dev_over_temp_prog_warn_threshold_programmable":false,
+ "dev_under_temp_prog_warn_threshold_programmable":false,
+ "corr_vol_mem_err_prog_warn_threshold_programmable":true,
+ "corr_pers_mem_err_prog_warn_threshold_programmable":false,
+ "life_used_crit_alert_threshold":0,
+ "life_used_prog_warn_threshold":0,
+ "dev_over_temp_crit_alert_threshold":0,
+ "dev_under_temp_crit_alert_threshold":0,
+ "dev_over_temp_prog_warn_threshold":0,
+ "dev_under_temp_prog_warn_threshold":0,
+ "corr_vol_mem_err_prog_warn_threshold":0,
+ "corr_pers_mem_err_prog_warn_threshold":0
+ },
+ }
+]
+----
-B::
--buses::
diff --git a/cxl/filter.c b/cxl/filter.c
index 56c6599..6d71c1c 100644
--- a/cxl/filter.c
+++ b/cxl/filter.c
@@ -686,6 +686,8 @@ static unsigned long params_to_flags(struct cxl_filter_params *param)
flags |= UTIL_JSON_TARGETS;
if (param->partition)
flags |= UTIL_JSON_PARTITION;
+ if (param->alert)
+ flags |= UTIL_JSON_ALERT;
return flags;
}
diff --git a/cxl/filter.h b/cxl/filter.h
index 256df49..ec0f74c 100644
--- a/cxl/filter.h
+++ b/cxl/filter.h
@@ -26,6 +26,7 @@ struct cxl_filter_params {
bool human;
bool health;
bool partition;
+ bool alert;
int verbose;
struct log_ctx ctx;
};
diff --git a/cxl/json.c b/cxl/json.c
index 63c1751..dd83ed6 100644
--- a/cxl/json.c
+++ b/cxl/json.c
@@ -185,6 +185,131 @@ err_jobj:
return NULL;
}
+static struct json_object *util_cxl_memdev_alert_to_json(
+ struct cxl_memdev *memdev, unsigned long flags)
+{
+ struct json_object *jalert;
+ struct json_object *jobj;
+ struct cxl_cmd *cmd;
+ int rc;
+
+ jalert = json_object_new_object();
+ if (!jalert)
+ return NULL;
+ if (!memdev)
+ goto err_jobj;
+
+ cmd = cxl_cmd_new_get_alert_config(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;
+
+ rc = cxl_cmd_alert_config_get_life_used_prog_warn_threshold_valid(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "life_used_prog_warn_threshold_valid", jobj);
+
+ rc = cxl_cmd_alert_config_get_dev_over_temp_prog_warn_threshold_valid(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "dev_over_temp_prog_warn_threshold_valid", jobj);
+
+ rc = cxl_cmd_alert_config_get_dev_under_temp_prog_warn_threshold_valid(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "dev_under_temp_prog_warn_threshold_valid", jobj);
+
+ rc = cxl_cmd_alert_config_get_corr_vol_mem_err_prog_warn_threshold_valid(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "corr_vol_mem_err_prog_warn_threshold_valid", jobj);
+
+ rc = cxl_cmd_alert_config_get_corr_pers_mem_err_prog_warn_threshold_valid(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "corr_pers_mem_err_prog_warn_threshold_valid", jobj);
+
+ rc = cxl_cmd_alert_config_get_life_used_prog_warn_threshold_prog(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "life_used_prog_warn_threshold_programmable", jobj);
+
+ rc = cxl_cmd_alert_config_get_dev_over_temp_prog_warn_threshold_prog(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "dev_over_temp_prog_warn_threshold_programmable", jobj);
+
+ rc = cxl_cmd_alert_config_get_dev_under_temp_prog_warn_threshold_prog(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "dev_under_temp_prog_warn_threshold_programmable", jobj);
+
+ rc = cxl_cmd_alert_config_get_corr_vol_mem_err_prog_warn_threshold_prog(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "corr_vol_mem_err_prog_warn_threshold_programmable", jobj);
+
+ rc = cxl_cmd_alert_config_get_corr_pers_mem_err_prog_warn_threshold_prog(cmd);
+ jobj = json_object_new_boolean(rc);
+ if (jobj)
+ json_object_object_add(jalert, "corr_pers_mem_err_prog_warn_threshold_programmable", jobj);
+
+ rc = cxl_cmd_alert_config_get_life_used_crit_alert_threshold(cmd);
+ jobj = json_object_new_int(rc);
+ if (jobj)
+ json_object_object_add(jalert, "life_used_crit_alert_threshold", jobj);
+
+ rc = cxl_cmd_alert_config_get_life_used_prog_warn_threshold(cmd);
+ jobj = json_object_new_int(rc);
+ if (jobj)
+ json_object_object_add(jalert, "life_used_prog_warn_threshold", jobj);
+
+ rc = cxl_cmd_alert_config_get_dev_over_temp_crit_alert_threshold(cmd);
+ jobj = json_object_new_int(rc);
+ if (jobj)
+ json_object_object_add(jalert, "dev_over_temp_crit_alert_threshold", jobj);
+
+ rc = cxl_cmd_alert_config_get_dev_under_temp_crit_alert_threshold(cmd);
+ jobj = json_object_new_int(rc);
+ if (jobj)
+ json_object_object_add(jalert, "dev_under_temp_crit_alert_threshold", jobj);
+
+ rc = cxl_cmd_alert_config_get_dev_over_temp_prog_warn_threshold(cmd);
+ jobj = json_object_new_int(rc);
+ if (jobj)
+ json_object_object_add(jalert, "dev_over_temp_prog_warn_threshold", jobj);
+
+ rc = cxl_cmd_alert_config_get_dev_under_temp_prog_warn_threshold(cmd);
+ jobj = json_object_new_int(rc);
+ if (jobj)
+ json_object_object_add(jalert, "dev_under_temp_prog_warn_threshold", jobj);
+
+ rc = cxl_cmd_alert_config_get_corr_vol_mem_err_prog_warn_threshold(cmd);
+ jobj = json_object_new_int(rc);
+ if (jobj)
+ json_object_object_add(jalert, "corr_vol_mem_err_prog_warn_threshold", jobj);
+
+ rc = cxl_cmd_alert_config_get_corr_pers_mem_err_prog_warn_threshold(cmd);
+ jobj = json_object_new_int(rc);
+ if (jobj)
+ json_object_object_add(jalert, "corr_pers_mem_err_prog_warn_threshold", jobj);
+
+ cxl_cmd_unref(cmd);
+ return jalert;
+
+err_cmd:
+ cxl_cmd_unref(cmd);
+err_jobj:
+ json_object_put(jalert);
+ return NULL;
+}
+
/*
* Present complete view of memdev partition by presenting fields from
* both GET_PARTITION_INFO and IDENTIFY mailbox commands.
@@ -330,6 +455,12 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev,
json_object_object_add(jdev, "health", jobj);
}
+ if (flags & UTIL_JSON_ALERT) {
+ jobj = util_cxl_memdev_alert_to_json(memdev, flags);
+ if (jobj)
+ json_object_object_add(jdev, "alert", jobj);
+ }
+
serial = cxl_memdev_get_serial(memdev);
if (serial < ULLONG_MAX) {
jobj = util_json_object_hex(serial, flags);
diff --git a/cxl/list.c b/cxl/list.c
index 8c48fbb..6ec4403 100644
--- a/cxl/list.c
+++ b/cxl/list.c
@@ -52,6 +52,8 @@ static const struct option options[] = {
"include memory device health information"),
OPT_BOOLEAN('I', "partition", ¶m.partition,
"include memory device partition information"),
+ OPT_BOOLEAN('A', "alert", ¶m.alert,
+ "include alert configuration information"),
OPT_INCR('v', "verbose", ¶m.verbose,
"increase output detail"),
#ifdef ENABLE_DEBUG
@@ -113,6 +115,7 @@ int cmd_list(int argc, const char **argv, struct cxl_ctx *ctx)
case 3:
param.health = true;
param.partition = true;
+ param.alert = true;
/* fallthrough */
case 2:
param.idle = true;
diff --git a/util/json.h b/util/json.h
index 73bb9f0..06594b5 100644
--- a/util/json.h
+++ b/util/json.h
@@ -20,6 +20,7 @@ enum util_json_flags {
UTIL_JSON_HEALTH = (1 << 10),
UTIL_JSON_TARGETS = (1 << 11),
UTIL_JSON_PARTITION = (1 << 12),
+ UTIL_JSON_ALERT = (1 << 13),
};
void util_display_json_array(FILE *f_out, struct json_object *jarray,
--
2.30.2
next prev parent reply other threads:[~2022-10-03 23:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 23:23 [ndctl PATCH 0/2] add support for CCI command Get Alert Configuration Jonathan Zhang
2022-10-03 23:23 ` [PATCH 1/2] libcxl: add accessors for Get Alert Configuration CCI command output Jonathan Zhang
2022-10-21 7:30 ` Verma, Vishal L
2022-10-21 7:35 ` Verma, Vishal L
2022-10-03 23:23 ` Jonathan Zhang [this message]
2022-10-21 7:30 ` [PATCH 2/2] cxl: display alert configuratin fields in list command Verma, Vishal L
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=20221003232306.1326511-3-jonzhang@fb.com \
--to=jonzhang@fb.com \
--cc=jonzhang@meta.com \
--cc=linux-cxl@vger.kernel.org \
--cc=vishal.l.verma@intel.com \
--cc=wzhang@meta.com \
/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