Commit 7fdf829c authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

test/nvme_reserve: allocate IO queue pair for supported controllers 



Move the IO queue pair allocation after checking the support feature
bit.

Change-Id: Ie8c5f20cddacb669b093b05dcf911f01cdb1413e
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5909


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent df2c932e

test/nvme/reserve/reserve.c

+13 −14
Original line number Diff line number Diff line
@@ -350,10 +350,10 @@ reservation_ns_release(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qp 
}



static int

reserve_controller(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair,

		   const struct spdk_pci_addr *pci_addr)

reserve_controller(struct spdk_nvme_ctrlr *ctrlr, const struct spdk_pci_addr *pci_addr)

{

	const struct spdk_nvme_ctrlr_data	*cdata;

	struct spdk_nvme_qpair			*qpair;

	int ret;



	cdata = spdk_nvme_ctrlr_get_data(ctrlr);
@@ -370,14 +370,20 @@ reserve_controller(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair, 
		return 0;

	}



	qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);

	if (!qpair) {

		fprintf(stderr, "spdk_nvme_ctrlr_alloc_io_qpair() failed\n");

		return -EIO;

	}



	ret = set_host_identifier(ctrlr);

	if (ret) {

		return ret;

		goto out;

	}



	ret = get_host_identifier(ctrlr);

	if (ret) {

		return ret;

		goto out;

	}



	/* tested 1 namespace */
@@ -387,6 +393,8 @@ reserve_controller(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair, 
	ret += reservation_ns_register(ctrlr, qpair, 1, 0);

	ret += reservation_ns_report(ctrlr, qpair, 1);



out:

	spdk_nvme_ctrlr_free_io_qpair(qpair);

	return ret;

}
@@ -431,16 +439,7 @@ int main(int argc, char **argv) 
	}



	foreach_dev(iter) {

		struct spdk_nvme_qpair *qpair;



		qpair = spdk_nvme_ctrlr_alloc_io_qpair(iter->ctrlr, NULL, 0);

		if (!qpair) {

			fprintf(stderr, "spdk_nvme_ctrlr_alloc_io_qpair() failed\n");

			ret = 1;

		} else {

			ret = reserve_controller(iter->ctrlr, qpair, &iter->pci_addr);

		}



		ret = reserve_controller(iter->ctrlr, &iter->pci_addr);

		if (ret) {

			break;

		}