nvme-fc: don't bother to validate ioccsz and iorcsz (faef3af6) · Commits · 戴 / test

Discovery controllers don't set the values. They are in reserved areas of the Identify Controller data structure. Given the cmd completed, the minimal capsule sizes are supported, so no need to check nqn to detect discovery controllers and special case validations. Signed-off-by:

James Smart <james.smart@broadcom.com> Reviewed-by:

Christoph Hellwig <hch@lst.de> Signed-off-by:

Sagi Grimberg <sagi@grimberg.me> Signed-off-by:

Jens Axboe <axboe@fb.com>

drivers/nvme/host/fc.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -2353,18 +2353,6 @@ __nvme_fc_create_ctrl(struct device dev, struct nvmf_ctrl_options opts,

		/* sanity checks */

		/* FC-NVME supports 64-byte SQE only */
		if (ctrl->ctrl.ioccsz != 4) {
		dev_err(ctrl->ctrl.device, "ioccsz %d is not supported!\n",
		ctrl->ctrl.ioccsz);
		goto out_remove_admin_queue;
		}
		/* FC-NVME supports 16-byte CQE only */
		if (ctrl->ctrl.iorcsz != 1) {
		dev_err(ctrl->ctrl.device, "iorcsz %d is not supported!\n",
		ctrl->ctrl.iorcsz);
		goto out_remove_admin_queue;
		}
		/* FC-NVME does not have other data in the capsule */
		if (ctrl->ctrl.icdoff) {
		dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n",

Admin message