ioctl: fix dms command

The DSM ranges data struct needs to be initialized. The rework dropped
this part. Also the number of ranges for CDW10 is a 0's value (sic).

Fixes: 6c991dc ("src: rework nvme_dsm command")
Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/src/nvme/ioctl.h

@@ -4410,7 +4410,7 @@ nvme_init_dsm(struct nvme_passthru_cmd *cmd,
 	cmd->nsid	= nsid;
 	cmd->data_len	= len;
 	cmd->addr	= (__u64)(uintptr_t)data;
-	cmd->cdw10 = NVME_FIELD_ENCODE(nr,
+	cmd->cdw10 = NVME_FIELD_ENCODE(nr - 1,
 			NVME_DSM_CDW10_NR_SHIFT,
 			NVME_DSM_CDW10_NR_MASK);
 	cmd->cdw11 = NVME_FIELD_ENCODE(idr,

nvme.c

@@ -7364,13 +7364,17 @@ static int dsm(int argc, char **argv, struct command *acmd, struct plugin *plugi
 			return err;
 		}
 	}
-	if (!cfg.cdw11)
-		cfg.cdw11 = (cfg.ad << 2) | (cfg.idw << 1) | (cfg.idr << 0);
+	if (cfg.cdw11) {
+		cfg.ad = NVME_GET(cfg.cdw11, DSM_CDW11_AD);
+		cfg.idw = NVME_GET(cfg.cdw11, DSM_CDW11_IDW);
+		cfg.idr = NVME_GET(cfg.cdw11, DSM_CDW11_IDR);
+	}
 
 	dsm = nvme_alloc(sizeof(*dsm) * 256);
 	if (!dsm)
 		return -ENOMEM;
 
+	nvme_init_dsm_range(dsm, ctx_attrs, nlbs, slbas, nr);
 	nvme_init_dsm(&cmd, cfg.namespace_id, nr, cfg.idr, cfg.idw, cfg.ad, dsm,
 		      sizeof(*dsm) * 256);
 	err = nvme_submit_io_passthru(hdl, &cmd, NULL);