feat: add num-queues command

This is for Number of Queues feature to get and set.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

plugins/feat/feat-nvme.c

@@ -60,6 +60,7 @@ static const char *power_limit_feat = "power limit feature";
 static const char *power_thresh_feat = "power threshold feature";
 static const char *power_meas_feat = "power measurement feature";
 static const char *err_recovery_feat = "error recovery feature";
+static const char *num_queues_feat = "number of queues feature";
 
 static int feat_get_nsid(struct nvme_transport_handle *hdl, __u32 nsid,
 			 const __u8 fid, __u32 cdw11, __u8 sel, __u8 uidx,
@@ -916,3 +917,85 @@ static int feat_err_recovery(int argc, char **argv, struct command *acmd,
 
 	return err;
 }
+
+static int num_queues_set(struct nvme_transport_handle *hdl, const __u8 fid,
+			  __u16 nsqr, __u16 ncqr, bool sv,
+			  struct argconfig_commandline_options *opts)
+{
+	enum nvme_get_features_sel sel = NVME_GET_FEATURES_SEL_CURRENT;
+	__u32 cdw11 = NVME_SET(nsqr, FEAT_NRQS_NSQR) |
+		      NVME_SET(ncqr, FEAT_NRQS_NCQR);
+	struct nvme_passthru_cmd cmd;
+	__u64 result;
+	int err;
+
+	if (sv)
+		sel = NVME_GET_FEATURES_SEL_SAVED;
+
+	nvme_init_get_features_num_queues(&cmd, sel);
+	err = nvme_submit_admin_passthru(hdl, &cmd);
+	if (!err) {
+		nvme_feature_decode_number_of_queues(cmd.result, &nsqr, &ncqr);
+		if (!argconfig_parse_seen(opts, "nsqr"))
+			cdw11 |= NVME_SET(nsqr, FEAT_NRQS_NSQR);
+		if (!argconfig_parse_seen(opts, "ncqr"))
+			cdw11 |= NVME_SET(ncqr, FEAT_NRQS_NSQR);
+	}
+
+	err = nvme_set_features(hdl, 0, fid, sv, cdw11, 0, 0, 0, 0, NULL, 0,
+				&result);
+
+	nvme_show_init();
+
+	if (err > 0) {
+		nvme_show_status(err);
+	} else if (err < 0) {
+		nvme_show_perror("Set %s", num_queues_feat);
+	} else {
+		nvme_show_result("Set %s: 0x%04x (%s)", num_queues_feat,
+				 cdw11, sv ? "Save" : "Not save");
+		nvme_feature_show_fields(fid, cdw11, NULL);
+	}
+
+	nvme_show_finish();
+
+	return err;
+}
+
+static int feat_num_queues(int argc, char **argv, struct command *acmd,
+			     struct plugin *plugin)
+{
+	_cleanup_nvme_transport_handle_ struct nvme_transport_handle *hdl =
+	    NULL;
+	_cleanup_nvme_global_ctx_ struct nvme_global_ctx *ctx = NULL;
+
+	const char *ncqr = "number of I/O completion queues requested";
+	const char *nsqr = "number of I/O submission queues requested";
+	const __u8 fid = NVME_FEAT_FID_NUM_QUEUES;
+	int err;
+
+	struct config {
+		__u16 nsqr;
+		__u16 ncqr;
+		__u8 sel;
+	};
+
+	struct config cfg = { 0 };
+
+	FEAT_ARGS(opts,
+		  OPT_SHRT("nsqr", 'n', &cfg.nsqr, nsqr),
+		  OPT_SHRT("ncqr", 'c', &cfg.ncqr, ncqr));
+
+	err = parse_and_open(&ctx, &hdl, argc, argv, NUM_QUEUES_DESC, opts);
+	if (err)
+		return err;
+
+	if (argconfig_parse_seen(opts, "nsqr") ||
+	    argconfig_parse_seen(opts, "ncqr"))
+		err = num_queues_set(hdl, fid, cfg.nsqr, cfg.ncqr,
+				     argconfig_parse_seen(opts, "save"), opts);
+	else
+		err = feat_get(hdl, fid, 0, cfg.sel, 0, num_queues_feat);
+
+	return err;
+}

plugins/feat/feat-nvme.h

@@ -21,6 +21,7 @@
 #define POWER_THRESH_DESC "Get and set power threshold feature"
 #define POWER_MEAS_DESC "Get and set power measurement feature"
 #define ERR_RECOVERY_DESC "Get and set error recovery feature"
+#define NUM_QUEUES_DESC "Get and set number of queues feature"
 
 #define FEAT_ARGS(n, ...)                                              \
 	NVME_ARGS(n, ##__VA_ARGS__, OPT_FLAG("save", 's', NULL, save), \
@@ -39,6 +40,7 @@ PLUGIN(NAME("feat", "NVMe feature extensions", FEAT_PLUGIN_VERSION),
 		ENTRY("power-thresh", POWER_THRESH_DESC, feat_power_thresh)
 		ENTRY("power-meas", POWER_MEAS_DESC, feat_power_meas)
 		ENTRY("err-recovery", ERR_RECOVERY_DESC, feat_err_recovery)
+		ENTRY("num-queues", NUM_QUEUES_DESC, feat_num_queues)
 	)
 );
 #endif /* !FEAT_NVME || CMD_HEADER_MULTI_READ */