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

Merge tag 'nvme-6.13-2024-12-05' of git://git.infradead.org/nvme into block-6.13 

Pull NVMe fixess from Keith:

"nvme fixes for Linux 6.13

 - Target fix using incorrect zero buffer (Nilay)
 - Device specifc deallocate quirk fixes (Christoph, Keith)
 - Fabrics fix for handling max command target bugs (Maurizio)
 - Cocci fix usage for kzalloc (Yu-Chen)
 - DMA size fix for host memory buffer feature (Christoph)
 - Fabrics queue cleanup fixes (Chunguang)"

* tag 'nvme-6.13-2024-12-05' of git://git.infradead.org/nvme:
  nvme-tcp: simplify nvme_tcp_teardown_io_queues()
  nvme-tcp: no need to quiesce admin_q in nvme_tcp_teardown_io_queues()
  nvme-rdma: unquiesce admin_q before destroy it
  nvme-tcp: fix the memleak while create new ctrl failed
  nvme-pci: don't use dma_alloc_noncontiguous with 0 merge boundary
  nvmet: replace kmalloc + memset with kzalloc for data allocation
  nvme-fabrics: handle zero MAXCMD without closing the connection
  nvme-pci: remove two deallocate zeroes quirks
  nvme: don't apply NVME_QUIRK_DEALLOCATE_ZEROES when DSM is not supported
  nvmet: use kzalloc instead of ZERO_PAGE in nvme_execute_identify_ns_nvm()
parents 7678abee b4e12f57

drivers/nvme/host/core.c

+5 −3
Original line number Diff line number Diff line
@@ -2071,7 +2071,8 @@ static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id, 
	lim->physical_block_size = min(phys_bs, atomic_bs);

	lim->io_min = phys_bs;

	lim->io_opt = io_opt;

	if (ns->ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES)

	if ((ns->ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES) &&

	    (ns->ctrl->oncs & NVME_CTRL_ONCS_DSM))

		lim->max_write_zeroes_sectors = UINT_MAX;

	else

		lim->max_write_zeroes_sectors = ns->ctrl->max_zeroes_sectors;
@@ -3260,8 +3261,9 @@ static int nvme_check_ctrl_fabric_info(struct nvme_ctrl *ctrl, struct nvme_id_ct 
	}



	if (!ctrl->maxcmd) {

		dev_err(ctrl->device, "Maximum outstanding commands is 0\n");

		return -EINVAL;

		dev_warn(ctrl->device,

			"Firmware bug: maximum outstanding commands is 0\n");

		ctrl->maxcmd = ctrl->sqsize + 1;

	}



	return 0;

drivers/nvme/host/pci.c

+3 −4
Original line number Diff line number Diff line
@@ -2172,6 +2172,7 @@ static int nvme_alloc_host_mem_multi(struct nvme_dev *dev, u64 preferred, 


static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)

{

	unsigned long dma_merge_boundary = dma_get_merge_boundary(dev->dev);

	u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);

	u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);

	u64 chunk_size;
@@ -2180,7 +2181,7 @@ static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred) 
	 * If there is an IOMMU that can merge pages, try a virtually

	 * non-contiguous allocation for a single segment first.

	 */

	if (!(PAGE_SIZE & dma_get_merge_boundary(dev->dev))) {

	if (dma_merge_boundary && (PAGE_SIZE & dma_merge_boundary) == 0) {

		if (!nvme_alloc_host_mem_single(dev, preferred))

			return 0;

	}
@@ -3588,12 +3589,10 @@ static const struct pci_device_id nvme_id_table[] = { 
				NVME_QUIRK_DEALLOCATE_ZEROES, },

	{ PCI_VDEVICE(INTEL, 0x0a54),	/* Intel P4500/P4600 */

		.driver_data = NVME_QUIRK_STRIPE_SIZE |

				NVME_QUIRK_DEALLOCATE_ZEROES |

				NVME_QUIRK_IGNORE_DEV_SUBNQN |

				NVME_QUIRK_BOGUS_NID, },

	{ PCI_VDEVICE(INTEL, 0x0a55),	/* Dell Express Flash P4600 */

		.driver_data = NVME_QUIRK_STRIPE_SIZE |

				NVME_QUIRK_DEALLOCATE_ZEROES, },

		.driver_data = NVME_QUIRK_STRIPE_SIZE, },

	{ PCI_VDEVICE(INTEL, 0xf1a5),	/* Intel 600P/P3100 */

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |

				NVME_QUIRK_MEDIUM_PRIO_SQ |

drivers/nvme/host/rdma.c

+1 −7
Original line number Diff line number Diff line
@@ -1091,13 +1091,7 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new) 
	}

destroy_admin:

	nvme_stop_keep_alive(&ctrl->ctrl);

	nvme_quiesce_admin_queue(&ctrl->ctrl);

	blk_sync_queue(ctrl->ctrl.admin_q);

	nvme_rdma_stop_queue(&ctrl->queues[0]);

	nvme_cancel_admin_tagset(&ctrl->ctrl);

	if (new)

		nvme_remove_admin_tag_set(&ctrl->ctrl);

	nvme_rdma_destroy_admin_queue(ctrl);

	nvme_rdma_teardown_admin_queue(ctrl, new);

	return ret;

}

drivers/nvme/host/tcp.c

+5 −12
Original line number Diff line number Diff line
@@ -2101,14 +2101,6 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new) 
	return ret;

}



static void nvme_tcp_destroy_admin_queue(struct nvme_ctrl *ctrl, bool remove)

{

	nvme_tcp_stop_queue(ctrl, 0);

	if (remove)

		nvme_remove_admin_tag_set(ctrl);

	nvme_tcp_free_admin_queue(ctrl);

}



static int nvme_tcp_configure_admin_queue(struct nvme_ctrl *ctrl, bool new)

{

	int error;
@@ -2163,9 +2155,11 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl, 
	blk_sync_queue(ctrl->admin_q);

	nvme_tcp_stop_queue(ctrl, 0);

	nvme_cancel_admin_tagset(ctrl);

	if (remove)

	if (remove) {

		nvme_unquiesce_admin_queue(ctrl);

	nvme_tcp_destroy_admin_queue(ctrl, remove);

		nvme_remove_admin_tag_set(ctrl);

	}

	nvme_tcp_free_admin_queue(ctrl);

	if (ctrl->tls_pskid) {

		dev_dbg(ctrl->device, "Wipe negotiated TLS_PSK %08x\n",

			ctrl->tls_pskid);
@@ -2178,7 +2172,6 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, 
{

	if (ctrl->queue_count <= 1)

		return;

	nvme_quiesce_admin_queue(ctrl);

	nvme_quiesce_io_queues(ctrl);

	nvme_sync_io_queues(ctrl);

	nvme_tcp_stop_io_queues(ctrl);
@@ -2278,7 +2271,7 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new) 
	}

destroy_admin:

	nvme_stop_keep_alive(ctrl);

	nvme_tcp_teardown_admin_queue(ctrl, false);

	nvme_tcp_teardown_admin_queue(ctrl, new);

	return ret;

}

drivers/nvme/target/admin-cmd.c

+7 −2
Original line number Diff line number Diff line
@@ -902,13 +902,18 @@ static void nvmet_execute_identify_ctrl_nvm(struct nvmet_req *req) 
static void nvme_execute_identify_ns_nvm(struct nvmet_req *req)

{

	u16 status;

	struct nvme_id_ns_nvm *id;



	status = nvmet_req_find_ns(req);

	if (status)

		goto out;



	status = nvmet_copy_to_sgl(req, 0, ZERO_PAGE(0),

				   NVME_IDENTIFY_DATA_SIZE);

	id = kzalloc(sizeof(*id), GFP_KERNEL);

	if (!id) {

		status = NVME_SC_INTERNAL;

		goto out;

	}

	status = nvmet_copy_to_sgl(req, 0, id, sizeof(*id));

out:

	nvmet_req_complete(req, status);

}