ndctl: fix zero-labels to handle firmware error properly
PATCH 1/1 ndctl: fix zero-labels to handle firmware error properly
ndctl zero-labels completes with a large number of zeroed nmems when it fails to do zeroing on a protected NVDIMM.
# ndctl zero-labels nmem1 zeroed 65504 nmems
do_cmd() called from ndctl_dimm_zero_labels() sets a transfer size to rc when FW status is non-zero. This transfer size gets mistreated as zeroed nmems count in the end.
Fix ndctl_dimm_zero_labels() to handle this FW error case properly.
--- ndctl/lib/dimm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
ndctl/lib/dimm.c +5 -1
@@ -537,8 +537,12 @@ NDCTL_EXPORT int ndctl_dimm_zero_labels(struct ndctl_dimm *dimm) goto out_write; } rc =ndctl_cmd_submit (cmd_write); -if (rc ||ndctl_cmd_get_firmware_status (cmd_write)) +if (rc <0 ) goto out_write; +if (ndctl_cmd_get_firmware_status (cmd_write)) { + rc = -ENXIO ; + goto out_write; + }/* * If the dimm is already disabled the kernel is not holding a cached
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 11 lines · Toshi Kani
ndctl zero-labels completes with a large number of zeroed nmems when it fails to do zeroing on a protected NVDIMM.
# ndctl zero-labels nmem1 zeroed 65504 nmems
do_cmd()called fromndctl_dimm_zero_labels()sets a transfer size to rc when FW status is non-zero. This transfer size gets mistreated as zeroed nmems count in the end.
Quoted 6 lines
Fix
ndctl_dimm_zero_labels()to handle this FW error case properly.Reported-by Robert Elliott <[email protected]>Signed-off-by Toshi Kani <[email protected]>Cc Vishal Verma <[email protected]>Cc Dan Williams <[email protected]>
Looks good,
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm