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

Merge branch 'nvme-5.11' of git://git.infradead.org/nvme into block-5.11 

Pull NVMe fixes from Christoph.

* 'nvme-5.11' of git://git.infradead.org/nvme:
  nvmet-tcp: fix out-of-bounds access when receiving multiple h2cdata PDUs
  update the email address for Keith Bush
  nvme-pci: ignore the subsysem NQN on Phison E16
  nvme-pci: avoid the deepest sleep state on Kingston A2000 SSDs
parents 388c705b cb8563f5

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ Kees Cook <keescook@chromium.org> <kees.cook@canonical.com> 
Kees Cook <keescook@chromium.org> <keescook@google.com>

Kees Cook <keescook@chromium.org> <kees@outflux.net>

Kees Cook <keescook@chromium.org> <kees@ubuntu.com>

Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>

Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

drivers/nvme/host/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -3242,6 +3242,8 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_DEVICE(0x144d, 0xa822),   /* Samsung PM1725a */

		.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY |

				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_DEVICE(0x1987, 0x5016),	/* Phison E16 */

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_DEVICE(0x1d1d, 0x1f1f),	/* LighNVM qemu device */

		.driver_data = NVME_QUIRK_LIGHTNVM, },

	{ PCI_DEVICE(0x1d1d, 0x2807),	/* CNEX WL */
@@ -3259,6 +3261,8 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x1d97, 0x2263),   /* SPCC */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x2646, 0x2263),   /* KINGSTON A2000 NVMe SSD  */

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001),

		.driver_data = NVME_QUIRK_SINGLE_VECTOR },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },

drivers/nvme/target/tcp.c

+2 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void nvmet_tcp_map_pdu_iovec(struct nvmet_tcp_cmd *cmd) 
	length = cmd->pdu_len;

	cmd->nr_mapped = DIV_ROUND_UP(length, PAGE_SIZE);

	offset = cmd->rbytes_done;

	cmd->sg_idx = DIV_ROUND_UP(offset, PAGE_SIZE);

	cmd->sg_idx = offset / PAGE_SIZE;

	sg_offset = offset % PAGE_SIZE;

	sg = &cmd->req.sg[cmd->sg_idx];
@@ -318,6 +318,7 @@ static void nvmet_tcp_map_pdu_iovec(struct nvmet_tcp_cmd *cmd) 
		length -= iov_len;

		sg = sg_next(sg);

		iov++;

		sg_offset = 0;

	}



	iov_iter_kvec(&cmd->recv_msg.msg_iter, READ, cmd->iov,