From patchwork Tue Feb 12 21:28:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10808733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3B9F13B4 for ; Tue, 12 Feb 2019 21:41:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A12922C1B0 for ; Tue, 12 Feb 2019 21:41:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95B992C1B3; Tue, 12 Feb 2019 21:41:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 441BC2C1B0 for ; Tue, 12 Feb 2019 21:41:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 18970202E5327; Tue, 12 Feb 2019 13:41:38 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 63A4A202E5322 for ; Tue, 12 Feb 2019 13:41:37 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Feb 2019 13:41:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,362,1544515200"; d="scan'208";a="138089991" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga001.jf.intel.com with ESMTP; 12 Feb 2019 13:41:36 -0800 Subject: [ndctl PATCH 2/8] ndctl/dimm: Add --human support to read-labels From: Dan Williams To: linux-nvdimm@lists.01.org Date: Tue, 12 Feb 2019 13:28:59 -0800 Message-ID: <155000693912.348282.3054365378477074974.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <155000692826.348282.2795434657787204298.stgit@dwillia2-desk3.amr.corp.intel.com> References: <155000692826.348282.2795434657787204298.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Allow for easier comparisons between 'read-labels' output and list. Signed-off-by: Dan Williams --- ndctl/dimm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ndctl/dimm.c b/ndctl/dimm.c index 292beebf9734..5ff730f42a45 100644 --- a/ndctl/dimm.c +++ b/ndctl/dimm.c @@ -50,6 +50,7 @@ static struct parameters { bool crypto_erase; bool overwrite; bool master_pass; + bool human; bool force; bool json; bool verbose; @@ -79,7 +80,7 @@ static int action_zero(struct ndctl_dimm *dimm, struct action_context *actx) } static struct json_object *dump_label_json(struct ndctl_dimm *dimm, - struct ndctl_cmd *cmd_read, ssize_t size) + struct ndctl_cmd *cmd_read, ssize_t size, unsigned long flags) { struct json_object *jarray = json_object_new_array(); struct json_object *jlabel = NULL; @@ -140,12 +141,13 @@ static struct json_object *dump_label_json(struct ndctl_dimm *dimm, break; json_object_object_add(jlabel, "nlabel", jobj); - jobj = json_object_new_int64(le64_to_cpu(nslabel.flags)); + jobj = util_json_object_hex(le32_to_cpu(nslabel.flags), flags); if (!jobj) break; json_object_object_add(jlabel, "flags", jobj); - jobj = json_object_new_int64(le64_to_cpu(nslabel.isetcookie)); + jobj = util_json_object_hex(le64_to_cpu(nslabel.isetcookie), + flags); if (!jobj) break; json_object_object_add(jlabel, "isetcookie", jobj); @@ -155,12 +157,12 @@ static struct json_object *dump_label_json(struct ndctl_dimm *dimm, break; json_object_object_add(jlabel, "lbasize", jobj); - jobj = json_object_new_int64(le64_to_cpu(nslabel.dpa)); + jobj = util_json_object_hex(le64_to_cpu(nslabel.dpa), flags); if (!jobj) break; json_object_object_add(jlabel, "dpa", jobj); - jobj = json_object_new_int64(le64_to_cpu(nslabel.rawsize)); + jobj = util_json_object_size(le64_to_cpu(nslabel.rawsize), flags); if (!jobj) break; json_object_object_add(jlabel, "rawsize", jobj); @@ -265,6 +267,7 @@ static struct json_object *dump_index_json(struct ndctl_cmd *cmd_read, ssize_t s static struct json_object *dump_json(struct ndctl_dimm *dimm, struct ndctl_cmd *cmd_read, ssize_t size) { + unsigned long flags = param.human ? UTIL_JSON_HUMAN : 0; struct json_object *jdimm = json_object_new_object(); struct json_object *jlabel, *jobj, *jindex; @@ -273,7 +276,7 @@ static struct json_object *dump_json(struct ndctl_dimm *dimm, jindex = dump_index_json(cmd_read, size); if (!jindex) goto err_jindex; - jlabel = dump_label_json(dimm, cmd_read, size); + jlabel = dump_label_json(dimm, cmd_read, size, flags); if (!jlabel) goto err_jlabel; @@ -1038,7 +1041,8 @@ OPT_BOOLEAN('v',"verbose", ¶m.verbose, "turn on debug") #define READ_OPTIONS() \ OPT_STRING('o', "output", ¶m.outfile, "output-file", \ "filename to write label area contents"), \ -OPT_BOOLEAN('j', "json", ¶m.json, "parse label data into json") +OPT_BOOLEAN('j', "json", ¶m.json, "parse label data into json"), \ +OPT_BOOLEAN('u', "human", ¶m.human, "use human friendly number formats ") #define WRITE_OPTIONS() \ OPT_STRING('i', "input", ¶m.infile, "input-file", \