Commit 55072cd7 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.7-2023-11-22' of git://git.infradead.org/nvme into block-6.7 

Pull NVMe fixes from Keith:

"nvme fixes for Linux 6.7

 - TCP TLS fixes (Hannes)
 - Authentifaction fixes (Mark, Hannes)
 - Properly terminate target names (Christoph)"

* tag 'nvme-6.7-2023-11-22' of git://git.infradead.org/nvme:
  nvme: move nvme_stop_keep_alive() back to original position
  nvmet-tcp: always initialize tls_handshake_tmo_work
  nvmet: nul-terminate the NQNs passed in the connect command
  nvme: blank out authentication fabrics options if not configured
  nvme: catch errors from nvme_configure_metadata()
  nvme-tcp: only evaluate 'tls' option if TLS is selected
  nvme-auth: set explanation code for failure2 msgs
  nvme-auth: unlock mutex in one place only
parents 98c598af 3af755a4

drivers/nvme/host/auth.c

+3 −2
Original line number Diff line number Diff line
@@ -757,12 +757,11 @@ static void nvme_queue_auth_work(struct work_struct *work) 
		__func__, chap->qid);

	mutex_lock(&ctrl->dhchap_auth_mutex);

	ret = nvme_auth_dhchap_setup_host_response(ctrl, chap);

	if (ret) {

	mutex_unlock(&ctrl->dhchap_auth_mutex);

	if (ret) {

		chap->error = ret;

		goto fail2;

	}

	mutex_unlock(&ctrl->dhchap_auth_mutex);



	/* DH-HMAC-CHAP Step 3: send reply */

	dev_dbg(ctrl->device, "%s: qid %d send reply\n",
@@ -839,6 +838,8 @@ static void nvme_queue_auth_work(struct work_struct *work) 
	}



fail2:

	if (chap->status == 0)

		chap->status = NVME_AUTH_DHCHAP_FAILURE_FAILED;

	dev_dbg(ctrl->device, "%s: qid %d send failure2, status %x\n",

		__func__, chap->qid, chap->status);

	tl = nvme_auth_set_dhchap_failure2_data(ctrl, chap);

drivers/nvme/host/core.c

+14 −7
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ EXPORT_SYMBOL_GPL(nvme_cancel_tagset); 


void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl)

{

	nvme_stop_keep_alive(ctrl);

	if (ctrl->admin_tagset) {

		blk_mq_tagset_busy_iter(ctrl->admin_tagset,

				nvme_cancel_request, ctrl);
@@ -1814,16 +1813,18 @@ static int nvme_init_ms(struct nvme_ns *ns, struct nvme_id_ns *id) 
	return ret;

}



static void nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id)

static int nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id)

{

	struct nvme_ctrl *ctrl = ns->ctrl;

	int ret;



	if (nvme_init_ms(ns, id))

		return;

	ret = nvme_init_ms(ns, id);

	if (ret)

		return ret;



	ns->features &= ~(NVME_NS_METADATA_SUPPORTED | NVME_NS_EXT_LBAS);

	if (!ns->ms || !(ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))

		return;

		return 0;



	if (ctrl->ops->flags & NVME_F_FABRICS) {

		/*
@@ -1832,7 +1833,7 @@ static void nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id) 
		 * remap the separate metadata buffer from the block layer.

		 */

		if (WARN_ON_ONCE(!(id->flbas & NVME_NS_FLBAS_META_EXT)))

			return;

			return 0;



		ns->features |= NVME_NS_EXT_LBAS;
@@ -1859,6 +1860,7 @@ static void nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id) 
		else

			ns->features |= NVME_NS_METADATA_SUPPORTED;

	}

	return 0;

}



static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,
@@ -2032,7 +2034,11 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, 
	ns->lba_shift = id->lbaf[lbaf].ds;

	nvme_set_queue_limits(ns->ctrl, ns->queue);



	nvme_configure_metadata(ns, id);

	ret = nvme_configure_metadata(ns, id);

	if (ret < 0) {

		blk_mq_unfreeze_queue(ns->disk->queue);

		goto out;

	}

	nvme_set_chunk_sectors(ns, id);

	nvme_update_disk_info(ns->disk, ns, id);
@@ -4348,6 +4354,7 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) 
{

	nvme_mpath_stop(ctrl);

	nvme_auth_stop(ctrl);

	nvme_stop_keep_alive(ctrl);

	nvme_stop_failfast_work(ctrl);

	flush_work(&ctrl->async_event_work);

	cancel_work_sync(&ctrl->fw_act_work);

drivers/nvme/host/fabrics.c

+2 −0
Original line number Diff line number Diff line
@@ -667,8 +667,10 @@ static const match_table_t opt_tokens = { 
#endif

	{ NVMF_OPT_FAIL_FAST_TMO,	"fast_io_fail_tmo=%d"	},

	{ NVMF_OPT_DISCOVERY,		"discovery"		},

#ifdef CONFIG_NVME_HOST_AUTH

	{ NVMF_OPT_DHCHAP_SECRET,	"dhchap_secret=%s"	},

	{ NVMF_OPT_DHCHAP_CTRL_SECRET,	"dhchap_ctrl_secret=%s"	},

#endif

#ifdef CONFIG_NVME_TCP_TLS

	{ NVMF_OPT_TLS,			"tls"			},

#endif

drivers/nvme/host/fc.c

+8 −11
Original line number Diff line number Diff line
@@ -2530,12 +2530,6 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) 
	 * clean up the admin queue. Same thing as above.

	 */

	nvme_quiesce_admin_queue(&ctrl->ctrl);



	/*

	 * Open-coding nvme_cancel_admin_tagset() as fc

	 * is not using nvme_cancel_request().

	 */

	nvme_stop_keep_alive(&ctrl->ctrl);

	blk_sync_queue(ctrl->ctrl.admin_q);

	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,

				nvme_fc_terminate_exchange, &ctrl->ctrl);
@@ -3138,11 +3132,12 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
	nvme_unquiesce_admin_queue(&ctrl->ctrl);



	ret = nvme_init_ctrl_finish(&ctrl->ctrl, false);

	if (!ret && test_bit(ASSOC_FAILED, &ctrl->flags))

		ret = -EIO;

	if (ret)

		goto out_disconnect_admin_queue;



	if (test_bit(ASSOC_FAILED, &ctrl->flags)) {

		ret = -EIO;

		goto out_stop_keep_alive;

	}

	/* sanity checks */



	/* FC-NVME does not have other data in the capsule */
@@ -3150,7 +3145,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
		dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n",

				ctrl->ctrl.icdoff);

		ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;

		goto out_disconnect_admin_queue;

		goto out_stop_keep_alive;

	}



	/* FC-NVME supports normal SGL Data Block Descriptors */
@@ -3158,7 +3153,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
		dev_err(ctrl->ctrl.device,

			"Mandatory sgls are not supported!\n");

		ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;

		goto out_disconnect_admin_queue;

		goto out_stop_keep_alive;

	}



	if (opts->queue_size > ctrl->ctrl.maxcmd) {
@@ -3205,6 +3200,8 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 


out_term_aen_ops:

	nvme_fc_term_aen_ops(ctrl);

out_stop_keep_alive:

	nvme_stop_keep_alive(&ctrl->ctrl);

out_disconnect_admin_queue:

	dev_warn(ctrl->ctrl.device,

		"NVME-FC{%d}: create_assoc failed, assoc_id %llx ret %d\n",

drivers/nvme/host/rdma.c

+1 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,7 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new) 
		nvme_rdma_free_io_queues(ctrl);

	}

destroy_admin:

	nvme_stop_keep_alive(&ctrl->ctrl);

	nvme_quiesce_admin_queue(&ctrl->ctrl);

	blk_sync_queue(ctrl->ctrl.admin_q);

	nvme_rdma_stop_queue(&ctrl->queues[0]);