Commit d592974f authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-5.0' of git://git.infradead.org/nvme into for-linus 

Pull NVMe fixes from Christoph for this release.

* 'nvme-5.0' of git://git.infradead.org/nvme:
  nvme-pci: fix rapid add remove sequence
  nvme: lock NS list changes while handling command effects
parents ec51f8ee 5c959d73

drivers/nvme/host/core.c

+7 −1
Original line number Diff line number Diff line
@@ -1253,6 +1253,7 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	 * effects say only one namespace is affected.

	 */

	if (effects & (NVME_CMD_EFFECTS_LBCC | NVME_CMD_EFFECTS_CSE_MASK)) {

		mutex_lock(&ctrl->scan_lock);

		nvme_start_freeze(ctrl);

		nvme_wait_freeze(ctrl);

	}
@@ -1281,8 +1282,10 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects) 
	 */

	if (effects & NVME_CMD_EFFECTS_LBCC)

		nvme_update_formats(ctrl);

	if (effects & (NVME_CMD_EFFECTS_LBCC | NVME_CMD_EFFECTS_CSE_MASK))

	if (effects & (NVME_CMD_EFFECTS_LBCC | NVME_CMD_EFFECTS_CSE_MASK)) {

		nvme_unfreeze(ctrl);

		mutex_unlock(&ctrl->scan_lock);

	}

	if (effects & NVME_CMD_EFFECTS_CCC)

		nvme_init_identify(ctrl);

	if (effects & (NVME_CMD_EFFECTS_NIC | NVME_CMD_EFFECTS_NCC))
@@ -3401,6 +3404,7 @@ static void nvme_scan_work(struct work_struct *work) 
	if (nvme_identify_ctrl(ctrl, &id))

		return;



	mutex_lock(&ctrl->scan_lock);

	nn = le32_to_cpu(id->nn);

	if (ctrl->vs >= NVME_VS(1, 1, 0) &&

	    !(ctrl->quirks & NVME_QUIRK_IDENTIFY_CNS)) {
@@ -3409,6 +3413,7 @@ static void nvme_scan_work(struct work_struct *work) 
	}

	nvme_scan_ns_sequential(ctrl, nn);

out_free_id:

	mutex_unlock(&ctrl->scan_lock);

	kfree(id);

	down_write(&ctrl->namespaces_rwsem);

	list_sort(NULL, &ctrl->namespaces, ns_cmp);
@@ -3652,6 +3657,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 


	ctrl->state = NVME_CTRL_NEW;

	spin_lock_init(&ctrl->lock);

	mutex_init(&ctrl->scan_lock);

	INIT_LIST_HEAD(&ctrl->namespaces);

	init_rwsem(&ctrl->namespaces_rwsem);

	ctrl->dev = dev;

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ struct nvme_ctrl { 
	enum nvme_ctrl_state state;

	bool identified;

	spinlock_t lock;

	struct mutex scan_lock;

	const struct nvme_ctrl_ops *ops;

	struct request_queue *admin_q;

	struct request_queue *connect_q;

drivers/nvme/host/pci.c

+12 −10
Original line number Diff line number Diff line
@@ -2557,16 +2557,7 @@ static void nvme_reset_work(struct work_struct *work) 
	if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)

		nvme_dev_disable(dev, false);



	/*

	 * Introduce CONNECTING state from nvme-fc/rdma transports to mark the

	 * initializing procedure here.

	 */

	if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_CONNECTING)) {

		dev_warn(dev->ctrl.device,

			"failed to mark controller CONNECTING\n");

		goto out;

	}



	mutex_lock(&dev->shutdown_lock);

	result = nvme_pci_enable(dev);

	if (result)

		goto out;
@@ -2585,6 +2576,17 @@ static void nvme_reset_work(struct work_struct *work) 
	 */

	dev->ctrl.max_hw_sectors = NVME_MAX_KB_SZ << 1;

	dev->ctrl.max_segments = NVME_MAX_SEGS;

	mutex_unlock(&dev->shutdown_lock);



	/*

	 * Introduce CONNECTING state from nvme-fc/rdma transports to mark the

	 * initializing procedure here.

	 */

	if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_CONNECTING)) {

		dev_warn(dev->ctrl.device,

			"failed to mark controller CONNECTING\n");

		goto out;

	}



	result = nvme_init_identify(&dev->ctrl);

	if (result)