On Thu, Oct 14, 2021 at 4:42 PM Verma, Vishal L <[email protected]> wrote: > > On Thu, 2021-10-07 at 02:21 -0600, Vishal Verma wrote: > > Add JSON output for fields from the 'GET_HEALTH_INFO' mailbox command > > to memory device listings. > > > > Signed-off-by: Vishal Verma <[email protected]> > > --- > > Documentation/cxl/cxl-list.txt | 4 + > > util/json.h | 1 + > > cxl/list.c | 5 + > > util/json.c | 189 +++++++++++++++++++++++++++++++++ > > 4 files changed, 199 insertions(+) > > > > diff --git a/Documentation/cxl/cxl-list.txt b/Documentation/cxl/cxl-list.txt > > index bd377b3..dc86651 100644 > > --- a/Documentation/cxl/cxl-list.txt > > +++ b/Documentation/cxl/cxl-list.txt > > @@ -53,6 +53,10 @@ OPTIONS > > --idle:: > > Include idle (not enabled / zero-sized) devices in the listing > > > > +-H:: > > +--health:: > > + Include health information in the memdev listing > > + > > include::human-option.txt[] > > > > include::verbose-option.txt[] > > diff --git a/util/json.h b/util/json.h > > index 91918c8..ce575e6 100644 > > --- a/util/json.h > > +++ b/util/json.h > > @@ -19,6 +19,7 @@ enum util_json_flags { > > UTIL_JSON_CONFIGURED = (1 << 7), > > UTIL_JSON_FIRMWARE = (1 << 8), > > UTIL_JSON_DAX_MAPPINGS = (1 << 9), > > + UTIL_JSON_HEALTH = (1 << 10), > > }; > > > > struct json_object; > > diff --git a/cxl/list.c b/cxl/list.c > > index 3dea73f..2fa155a 100644 > > --- a/cxl/list.c > > +++ b/cxl/list.c > > @@ -16,6 +16,7 @@ static struct { > > bool memdevs; > > bool idle; > > bool human; > > + bool health; > > } list; > > > > static unsigned long listopts_to_flags(void) > > @@ -26,6 +27,8 @@ static unsigned long listopts_to_flags(void) > > flags |= UTIL_JSON_IDLE; > > if (list.human) > > flags |= UTIL_JSON_HUMAN; > > + if (list.health) > > + flags |= UTIL_JSON_HEALTH; > > return flags; > > } > > > > @@ -57,6 +60,8 @@ int cmd_list(int argc, const char **argv, struct cxl_ctx > > *ctx) > > OPT_BOOLEAN('i', "idle", &list.idle, "include idle devices"), > > OPT_BOOLEAN('u', "human", &list.human, > > "use human friendly number formats "), > > + OPT_BOOLEAN('H', "health", &list.health, > > + "include memory device health information "), > > OPT_END(), > > }; > > const char * const u[] = { > > diff --git a/util/json.c b/util/json.c > > index 3be3a92..dfc7b8e 100644 > > --- a/util/json.c > > +++ b/util/json.c > > @@ -1442,6 +1442,190 @@ struct json_object *util_badblock_rec_to_json(u64 > > block, u64 count, > > return NULL; > > } > > > > +static struct json_object *util_cxl_memdev_health_to_json( > > + struct cxl_memdev *memdev, unsigned long flags) > > +{ > > + const char *devname = cxl_memdev_get_devname(memdev); > > + struct json_object *jhealth; > > + struct json_object *jobj; > > + struct cxl_cmd *cmd; > > + u32 field; > > + int rc; > > + > > + jhealth = json_object_new_object(); > > + if (!jhealth) > > + return NULL; > > + if (!memdev) > > + goto err_jobj; > > + > > + cmd = cxl_cmd_new_get_health_info(memdev); > > + if (!cmd) > > + goto err_jobj; > > + > > + rc = cxl_cmd_submit(cmd); > > + /* ENOTTY - command not supported by the memdev */ > > + if (rc == -ENOTTY) > > + goto err_cmd; > > I'll remove this special case, as well as the error prints below. The > cmd submission could fail for any number of reasons, including > unsupported by hardware - I think for any of those cases, we can just > silently skip printing the json fields here.
Sounds good. If someone really cares, the debug prints inside cxl_cmd_submit() should be enough to indicate what went wrong.
