nvme-fabrics: allow user to pass in nr_poll_queues (89d43802) · Commits · 戴 / test

drivers/nvme/host/fabrics.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -617,6 +617,7 @@ static const match_table_t opt_tokens = {
		{ NVMF_OPT_HDR_DIGEST, "hdr_digest" },
		{ NVMF_OPT_DATA_DIGEST, "data_digest" },
		{ NVMF_OPT_NR_WRITE_QUEUES, "nr_write_queues=%d" },
		{ NVMF_OPT_NR_POLL_QUEUES, "nr_poll_queues=%d" },
		{ NVMF_OPT_ERR, NULL }
		};

		@@ -850,6 +851,18 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
		}
		opts->nr_write_queues = token;
		break;
		case NVMF_OPT_NR_POLL_QUEUES:
		if (match_int(args, &token)) {
		ret = -EINVAL;
		goto out;
		}
		if (token <= 0) {
		pr_err("Invalid nr_poll_queues %d\n", token);
		ret = -EINVAL;
		goto out;
		}
		opts->nr_poll_queues = token;
		break;
		default:
		pr_warn("unknown parameter or missing value '%s' in ctrl creation request\n",
		p);

+3 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ enum {
		NVMF_OPT_HDR_DIGEST = 1 << 15,
		NVMF_OPT_DATA_DIGEST = 1 << 16,
		NVMF_OPT_NR_WRITE_QUEUES = 1 << 17,
		NVMF_OPT_NR_POLL_QUEUES = 1 << 18,
		};

		/**
		@@ -93,6 +94,7 @@ enum {
		* @hdr_digest: generate/verify header digest (TCP)
		* @data_digest: generate/verify data digest (TCP)
		* @nr_write_queues: number of queues for write I/O
		* @nr_poll_queues: number of queues for polling I/O
		*/
		struct nvmf_ctrl_options {
		unsigned mask;
		@@ -113,6 +115,7 @@ struct nvmf_ctrl_options {
		bool hdr_digest;
		bool data_digest;
		unsigned int nr_write_queues;
		unsigned int nr_poll_queues;
		};

		/*