Commit 2ae3aab5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.13-20250103' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:
 "Collection of fixes for block. Particularly the target name overflow
  has been a bit annoying, as it results in overwriting random memory
  and hence shows up as triggering various other bugs.

   - NVMe pull request via Keith:
      - Fix device specific quirk for PRP list alignment (Robert)
      - Fix target name overflow (Leo)
      - Fix target write granularity (Luis)
      - Fix target sleeping in atomic context (Nilay)
      - Remove unnecessary tcp queue teardown (Chunguang)

   - Simple cdrom typo fix"

* tag 'block-6.13-20250103' of git://git.kernel.dk/linux:
  cdrom: Fix typo, 'devicen' to 'device'
  nvme-tcp: remove nvme_tcp_destroy_io_queues()
  nvmet-loop: avoid using mutex in IO hotpath
  nvmet: propagate npwg topology
  nvmet: Don't overflow subsysnqn
  nvme-pci: 512 byte aligned dma pool segment quirk
parents a984e234 cc0331e2

drivers/cdrom/cdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ int open_for_data(struct cdrom_device_info *cdi) 
		}

	}



	cd_dbg(CD_OPEN, "all seems well, opening the devicen");

	cd_dbg(CD_OPEN, "all seems well, opening the device\n");



	/* all seems well, we can open the device */

	ret = cdo->open(cdi, 0); /* open for data */

drivers/nvme/host/nvme.h

+5 −0
Original line number Diff line number Diff line
@@ -173,6 +173,11 @@ enum nvme_quirks { 
	 * MSI (but not MSI-X) interrupts are broken and never fire.

	 */

	NVME_QUIRK_BROKEN_MSI			= (1 << 21),



	/*

	 * Align dma pool segment size to 512 bytes

	 */

	NVME_QUIRK_DMAPOOL_ALIGN_512		= (1 << 22),

};



/*

drivers/nvme/host/pci.c

+7 −2
Original line number Diff line number Diff line
@@ -2834,15 +2834,20 @@ static int nvme_disable_prepare_reset(struct nvme_dev *dev, bool shutdown) 


static int nvme_setup_prp_pools(struct nvme_dev *dev)

{

	size_t small_align = 256;



	dev->prp_page_pool = dma_pool_create("prp list page", dev->dev,

						NVME_CTRL_PAGE_SIZE,

						NVME_CTRL_PAGE_SIZE, 0);

	if (!dev->prp_page_pool)

		return -ENOMEM;



	if (dev->ctrl.quirks & NVME_QUIRK_DMAPOOL_ALIGN_512)

		small_align = 512;



	/* Optimisation for I/Os between 4k and 128k */

	dev->prp_small_pool = dma_pool_create("prp list 256", dev->dev,

						256, 256, 0);

						256, small_align, 0);

	if (!dev->prp_small_pool) {

		dma_pool_destroy(dev->prp_page_pool);

		return -ENOMEM;
@@ -3607,7 +3612,7 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_VDEVICE(REDHAT, 0x0010),	/* Qemu emulated controller */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x1217, 0x8760), /* O2 Micro 64GB Steam Deck */

		.driver_data = NVME_QUIRK_QDEPTH_ONE },

		.driver_data = NVME_QUIRK_DMAPOOL_ALIGN_512, },

	{ PCI_DEVICE(0x126f, 0x2262),	/* Silicon Motion generic */

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |

				NVME_QUIRK_BOGUS_NID, },

drivers/nvme/host/tcp.c

+7 −11
Original line number Diff line number Diff line
@@ -2024,14 +2024,6 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl) 
	return __nvme_tcp_alloc_io_queues(ctrl);

}



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

{

	nvme_tcp_stop_io_queues(ctrl);

	if (remove)

		nvme_remove_io_tag_set(ctrl);

	nvme_tcp_free_io_queues(ctrl);

}



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

{

	int ret, nr_queues;
@@ -2176,9 +2168,11 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, 
	nvme_sync_io_queues(ctrl);

	nvme_tcp_stop_io_queues(ctrl);

	nvme_cancel_tagset(ctrl);

	if (remove)

	if (remove) {

		nvme_unquiesce_io_queues(ctrl);

	nvme_tcp_destroy_io_queues(ctrl, remove);

		nvme_remove_io_tag_set(ctrl);

	}

	nvme_tcp_free_io_queues(ctrl);

}



static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl,
@@ -2267,7 +2261,9 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new) 
		nvme_sync_io_queues(ctrl);

		nvme_tcp_stop_io_queues(ctrl);

		nvme_cancel_tagset(ctrl);

		nvme_tcp_destroy_io_queues(ctrl, new);

		if (new)

			nvme_remove_io_tag_set(ctrl);

		nvme_tcp_free_io_queues(ctrl);

	}

destroy_admin:

	nvme_stop_keep_alive(ctrl);

drivers/nvme/target/admin-cmd.c

+5 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static u16 nvmet_get_smart_log_all(struct nvmet_req *req, 
	unsigned long idx;



	ctrl = req->sq->ctrl;

	xa_for_each(&ctrl->subsys->namespaces, idx, ns) {

	nvmet_for_each_enabled_ns(&ctrl->subsys->namespaces, idx, ns) {

		/* we don't have the right data for file backed ns */

		if (!ns->bdev)

			continue;
@@ -331,10 +331,11 @@ static u32 nvmet_format_ana_group(struct nvmet_req *req, u32 grpid, 
	u32 count = 0;



	if (!(req->cmd->get_log_page.lsp & NVME_ANA_LOG_RGO)) {

		xa_for_each(&ctrl->subsys->namespaces, idx, ns)

		nvmet_for_each_enabled_ns(&ctrl->subsys->namespaces, idx, ns) {

			if (ns->anagrpid == grpid)

				desc->nsids[count++] = cpu_to_le32(ns->nsid);

		}

	}



	desc->grpid = cpu_to_le32(grpid);

	desc->nnsids = cpu_to_le32(count);
@@ -772,7 +773,7 @@ static void nvmet_execute_identify_endgrp_list(struct nvmet_req *req) 
		goto out;

	}



	xa_for_each(&ctrl->subsys->namespaces, idx, ns) {

	nvmet_for_each_enabled_ns(&ctrl->subsys->namespaces, idx, ns) {

		if (ns->nsid <= min_endgid)

			continue;
@@ -815,7 +816,7 @@ static void nvmet_execute_identify_nslist(struct nvmet_req *req, bool match_css) 
		goto out;

	}



	xa_for_each(&ctrl->subsys->namespaces, idx, ns) {

	nvmet_for_each_enabled_ns(&ctrl->subsys->namespaces, idx, ns) {

		if (ns->nsid <= min_nsid)

			continue;

		if (match_css && req->ns->csi != req->cmd->identify.csi)