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

Merge tag 'nvme-5.19-2022-06-30' of git://git.infradead.org/nvme into block-5.19 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.19

 - more quirks (Lamarque Vieira Souza, Pablo Greco)
 - fix a fabrics disconnect regression (Ruozhu Li)
 - fix a nvmet-tcp data_digest calculation regression (Sagi Grimberg)
 - fix nvme-tcp send failure handling (Sagi Grimberg)
 - fix a regression with nvmet-loop and passthrough controllers
   (Alan Adamson)"

* tag 'nvme-5.19-2022-06-30' of git://git.infradead.org/nvme:
  nvme-pci: add NVME_QUIRK_BOGUS_NID for ADATA IM2P33F8ABR1
  nvmet: add a clear_ids attribute for passthru targets
  nvme: fix regression when disconnect a recovering ctrl
  nvme-pci: add NVME_QUIRK_BOGUS_NID for ADATA XPG SX6000LNP (AKA SPECTRIX S40G)
  nvme-tcp: always fail a request when sending it failed
  nvmet-tcp: fix regression in data_digest calculation
parents fbb564a5 e1c70d79

drivers/nvme/host/core.c

+2 −0
Original line number Diff line number Diff line
@@ -4595,6 +4595,8 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) 
	nvme_stop_failfast_work(ctrl);

	flush_work(&ctrl->async_event_work);

	cancel_work_sync(&ctrl->fw_act_work);

	if (ctrl->ops->stop_ctrl)

		ctrl->ops->stop_ctrl(ctrl);

}

EXPORT_SYMBOL_GPL(nvme_stop_ctrl);

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ struct nvme_ctrl_ops { 
	void (*free_ctrl)(struct nvme_ctrl *ctrl);

	void (*submit_async_event)(struct nvme_ctrl *ctrl);

	void (*delete_ctrl)(struct nvme_ctrl *ctrl);

	void (*stop_ctrl)(struct nvme_ctrl *ctrl);

	int (*get_address)(struct nvme_ctrl *ctrl, char *buf, int size);

	void (*print_device_info)(struct nvme_ctrl *ctrl);

};

drivers/nvme/host/pci.c

+4 −1
Original line number Diff line number Diff line
@@ -3469,8 +3469,11 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_DEVICE(0x1b4b, 0x1092),	/* Lexar 256 GB SSD */

		.driver_data = NVME_QUIRK_NO_NS_DESC_LIST |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_DEVICE(0x1cc1, 0x33f8),   /* ADATA IM2P33F8ABR1 1 TB */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x10ec, 0x5762),   /* ADATA SX6000LNP */

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN |

				NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1cc1, 0x8201),   /* ADATA SX8200PNP 512GB */

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

drivers/nvme/host/rdma.c

+9 −3
Original line number Diff line number Diff line
@@ -1048,6 +1048,14 @@ static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl, 
	}

}



static void nvme_rdma_stop_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);



	cancel_work_sync(&ctrl->err_work);

	cancel_delayed_work_sync(&ctrl->reconnect_work);

}



static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);
@@ -2252,9 +2260,6 @@ static const struct blk_mq_ops nvme_rdma_admin_mq_ops = { 


static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)

{

	cancel_work_sync(&ctrl->err_work);

	cancel_delayed_work_sync(&ctrl->reconnect_work);



	nvme_rdma_teardown_io_queues(ctrl, shutdown);

	nvme_stop_admin_queue(&ctrl->ctrl);

	if (shutdown)
@@ -2304,6 +2309,7 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { 
	.submit_async_event	= nvme_rdma_submit_async_event,

	.delete_ctrl		= nvme_rdma_delete_ctrl,

	.get_address		= nvmf_get_address,

	.stop_ctrl		= nvme_rdma_stop_ctrl,

};



/*

drivers/nvme/host/tcp.c

+8 −5
Original line number Diff line number Diff line
@@ -1180,7 +1180,6 @@ static int nvme_tcp_try_send(struct nvme_tcp_queue *queue) 
	} else if (ret < 0) {

		dev_err(queue->ctrl->ctrl.device,

			"failed to send request %d\n", ret);

		if (ret != -EPIPE && ret != -ECONNRESET)

		nvme_tcp_fail_request(queue->request);

		nvme_tcp_done_send_req(queue);

	}
@@ -2194,9 +2193,6 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work) 


static void nvme_tcp_teardown_ctrl(struct nvme_ctrl *ctrl, bool shutdown)

{

	cancel_work_sync(&to_tcp_ctrl(ctrl)->err_work);

	cancel_delayed_work_sync(&to_tcp_ctrl(ctrl)->connect_work);



	nvme_tcp_teardown_io_queues(ctrl, shutdown);

	nvme_stop_admin_queue(ctrl);

	if (shutdown)
@@ -2236,6 +2232,12 @@ static void nvme_reset_ctrl_work(struct work_struct *work) 
	nvme_tcp_reconnect_or_remove(ctrl);

}



static void nvme_tcp_stop_ctrl(struct nvme_ctrl *ctrl)

{

	cancel_work_sync(&to_tcp_ctrl(ctrl)->err_work);

	cancel_delayed_work_sync(&to_tcp_ctrl(ctrl)->connect_work);

}



static void nvme_tcp_free_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl);
@@ -2557,6 +2559,7 @@ static const struct nvme_ctrl_ops nvme_tcp_ctrl_ops = { 
	.submit_async_event	= nvme_tcp_submit_async_event,

	.delete_ctrl		= nvme_tcp_delete_ctrl,

	.get_address		= nvmf_get_address,

	.stop_ctrl		= nvme_tcp_stop_ctrl,

};



static bool