Add missing firmware_status checks
Vishal Verma
maintainerv2 cover Add missing firmware_status checks
Changes in v2:
- For the new helper, return original positive rc when we can (Dan)
- Convert previously missed locations to the new submission helper (patch 2)
- Add a new patch (4/4) to fix up all callers of ndctl_cmd_submit to the correct return convention.
There were several places in ndctl where we neglected to check the firmware_status from a command submission.
Add an ndctl_dimm_op target to perform error translation for a DSM family, and provide a new helper - ndctl_cmd_submit_xlat - that will submit the command and call an error translation routine if one has been registered. Switch the call sites in ndctl/inject-smart.c and ndctl/monitor.c over to the new command submission helper.
Finally, clean up all remaining callers of ndctl_cmd_submit to use the correct return convention, i.e. only treat negative returns as an error, and accept positive return codes as OK.
Vishal Verma (4):
libndctl, intel: Add infrastructure for firmware_status translation ndctl, inject-smart: switch to ndctl_cmd_submit_xlat ndctl, monitor: switch to ndctl_cmd_submit_xlat
ndctl: clean up usage of ndctl_cmd_submit
ndctl/inject-smart.c | 16 ++++++------- ndctl/lib/dimm.c | 6 ++--- ndctl/lib/inject.c | 8 +++---- ndctl/lib/intel.c | 49 ++++++++++++++++++++++++++++++++++++++ ndctl/lib/intel.h | 1 + ndctl/lib/libndctl.c | 28 ++++++++++++++++++++++ ndctl/lib/libndctl.sym | 6 +++++ ndctl/lib/nfit.c | 2 +- ndctl/lib/private.h | 1 + ndctl/libndctl.h | 3 +++ ndctl/monitor.c | 6 ++--- ndctl/util/json-firmware.c | 2 +- ndctl/util/json-smart.c | 8 +++---- test/daxdev-errors.c | 8 +++---- test/libndctl.c | 18 +++++++------- test/smart-notify.c | 8 +++---- 16 files changed, 129 insertions(+), 41 deletions(-)
Signature · 6 lines
2.17.2 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH v2 1/4 libndctl, intel: Add infrastructure for firmware_status translation
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).
--- ndctl/lib/intel.c | 49 ++++++++++++++++++++++++++++++++++++++++++ ndctl/lib/intel.h | 1 + ndctl/lib/libndctl.c | 28 ++++++++++++++++++++++++ ndctl/lib/libndctl.sym | 6 ++++++ ndctl/lib/private.h | 1 + ndctl/libndctl.h | 3 +++ 6 files changed, 88 insertions(+)
ndctl/lib/intel.c +49 -0
@@ -16,6 +16,54 @@#include <ndctl/libndctl.h> #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, };
ndctl/lib/intel.h +1 -0
@@ -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__ */
ndctl/lib/libndctl.c +28 -0
@@ -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,24 @@ 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, xlat_rc; + + rc =ndctl_cmd_submit (cmd); +if (rc <0 ) +return rc; + +/* +* NOTE: This can lose a positive rc when xlat_rc is non-zero. The +* positive rc indicates a buffer underrun from the original command +* submission. If the caller cares about that (generally not very +* useful), then the xlat function is available separately as well. +*/ + xlat_rc =ndctl_cmd_xlat_firmware_status (cmd); +return (xlat_rc ==0 ) ? rc : xlat_rc; +} + NDCTL_EXPORT int ndctl_cmd_get_status(struct ndctl_cmd *cmd) {return cmd->status;
ndctl/lib/libndctl.sym +6 -0
@@ -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;
ndctl/lib/private.h +1 -0
@@ -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;
ndctl/libndctl.h +3 -0
@@ -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
Signature · 6 lines
2.17.2 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [ndctl PATCH v2 1/4] libndctl, intel: Add infrastructure for firmware_status translation
Quoted 10 lines · Vishal Verma
Add a new routine to
ndctl_dimm_opsthat 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 aroundndctl_cmd_submit(calledndctl_cmd_submit_xlat) that submits the command, and also runs it through the above translatordimm_op(if one is is defined).Cc Dan Williams <[email protected]>Signed-off-by Vishal Verma <[email protected]>
Looks good,
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH v2 2/4 ndctl, inject-smart: switch to ndctl_cmd_submit_xlat
In reply to Vishal VermaThe 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.
--- ndctl/inject-smart.c | 16 ++++++++-------- ndctl/util/json-smart.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-)
ndctl/inject-smart.c +8 -8
@@ -280,8 +280,8 @@ static int smart_set_thresh(struct ndctl_dimm *dimm) goto out; } - rc =ndctl_cmd_submit (st_cmd); -if (rc) { + rc =ndctl_cmd_submit_xlat (st_cmd); +if (rc <0 ) {error ("%s: smart threshold command failed: %s (%d)\n" , name,strerror (abs (rc)), rc); goto out;
@@ -320,8 +320,8 @@ 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); -if (rc) + rc =ndctl_cmd_submit_xlat (sst_cmd); +if (rc <0 )error ("%s: smart set threshold command failed: %s (%d)\n" , name,strerror (abs (rc)), rc);
@@ -351,8 +351,8 @@ out:if (sctx.err_continue == false) \ goto out; \ } \ - rc =ndctl_cmd_submit (si_cmd); \ -if (rc) { \ + rc =ndctl_cmd_submit_xlat (si_cmd); \ +if (rc <0 ) { \error ("%s: smart inject %s command failed: %s (%d)\n" , \ name, #arg, strerror(abs(rc)), rc); \if (sctx.err_continue == false) \
@@ -382,8 +382,8 @@ out:if (sctx.err_continue == false) \ goto out; \ } \ - rc =ndctl_cmd_submit (si_cmd); \ -if (rc) { \ + rc =ndctl_cmd_submit_xlat (si_cmd); \ +if (rc <0 ) { \error ("%s: smart inject %s command failed: %s (%d)\n" , \ name, #arg, strerror(abs(rc)), rc); \if (sctx.err_continue == false) \
ndctl/util/json-smart.c +4 -4
@@ -30,8 +30,8 @@ static void smart_threshold_to_json(struct ndctl_dimm *dimm,if (!cmd)return ; - rc =ndctl_cmd_submit (cmd); -if (rc ||ndctl_cmd_get_firmware_status (cmd)) + rc =ndctl_cmd_submit_xlat (cmd); +if ((rc <0 ) ||ndctl_cmd_get_firmware_status (cmd)) goto out; alarm_control =ndctl_cmd_smart_threshold_get_alarm_control (cmd);
@@ -115,8 +115,8 @@ struct json_object *util_dimm_health_to_json(struct ndctl_dimm *dimm)if (!cmd) goto err; - rc =ndctl_cmd_submit (cmd); -if (rc ||ndctl_cmd_get_firmware_status (cmd)) { + rc =ndctl_cmd_submit_xlat (cmd); +if ((rc <0 ) ||ndctl_cmd_get_firmware_status (cmd)) { jobj =json_object_new_string ("unknown" );if (jobj)json_object_object_add (jhealth,"health_state" , jobj);
Signature · 6 lines
2.17.2 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [ndctl PATCH v2 2/4] ndctl, inject-smart: switch to ndctl_cmd_submit_xlat
Quoted 9 lines · Vishal Verma
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 newndctl_cmd_submit_xlatfacility to include thefirmware_statuscheck as part of the command submission.Reported-by Ami Pathak <[email protected]>Cc Dan Williams <[email protected]>Signed-off-by Vishal Verma <[email protected]>
[..]
ndctl/util/json-smart.c static void smart_threshold_to_json(struct ndctl_dimm *dimm, · line 35
Quoted 13 lines
ndctl/util/json-smart.c +2
-2@@ -30,8 +30,8 @@ static void smart_threshold_to_json(struct ndctl_dimm *dimm,if (!cmd)return ; - rc =ndctl_cmd_submit (cmd); -if (rc ||ndctl_cmd_get_firmware_status (cmd)) + rc =ndctl_cmd_submit_xlat (cmd); +if ((rc <0 ) ||ndctl_cmd_get_firmware_status (cmd)) goto out;
Can't we just do:
rc = ndctl_cmd_submit_xlat(cmd);
if (rc < 0)
goto out;
...and drop the open coded ndctl_cmd_get_firmware_status()?
In general it seems like most users of ndctl_cmd_get_firmware_status() would be happy with ndctl_cmd_submit_xlat() instead.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Verma, Vishal L
maintainerRe: [ndctl PATCH v2 2/4] ndctl, inject-smart: switch to ndctl_cmd_submit_xlat
Quoted 33 lines · Dan Williams
Quoted 10 lines · Vishal Verma
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 newndctl_cmd_submit_xlatfacility to include thefirmware_statuscheck as part of the command submission.Reported-by Ami Pathak <[email protected]>Cc Dan Williams <[email protected]>Signed-off-by Vishal Verma <[email protected]>[..]
Quoted 5 lines
ndctl/util/json-smart.c +0
-0ndctl/util/json-smart.c static void smart_threshold_to_json(struct · line 36
Quoted 9 lines
ndctl/util/json-smart.c +2
-2@@ -30,8 +30,8 @@ static void smart_threshold_to_json(struct ndctl_dimm *dimm, if (!cmd) return; - rc =ndctl_cmd_submit (cmd); -if (rc ||ndctl_cmd_get_firmware_status (cmd)) + rc =ndctl_cmd_submit_xlat (cmd); +if ((rc <0 ) ||ndctl_cmd_get_firmware_status (cmd)) goto out;Can't we just do:
rc =
ndctl_cmd_submit_xlat(cmd);
if (rc < 0)
Quoted 7 lines
goto out;...and drop the open coded
ndctl_cmd_get_firmware_status()?In general it seems like most users of
ndctl_cmd_get_firmware_status()
would be happy withndctl_cmd_submit_xlat()instead.
Yes good catch - I'll see where else we can make this change and respin. The users of ndctl_cmd_get_firmware_status that use ACPI DSMs probably still stay since _xlat, at least for now, only handles commands that are defined in dimm_ops.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [ndctl PATCH v2 2/4] ndctl, inject-smart: switch to ndctl_cmd_submit_xlat
Quoted 40 lines · Vishal L
Quoted 37 lines · Dan Williams
Quoted 10 lines · Vishal Verma
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 newndctl_cmd_submit_xlatfacility to include thefirmware_statuscheck as part of the command submission.Reported-by Ami Pathak <[email protected]>Cc Dan Williams <[email protected]>Signed-off-by Vishal Verma <[email protected]>[..]
Quoted 5 lines
ndctl/util/json-smart.c +0
-0ndctl/util/json-smart.c static void smart_threshold_to_json(struct · line 36
Quoted 9 lines
ndctl/util/json-smart.c +2
-2@@ -30,8 +30,8 @@ static void smart_threshold_to_json(struct ndctl_dimm *dimm, if (!cmd) return; - rc =ndctl_cmd_submit (cmd); -if (rc ||ndctl_cmd_get_firmware_status (cmd)) + rc =ndctl_cmd_submit_xlat (cmd); +if ((rc <0 ) ||ndctl_cmd_get_firmware_status (cmd)) goto out;Can't we just do:
rc =
ndctl_cmd_submit_xlat(cmd);
if (rc < 0)goto out;...and drop the open coded
ndctl_cmd_get_firmware_status()?
Quoted 9 lines
Quoted 3 lines
In general it seems like most users of
ndctl_cmd_get_firmware_status()
would be happy withndctl_cmd_submit_xlat()instead.Yes good catch - I'll see where else we can make this change and respin. The users of
ndctl_cmd_get_firmware_statusthat use ACPI DSMs probably still stay since_xlat, at least for now, only handles commands that are defined indimm_ops.
Ah true, good point.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH v2 3/4 ndctl, monitor: switch to ndctl_cmd_submit_xlat
In reply to Vishal VermaThe 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.
--- ndctl/monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
ndctl/monitor.c +3 -3
@@ -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) <0 ) {err (&monitor,"%s: smart threshold command failed\n" , name); goto out; }
@@ -246,8 +246,8 @@ 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); -if (rc) { + rc =ndctl_cmd_submit_xlat (sst_cmd); +if (rc <0 ) {err (&monitor,"%s: smart set threshold command failed\n" , name); goto out; }
Signature · 6 lines
2.17.2 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [ndctl PATCH v2 3/4] ndctl, monitor: switch to ndctl_cmd_submit_xlat
Quoted 9 lines · Vishal Verma
The ndctl monitor command was neglecting to check the '
firmware_status' field that is set by the platform firmware to indicate failure. Use the newndctl_cmd_submit_xlatfacility to include thefirmware_statuscheck as part of the command submission.Cc QI Fuli <[email protected]>Cc Dan Williams <[email protected]>Signed-off-by Vishal Verma <[email protected]>
Looks good,
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Vishal Verma
maintainerPATCH v2 4/4 ndctl: clean up usage of ndctl_cmd_submit
In reply to Vishal VermaIt is possible for ndctl_cmd_submit to return a positive number, indicating a buffer underrun. It is only truly an error if it returns a negative number. Several places in the library, the ndctl utility, and in test/ were simply checking for an error with "if (rc)". Fix these to only error out for negative returns.
--- ndctl/lib/dimm.c | 6 +++--- ndctl/lib/inject.c | 8 ++++---- ndctl/lib/nfit.c | 2 +- ndctl/util/json-firmware.c | 2 +- test/daxdev-errors.c | 8 ++++---- test/libndctl.c | 18 +++++++++--------- test/smart-notify.c | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-)
ndctl/lib/dimm.c +3 -3
@@ -332,7 +332,7 @@ static int nvdimm_set_config_data(struct nvdimm_data *ndd, size_t offset, goto out; rc =ndctl_cmd_submit (cmd_write); -if (rc ||ndctl_cmd_get_firmware_status (cmd_write)) +if ((rc <0 ) ||ndctl_cmd_get_firmware_status (cmd_write)) rc = -ENXIO ; out:ndctl_cmd_unref (cmd_write);
@@ -488,14 +488,14 @@ NDCTL_EXPORT struct ndctl_cmd *ndctl_dimm_read_labels(struct ndctl_dimm *dimm)if (!cmd_size)return NULL ; rc =ndctl_cmd_submit (cmd_size); -if (rc ||ndctl_cmd_get_firmware_status (cmd_size)) +if ((rc <0 ) ||ndctl_cmd_get_firmware_status (cmd_size)) goto out_size; cmd_read =ndctl_dimm_cmd_new_cfg_read (cmd_size);if (!cmd_read) goto out_size; rc =ndctl_cmd_submit (cmd_read); -if (rc ||ndctl_cmd_get_firmware_status (cmd_read)) +if ((rc <0 ) ||ndctl_cmd_get_firmware_status (cmd_read)) goto out_read;ndctl_cmd_unref (cmd_size);
ndctl/lib/inject.c +4 -4
@@ -156,7 +156,7 @@ static int ndctl_namespace_inject_one_error(struct ndctl_namespace *ndns, (1 <<ND_ARS_ERR_INJ_OPT_NOTIFY ); rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {dbg (ctx,"Error submitting command: %d\n" , rc); goto out; }
@@ -234,7 +234,7 @@ static int ndctl_namespace_uninject_one_error(struct ndctl_namespace *ndns, err_inj_clr->err_inj_clr_spa_range_length = length; rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {dbg (ctx,"Error submitting command: %d\n" , rc); goto out; }
@@ -443,7 +443,7 @@ NDCTL_EXPORT int ndctl_namespace_injection_status(struct ndctl_namespace *ndns) cmd =ndctl_bus_cmd_new_ars_cap (bus, ns_offset, ns_size); rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {dbg (ctx,"Error submitting ars_cap: %d\n" , rc); goto out; }
@@ -464,7 +464,7 @@ NDCTL_EXPORT int ndctl_namespace_injection_status(struct ndctl_namespace *ndns) (struct nd_cmd_ars_err_inj_stat *)&pkg->nd_payload[0 ]; rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {dbg (ctx,"Error submitting command: %d\n" , rc); goto out; }
ndctl/lib/nfit.c +1 -1
@@ -133,7 +133,7 @@ int ndctl_bus_nfit_translate_spa(struct ndctl_bus *bus, translate_spa->spa = address; rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {ndctl_cmd_unref (cmd);return rc; }
ndctl/util/json-firmware.c +1 -1
@@ -25,7 +25,7 @@ struct json_object *util_dimm_firmware_to_json(struct ndctl_dimm *dimm, goto err; rc =ndctl_cmd_submit (cmd); -if (rc ||ndctl_cmd_fw_xlat_firmware_status (cmd) !=FW_SUCCESS ) { +if ((rc <0 ) ||ndctl_cmd_fw_xlat_firmware_status (cmd) !=FW_SUCCESS ) { jobj =util_json_object_hex (-1 , flags);if (jobj) json_object_object_add(jfirmware, "current_version",
test/daxdev-errors.c +4 -4
@@ -75,7 +75,7 @@ static int check_ars_cap(struct ndctl_bus *bus, uint64_t start, } rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: bus: %s failed to submit cmd: %d\n" , __func__,ndctl_bus_get_provider (bus), rc);ndctl_cmd_unref (cmd);
@@ -115,7 +115,7 @@ static int check_ars_start(struct ndctl_bus *bus, struct check_cmd *check) } rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: bus: %s failed to submit cmd: %d\n" , __func__,ndctl_bus_get_provider (bus), rc);ndctl_cmd_unref (cmd);
@@ -149,7 +149,7 @@ static int check_ars_status(struct ndctl_bus *bus, struct check_cmd *check) } rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: bus: %s failed to submit cmd: %d\n" , __func__,ndctl_bus_get_provider (bus), rc);ndctl_cmd_unref (cmd);
@@ -210,7 +210,7 @@ static int check_clear_error(struct ndctl_bus *bus, struct check_cmd *check) } rc =ndctl_cmd_submit (clear_err); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: bus: %s failed to submit cmd: %d\n" , __func__,ndctl_bus_get_provider (bus), rc);ndctl_cmd_unref (clear_err);
test/libndctl.c +9 -9
@@ -2057,7 +2057,7 @@ static int check_get_config_size(struct ndctl_bus *bus, struct ndctl_dimm *dimm, } rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit cmd: %d\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd);
@@ -2091,7 +2091,7 @@ static int check_get_config_data(struct ndctl_bus *bus, struct ndctl_dimm *dimm, } rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit cmd: %zd\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd);
@@ -2127,7 +2127,7 @@ static int check_set_config_data(struct ndctl_bus *bus, struct ndctl_dimm *dimm,memset (buf,0 ,sizeof (buf));ndctl_cmd_cfg_write_set_data (cmd, buf,sizeof (buf),0 ); rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit cmd: %zd\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd);
@@ -2135,7 +2135,7 @@ static int check_set_config_data(struct ndctl_bus *bus, struct ndctl_dimm *dimm, } rc =ndctl_cmd_submit (cmd_read); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit read1: %zd\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd);
@@ -2152,7 +2152,7 @@ static int check_set_config_data(struct ndctl_bus *bus, struct ndctl_dimm *dimm,sprintf (buf,"dimm-%#x" ,ndctl_dimm_get_handle (dimm));ndctl_cmd_cfg_write_set_data (cmd, buf,sizeof (buf),0 ); rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit cmd: %zd\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd);
@@ -2160,7 +2160,7 @@ static int check_set_config_data(struct ndctl_bus *bus, struct ndctl_dimm *dimm, } rc =ndctl_cmd_submit (cmd_read); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit read2: %zd\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd);
@@ -2225,7 +2225,7 @@ static int check_smart(struct ndctl_bus *bus, struct ndctl_dimm *dimm, } rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit cmd: %d\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd);
@@ -2326,7 +2326,7 @@ static int check_smart_threshold(struct ndctl_bus *bus, struct ndctl_dimm *dimm, } rc =ndctl_cmd_submit (cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit cmd: %d\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd);
@@ -2375,7 +2375,7 @@ static int check_smart_threshold(struct ndctl_bus *bus, struct ndctl_dimm *dimm, } rc =ndctl_cmd_submit (cmd_set); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: dimm: %#x failed to submit cmd_set: %d\n" , __func__,ndctl_dimm_get_handle (dimm), rc);ndctl_cmd_unref (cmd_set);
test/smart-notify.c +4 -4
@@ -22,7 +22,7 @@ static void do_notify(struct ndctl_dimm *dimm) } rc =ndctl_cmd_submit (s_cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: smart command failed: %d %s\n" , name, rc,strerror (errno)); goto out;
@@ -49,7 +49,7 @@ static void do_notify(struct ndctl_dimm *dimm) } rc =ndctl_cmd_submit (st_cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: smart threshold command failed: %d %s\n" , name, rc,strerror (errno)); goto out;
@@ -148,7 +148,7 @@ static void do_notify(struct ndctl_dimm *dimm)ndctl_cmd_smart_threshold_set_alarm_control (sst_cmd, set_alarm); rc =ndctl_cmd_submit (sst_cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: smart set threshold command failed: %d %s\n" , name, rc,strerror (errno)); goto out;
@@ -166,7 +166,7 @@ static void do_notify(struct ndctl_dimm *dimm) } rc =ndctl_cmd_submit (sst_cmd); -if (rc) { +if (rc <0 ) {fprintf (stderr,"%s: smart set threshold defaults failed: %d %s\n" , name, rc,strerror (errno)); goto out;
Signature · 6 lines
2.17.2 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Re: [ndctl PATCH v2 4/4] ndctl: clean up usage of ndctl_cmd_submit
Quoted 9 lines · Vishal Verma
It is possible for
ndctl_cmd_submitto return a positive number, indicating a buffer underrun. It is only truly an error if it returns a negative number. Several places in the library, the ndctl utility, and in test/ were simply checking for an error with "if (rc)". Fix these to only error out for negative returns.Cc Dan Williams <[email protected]>Signed-off-by Vishal Verma <[email protected]>
Looks good,
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm