Commit 13d822bf authored by Jens Axboe's avatar Jens Axboe
Browse files

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

Pull NVMe fixes from Keith:

"nvme fixes for Linux 6.7

 - Revert a commit with improper sleep context (Keith)
 - Fix async event handling sleep context (Maurizio)"

* tag 'nvme-6.7-2023-12-21' of git://git.infradead.org/nvme:
  nvme-pci: fix sleeping function called from interrupt context
  Revert "nvme-fc: fix race between error recovery and creating association"
parents c6d3ab9e f6fe0b2d

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -4137,6 +4137,8 @@ static void nvme_fw_act_work(struct work_struct *work) 
				struct nvme_ctrl, fw_act_work);

	unsigned long fw_act_timeout;



	nvme_auth_stop(ctrl);



	if (ctrl->mtfa)

		fw_act_timeout = jiffies +

				msecs_to_jiffies(ctrl->mtfa * 100);
@@ -4192,7 +4194,6 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) 
		 * firmware activation.

		 */

		if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) {

			nvme_auth_stop(ctrl);

			requeue = false;

			queue_work(nvme_wq, &ctrl->fw_act_work);

		}

drivers/nvme/host/fc.c

+5 −16
Original line number Diff line number Diff line
@@ -2548,24 +2548,17 @@ nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg) 
	 * the controller.  Abort any ios on the association and let the

	 * create_association error path resolve things.

	 */

	enum nvme_ctrl_state state;

	unsigned long flags;



	spin_lock_irqsave(&ctrl->lock, flags);

	state = ctrl->ctrl.state;

	if (state == NVME_CTRL_CONNECTING) {

		set_bit(ASSOC_FAILED, &ctrl->flags);

		spin_unlock_irqrestore(&ctrl->lock, flags);

	if (ctrl->ctrl.state == NVME_CTRL_CONNECTING) {

		__nvme_fc_abort_outstanding_ios(ctrl, true);

		set_bit(ASSOC_FAILED, &ctrl->flags);

		dev_warn(ctrl->ctrl.device,

			"NVME-FC{%d}: transport error during (re)connect\n",

			ctrl->cnum);

		return;

	}

	spin_unlock_irqrestore(&ctrl->lock, flags);



	/* Otherwise, only proceed if in LIVE state - e.g. on first error */

	if (state != NVME_CTRL_LIVE)

	if (ctrl->ctrl.state != NVME_CTRL_LIVE)

		return;



	dev_warn(ctrl->ctrl.device,
@@ -3180,16 +3173,12 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
		else

			ret = nvme_fc_recreate_io_queues(ctrl);

	}



	spin_lock_irqsave(&ctrl->lock, flags);

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

		ret = -EIO;

	if (ret) {

		spin_unlock_irqrestore(&ctrl->lock, flags);

	if (ret)

		goto out_term_aen_ops;

	}



	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);

	spin_unlock_irqrestore(&ctrl->lock, flags);



	ctrl->ctrl.nr_reconnects = 0;