Commit 20618744 authored by Anil Veerabhadrappa's avatar Anil Veerabhadrappa Committed by Jim Harris
Browse files

lib/nvmf: Validate requested SQ size for both admin and IO queue 



During connect call based on queue type (AQ or IOQ), SQ size should be
validated against max sq size for that particular queue type.

Change-Id: I977d7556e4d04e37004d16c87efffd3b467fa62c
Signed-off-by: default avatarAnil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452376


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 6cc18a64

lib/nvmf/ctrlr.c

+19 −4
Original line number Diff line number Diff line
@@ -461,7 +461,8 @@ spdk_nvmf_ctrlr_connect(struct spdk_nvmf_request *req) 
	struct spdk_nvmf_fabric_connect_cmd *cmd = &req->cmd->connect_cmd;

	struct spdk_nvmf_fabric_connect_rsp *rsp = &req->rsp->connect_rsp;

	struct spdk_nvmf_qpair *qpair = req->qpair;

	struct spdk_nvmf_tgt *tgt = qpair->transport->tgt;

	struct spdk_nvmf_transport *transport = qpair->transport;

	struct spdk_nvmf_tgt *tgt = transport->tgt;

	struct spdk_nvmf_ctrlr *ctrlr;

	struct spdk_nvmf_subsystem *subsystem;

	const char *subnqn, *hostnqn;
@@ -555,14 +556,28 @@ spdk_nvmf_ctrlr_connect(struct spdk_nvmf_request *req) 


	/*

	 * SQSIZE is a 0-based value, so it must be at least 1 (minimum queue depth is 2) and

	 *  strictly less than max_queue_depth.

	 * strictly less than max_aq_depth (admin queues) or max_queue_depth (io queues).

	 */

	if (cmd->sqsize == 0 || cmd->sqsize >= qpair->transport->opts.max_queue_depth) {

	if (cmd->sqsize == 0) {

		SPDK_ERRLOG("Invalid SQSIZE = 0\n");

		SPDK_NVMF_INVALID_CONNECT_CMD(rsp, sqsize);

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	if (spdk_nvmf_qpair_is_admin_queue(qpair)) {

		if (cmd->sqsize >= transport->opts.max_aq_depth) {

			SPDK_ERRLOG("Invalid SQSIZE for admin queue %u (min 1, max %u)\n",

				    cmd->sqsize, transport->opts.max_aq_depth - 1);

			SPDK_NVMF_INVALID_CONNECT_CMD(rsp, sqsize);

			return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

		}

	} else if (cmd->sqsize >= transport->opts.max_queue_depth) {

		SPDK_ERRLOG("Invalid SQSIZE %u (min 1, max %u)\n",

			    cmd->sqsize, qpair->transport->opts.max_queue_depth - 1);

			    cmd->sqsize, transport->opts.max_queue_depth - 1);

		SPDK_NVMF_INVALID_CONNECT_CMD(rsp, sqsize);

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	qpair->sq_head_max = cmd->sqsize;

	qpair->qid = cmd->qid;

test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ test_connect(void) 


	memset(&tgt, 0, sizeof(tgt));

	memset(&transport, 0, sizeof(transport));

	transport.opts.max_aq_depth = 32;

	transport.opts.max_queue_depth = 64;

	transport.opts.max_qpairs_per_ctrlr = 3;

	transport.tgt = &tgt;