Commit e3111d9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.9-20240322' of git://git.kernel.dk/linux 

Pull more block updates from Jens Axboe:

 - NVMe pull request via Keith:
     - Make an informative message less ominous (Keith)
     - Enhanced trace decoding (Guixin)
     - TCP updates (Hannes, Li)
     - Fabrics connect deadlock fix (Chunguang)
     - Platform API migration update (Uwe)
     - A new device quirk (Jiawei)

 - Remove dead assignment in fd (Yufeng)

* tag 'block-6.9-20240322' of git://git.kernel.dk/linux:
  nvmet-rdma: remove NVMET_RDMA_REQ_INVALIDATE_RKEY flag
  nvme: remove redundant BUILD_BUG_ON check
  floppy: remove duplicated code in redo_fd_request()
  nvme/tcp: Add wq_unbound modparam for nvme_tcp_wq
  nvme-tcp: Export the nvme_tcp_wq to sysfs
  drivers/nvme: Add quirks for device 126f:2262
  nvme: parse format command's lbafu when tracing
  nvme: add tracing of reservation commands
  nvme: parse zns command's zsa and zrasf to string
  nvme: use nvme_disk_is_ns_head helper
  nvme: fix reconnection fail due to reserved tag allocation
  nvmet: add tracing of zns commands
  nvmet: add tracing of authentication commands
  nvme-apple: Convert to platform remove callback returning void
  nvmet-tcp: do not continue for invalid icreq
  nvme: change shutdown timeout setting message
parents 19dba097 07602678

drivers/block/floppy.c

+0 −1
Original line number Diff line number Diff line
@@ -2787,7 +2787,6 @@ static void redo_fd_request(void) 
		pending = set_next_request();

		spin_unlock_irq(&floppy_lock);

		if (!pending) {

			do_floppy = NULL;

			unlock_fdc();

			return;

		}

drivers/nvme/host/apple.c

+2 −4
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ static int apple_nvme_probe(struct platform_device *pdev) 
	return ret;

}



static int apple_nvme_remove(struct platform_device *pdev)

static void apple_nvme_remove(struct platform_device *pdev)

{

	struct apple_nvme *anv = platform_get_drvdata(pdev);
@@ -1547,8 +1547,6 @@ static int apple_nvme_remove(struct platform_device *pdev) 
		apple_rtkit_shutdown(anv->rtk);



	apple_nvme_detach_genpd(anv);



	return 0;

}



static void apple_nvme_shutdown(struct platform_device *pdev)
@@ -1598,7 +1596,7 @@ static struct platform_driver apple_nvme_driver = { 
		.pm = pm_sleep_ptr(&apple_nvme_pm_ops),

	},

	.probe = apple_nvme_probe,

	.remove = apple_nvme_remove,

	.remove_new = apple_nvme_remove,

	.shutdown = apple_nvme_shutdown,

};

module_platform_driver(apple_nvme_driver);

drivers/nvme/host/core.c

+5 −6
Original line number Diff line number Diff line
@@ -1807,9 +1807,6 @@ static void nvme_config_discard(struct nvme_ns *ns, struct queue_limits *lim) 
{

	struct nvme_ctrl *ctrl = ns->ctrl;



	BUILD_BUG_ON(PAGE_SIZE / sizeof(struct nvme_dsm_range) <

			NVME_DSM_MAX_RANGES);



	if (ctrl->dmrsl && ctrl->dmrsl <= nvme_sect_to_lba(ns->head, UINT_MAX))

		lim->max_hw_discard_sectors =

			nvme_lba_to_sect(ns->head, ctrl->dmrsl);
@@ -3237,7 +3234,7 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl) 


		if (ctrl->shutdown_timeout != shutdown_timeout)

			dev_info(ctrl->device,

				 "Shutdown timeout set to %u seconds\n",

				 "D3 entry latency set to %u seconds\n",

				 ctrl->shutdown_timeout);

	} else

		ctrl->shutdown_timeout = shutdown_timeout;
@@ -4391,7 +4388,8 @@ int nvme_alloc_admin_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set, 
	set->ops = ops;

	set->queue_depth = NVME_AQ_MQ_TAG_DEPTH;

	if (ctrl->ops->flags & NVME_F_FABRICS)

		set->reserved_tags = NVMF_RESERVED_TAGS;

		/* Reserved for fabric connect and keep alive */

		set->reserved_tags = 2;

	set->numa_node = ctrl->numa_node;

	set->flags = BLK_MQ_F_NO_SCHED;

	if (ctrl->ops->flags & NVME_F_BLOCKING)
@@ -4460,7 +4458,8 @@ int nvme_alloc_io_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set, 
	if (ctrl->quirks & NVME_QUIRK_SHARED_TAGS)

		set->reserved_tags = NVME_AQ_DEPTH;

	else if (ctrl->ops->flags & NVME_F_FABRICS)

		set->reserved_tags = NVMF_RESERVED_TAGS;

		/* Reserved for fabric connect */

		set->reserved_tags = 1;

	set->numa_node = ctrl->numa_node;

	set->flags = BLK_MQ_F_SHOULD_MERGE;

	if (ctrl->ops->flags & NVME_F_BLOCKING)

drivers/nvme/host/fabrics.h

+0 −7
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@ 
/* default is -1: the fail fast mechanism is disabled  */

#define NVMF_DEF_FAIL_FAST_TMO		-1



/*

 * Reserved one command for internal usage.  This command is used for sending

 * the connect command, as well as for the keep alive command on the admin

 * queue once live.

 */

#define NVMF_RESERVED_TAGS	1



/*

 * Define a host as seen by the target.  We allocate one at boot, but also

 * allow the override it when creating controllers.  This is both to provide

drivers/nvme/host/pci.c

+3 −0
Original line number Diff line number Diff line
@@ -3363,6 +3363,9 @@ static const struct pci_device_id nvme_id_table[] = { 
				NVME_QUIRK_BOGUS_NID, },

	{ PCI_VDEVICE(REDHAT, 0x0010),	/* Qemu emulated controller */

		.driver_data = NVME_QUIRK_BOGUS_NID, },

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

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |

				NVME_QUIRK_BOGUS_NID, },

	{ PCI_DEVICE(0x126f, 0x2263),	/* Silicon Motion unidentified */

		.driver_data = NVME_QUIRK_NO_NS_DESC_LIST |

				NVME_QUIRK_BOGUS_NID, },