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

Merge tag 'nvme-6.0-2022-09-01' of git://git.infradead.org/nvme into block-6.0 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 6.0

 - error handling fix for the new auth code (Hannes Reinecke)
 - fix unhandled tcp states in nvmet_tcp_state_change (Maurizio Lombardi)
 - add NVME_QUIRK_BOGUS_NID for Lexar NM610 (Shyamin Ayesh)"

* tag 'nvme-6.0-2022-09-01' of git://git.infradead.org/nvme:
  nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change()
  nvmet-auth: add missing goto in nvmet_setup_auth()
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM610
parents 645b5ed8 478814a5

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -3522,6 +3522,8 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },

	{ PCI_DEVICE(0xc0a9, 0x540a),   /* Crucial P2 */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1d97, 0x2263), /* Lexar NM610 */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061),

		.driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),

drivers/nvme/target/auth.c

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ int nvmet_setup_auth(struct nvmet_ctrl *ctrl) 
	if (IS_ERR(ctrl->ctrl_key)) {

		ret = PTR_ERR(ctrl->ctrl_key);

		ctrl->ctrl_key = NULL;

		goto out_free_hash;

	}

	pr_debug("%s: using ctrl hash %s key %*ph\n", __func__,

		 ctrl->ctrl_key->hash > 0 ?

drivers/nvme/target/tcp.c

+3 −0
Original line number Diff line number Diff line
@@ -1506,6 +1506,9 @@ static void nvmet_tcp_state_change(struct sock *sk) 
		goto done;



	switch (sk->sk_state) {

	case TCP_FIN_WAIT2:

	case TCP_LAST_ACK:

		break;

	case TCP_FIN_WAIT1:

	case TCP_CLOSE_WAIT:

	case TCP_CLOSE: