From patchwork Fri Jan 11 22:53:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10760769 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 1D41F91E for ; Fri, 11 Jan 2019 22:53:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07D592A25B for ; Fri, 11 Jan 2019 22:53:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F07692A25E; Fri, 11 Jan 2019 22:53:52 +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 83D2D2A34C for ; Fri, 11 Jan 2019 22:53:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2607B2194D3B8; Fri, 11 Jan 2019 14:53:52 -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=134.134.136.100; helo=mga07.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 3A971211B6C22 for ; Fri, 11 Jan 2019 14:53:51 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jan 2019 14:53:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,467,1539673200"; d="scan'208";a="125253704" Received: from vverma7-desk1.lm.intel.com ([10.232.112.170]) by FMSMGA003.fm.intel.com with ESMTP; 11 Jan 2019 14:53:50 -0800 From: Vishal Verma To: Subject: [ndctl PATCH 1/3] libndctl, intel: Add infrastructure for firmware_status translation Date: Fri, 11 Jan 2019 15:53:37 -0700 Message-Id: <20190111225339.6939-2-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190111225339.6939-1-vishal.l.verma@intel.com> References: <20190111225339.6939-1-vishal.l.verma@intel.com> 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: , Cc: Ami Pathak MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Add a new routine to ndctl_dimm_ops that allows a DSM family to provide a translation routine that will translate the status codes of the result of a DSM to generic errno style error codes. To use this routine effectively, add a new wrapper around ndctl_cmd_submit (called ndctl_cmd_submit_xlat) that submits the command, and also runs it through the above translator dimm_op (if one is is defined). Cc: Dan Williams Signed-off-by: Vishal Verma --- ndctl/lib/intel.c | 49 ++++++++++++++++++++++++++++++++++++++++++ ndctl/lib/intel.h | 1 + ndctl/lib/libndctl.c | 26 ++++++++++++++++++++++ ndctl/lib/libndctl.sym | 6 ++++++ ndctl/lib/private.h | 1 + ndctl/libndctl.h | 3 +++ 6 files changed, 86 insertions(+) diff --git a/ndctl/lib/intel.c b/ndctl/lib/intel.c index 744386f..d684bac 100644 --- a/ndctl/lib/intel.c +++ b/ndctl/lib/intel.c @@ -16,6 +16,54 @@ #include #include "private.h" +static int intel_cmd_xlat_firmware_status(struct ndctl_cmd *cmd) +{ + struct nd_pkg_intel *pkg = cmd->intel; + unsigned int status, ext_status; + + status = (*cmd->firmware_status) & ND_INTEL_STATUS_MASK; + ext_status = (*cmd->firmware_status) & ND_INTEL_STATUS_EXTEND_MASK; + + /* Common statuses */ + switch (status) { + case ND_INTEL_STATUS_SUCCESS: + return 0; + case ND_INTEL_STATUS_NOTSUPP: + return -EOPNOTSUPP; + case ND_INTEL_STATUS_NOTEXIST: + return -ENXIO; + case ND_INTEL_STATUS_INVALPARM: + return -EINVAL; + case ND_INTEL_STATUS_HWERR: + return -EIO; + case ND_INTEL_STATUS_RETRY: + return -EAGAIN; + case ND_INTEL_STATUS_EXTEND: + /* refer to extended status, break out of this */ + break; + case ND_INTEL_STATUS_NORES: + return -EAGAIN; + case ND_INTEL_STATUS_NOTREADY: + return -EBUSY; + } + + /* Extended status is command specific */ + switch (pkg->gen.nd_command) { + case ND_INTEL_SMART: + case ND_INTEL_SMART_THRESHOLD: + case ND_INTEL_SMART_SET_THRESHOLD: + /* ext status not specified */ + break; + case ND_INTEL_SMART_INJECT: + /* smart injection not enabled */ + if (ext_status == ND_INTEL_STATUS_INJ_DISABLED) + return -ENXIO; + break; + } + + return -ENOMSG; +} + static struct ndctl_cmd *alloc_intel_cmd(struct ndctl_dimm *dimm, unsigned func, size_t in_size, size_t out_size) { @@ -780,4 +828,5 @@ struct ndctl_dimm_ops * const intel_dimm_ops = &(struct ndctl_dimm_ops) { .fw_xlat_firmware_status = intel_cmd_fw_xlat_firmware_status, .new_ack_shutdown_count = intel_dimm_cmd_new_lss, .fw_update_supported = intel_dimm_fw_update_supported, + .xlat_firmware_status = intel_cmd_xlat_firmware_status, }; diff --git a/ndctl/lib/intel.h b/ndctl/lib/intel.h index 3b01bba..530c996 100644 --- a/ndctl/lib/intel.h +++ b/ndctl/lib/intel.h @@ -179,5 +179,6 @@ struct nd_pkg_intel { #define ND_INTEL_STATUS_FQ_BUSY 0x20000 #define ND_INTEL_STATUS_FQ_BAD 0x30000 #define ND_INTEL_STATUS_FQ_ORDER 0x40000 +#define ND_INTEL_STATUS_INJ_DISABLED 0x10000 #endif /* __INTEL_H__ */ diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index e82a08d..5f1fd84 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -2704,6 +2704,16 @@ static const char *ndctl_dimm_get_cmd_subname(struct ndctl_cmd *cmd) return ops->cmd_desc(cmd->pkg->nd_command); } +NDCTL_EXPORT int ndctl_cmd_xlat_firmware_status(struct ndctl_cmd *cmd) +{ + struct ndctl_dimm *dimm = cmd->dimm; + struct ndctl_dimm_ops *ops = dimm ? dimm->ops : NULL; + + if (!dimm || !ops || !ops->xlat_firmware_status) + return -ENOMSG; + return ops->xlat_firmware_status(cmd); +} + static int do_cmd(int fd, int ioctl_cmd, struct ndctl_cmd *cmd) { int rc; @@ -2819,6 +2829,22 @@ NDCTL_EXPORT int ndctl_cmd_submit(struct ndctl_cmd *cmd) return rc; } +NDCTL_EXPORT int ndctl_cmd_submit_xlat(struct ndctl_cmd *cmd) +{ + int rc; + + rc = ndctl_cmd_submit(cmd); + if (rc < 0) + return rc; + + /* + * NOTE: This loses a positive rc which happens in the case of a + * buffer underrun. If the caller cares about that (usually not very + * useful), then the xlat function is available separately as well. + */ + return ndctl_cmd_xlat_firmware_status(cmd); +} + NDCTL_EXPORT int ndctl_cmd_get_status(struct ndctl_cmd *cmd) { return cmd->status; diff --git a/ndctl/lib/libndctl.sym b/ndctl/lib/libndctl.sym index 6c4c8b4..275db92 100644 --- a/ndctl/lib/libndctl.sym +++ b/ndctl/lib/libndctl.sym @@ -385,3 +385,9 @@ global: ndctl_namespace_get_next_badblock; ndctl_dimm_get_dirty_shutdown; } LIBNDCTL_17; + +LIBNDCTL_19 { +global: + ndctl_cmd_xlat_firmware_status; + ndctl_cmd_submit_xlat; +} LIBNDCTL_18; diff --git a/ndctl/lib/private.h b/ndctl/lib/private.h index 4fbea56..a387b0b 100644 --- a/ndctl/lib/private.h +++ b/ndctl/lib/private.h @@ -338,6 +338,7 @@ struct ndctl_dimm_ops { enum ND_FW_STATUS (*fw_xlat_firmware_status)(struct ndctl_cmd *); struct ndctl_cmd *(*new_ack_shutdown_count)(struct ndctl_dimm *); int (*fw_update_supported)(struct ndctl_dimm *); + int (*xlat_firmware_status)(struct ndctl_cmd *); }; struct ndctl_dimm_ops * const intel_dimm_ops; diff --git a/ndctl/libndctl.h b/ndctl/libndctl.h index c81cc03..e55a593 100644 --- a/ndctl/libndctl.h +++ b/ndctl/libndctl.h @@ -681,6 +681,9 @@ enum ND_FW_STATUS ndctl_cmd_fw_xlat_firmware_status(struct ndctl_cmd *cmd); struct ndctl_cmd *ndctl_dimm_cmd_new_ack_shutdown_count(struct ndctl_dimm *dimm); int ndctl_dimm_fw_update_supported(struct ndctl_dimm *dimm); +int ndctl_cmd_xlat_firmware_status(struct ndctl_cmd *cmd); +int ndctl_cmd_submit_xlat(struct ndctl_cmd *cmd); + #ifdef __cplusplus } /* extern "C" */ #endif From patchwork Fri Jan 11 22:53:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10760771 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 CE77391E for ; Fri, 11 Jan 2019 22:53:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCBB32A25B for ; Fri, 11 Jan 2019 22:53:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B157E2A287; Fri, 11 Jan 2019 22:53:53 +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 71A292A25B for ; Fri, 11 Jan 2019 22:53:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3D104211B6C28; Fri, 11 Jan 2019 14:53:53 -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=134.134.136.100; helo=mga07.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 6019F211B6C23 for ; Fri, 11 Jan 2019 14:53:51 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jan 2019 14:53:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,467,1539673200"; d="scan'208";a="125253707" Received: from vverma7-desk1.lm.intel.com ([10.232.112.170]) by FMSMGA003.fm.intel.com with ESMTP; 11 Jan 2019 14:53:50 -0800 From: Vishal Verma To: Subject: [ndctl PATCH 2/3] ndctl, inject-smart: switch to ndctl_cmd_submit_xlat Date: Fri, 11 Jan 2019 15:53:38 -0700 Message-Id: <20190111225339.6939-3-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190111225339.6939-1-vishal.l.verma@intel.com> References: <20190111225339.6939-1-vishal.l.verma@intel.com> 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: , Cc: Ami Pathak MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The ndctl inject-smart command was neglecting to check the 'firmware_status' field that is set by the platform firmware to indicate failure. Use the new ndctl_cmd_submit_xlat facility to include the firmware_status check as part of the command submission. Reported-by: Ami Pathak Cc: Dan Williams Signed-off-by: Vishal Verma --- ndctl/inject-smart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ndctl/inject-smart.c b/ndctl/inject-smart.c index eaa137a..12f3474 100644 --- a/ndctl/inject-smart.c +++ b/ndctl/inject-smart.c @@ -280,7 +280,7 @@ static int smart_set_thresh(struct ndctl_dimm *dimm) goto out; } - rc = ndctl_cmd_submit(st_cmd); + rc = ndctl_cmd_submit_xlat(st_cmd); if (rc) { error("%s: smart threshold command failed: %s (%d)\n", name, strerror(abs(rc)), rc); @@ -320,7 +320,7 @@ static int smart_set_thresh(struct ndctl_dimm *dimm) ndctl_cmd_smart_threshold_set_alarm_control(sst_cmd, alarm); } - rc = ndctl_cmd_submit(sst_cmd); + rc = ndctl_cmd_submit_xlat(sst_cmd); if (rc) error("%s: smart set threshold command failed: %s (%d)\n", name, strerror(abs(rc)), rc); @@ -351,7 +351,7 @@ out: if (sctx.err_continue == false) \ goto out; \ } \ - rc = ndctl_cmd_submit(si_cmd); \ + rc = ndctl_cmd_submit_xlat(si_cmd); \ if (rc) { \ error("%s: smart inject %s command failed: %s (%d)\n", \ name, #arg, strerror(abs(rc)), rc); \ @@ -382,7 +382,7 @@ out: if (sctx.err_continue == false) \ goto out; \ } \ - rc = ndctl_cmd_submit(si_cmd); \ + rc = ndctl_cmd_submit_xlat(si_cmd); \ if (rc) { \ error("%s: smart inject %s command failed: %s (%d)\n", \ name, #arg, strerror(abs(rc)), rc); \ From patchwork Fri Jan 11 22:53:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10760773 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 0D3F86C5 for ; Fri, 11 Jan 2019 22:53:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFA0C2A25B for ; Fri, 11 Jan 2019 22:53:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3A3F2A287; Fri, 11 Jan 2019 22:53:54 +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 A0F372A25B for ; Fri, 11 Jan 2019 22:53:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 500DA211B6C22; Fri, 11 Jan 2019 14:53:53 -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=134.134.136.100; helo=mga07.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 A9F3A211B6C23 for ; Fri, 11 Jan 2019 14:53:51 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jan 2019 14:53:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,467,1539673200"; d="scan'208";a="125253711" Received: from vverma7-desk1.lm.intel.com ([10.232.112.170]) by FMSMGA003.fm.intel.com with ESMTP; 11 Jan 2019 14:53:51 -0800 From: Vishal Verma To: Subject: [ndctl PATCH 3/3] ndctl, monitor: switch to ndctl_cmd_submit_xlat Date: Fri, 11 Jan 2019 15:53:39 -0700 Message-Id: <20190111225339.6939-4-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190111225339.6939-1-vishal.l.verma@intel.com> References: <20190111225339.6939-1-vishal.l.verma@intel.com> 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: , Cc: Ami Pathak MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The ndctl monitor command was neglecting to check the 'firmware_status' field that is set by the platform firmware to indicate failure. Use the new ndctl_cmd_submit_xlat facility to include the firmware_status check as part of the command submission. Cc: QI Fuli Cc: Dan Williams Signed-off-by: Vishal Verma --- ndctl/monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ndctl/monitor.c b/ndctl/monitor.c index 233f2bb..01af338 100644 --- a/ndctl/monitor.c +++ b/ndctl/monitor.c @@ -226,7 +226,7 @@ static int enable_dimm_supported_threshold_alarms(struct ndctl_dimm *dimm) err(&monitor, "%s: no smart threshold command support\n", name); goto out; } - if (ndctl_cmd_submit(st_cmd)) { + if (ndctl_cmd_submit_xlat(st_cmd)) { err(&monitor, "%s: smart threshold command failed\n", name); goto out; } @@ -246,7 +246,7 @@ static int enable_dimm_supported_threshold_alarms(struct ndctl_dimm *dimm) alarm |= ND_SMART_CTEMP_TRIP; ndctl_cmd_smart_threshold_set_alarm_control(sst_cmd, alarm); - rc = ndctl_cmd_submit(sst_cmd); + rc = ndctl_cmd_submit_xlat(sst_cmd); if (rc) { err(&monitor, "%s: smart set threshold command failed\n", name); goto out;