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

Merge tag 'block-6.11-20240906' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:
 "Mostly just some fixlets for NVMe, but also a bug fix for the ublk
  driver and an integrity fix"

* tag 'block-6.11-20240906' of git://git.kernel.dk/linux:
  bio-integrity: don't restrict the size of integrity metadata
  ublk_drv: fix NULL pointer dereference in ublk_ctrl_start_recovery()
  nvmet: Identify-Active Namespace ID List command should reject invalid nsid
  nvme: set BLK_FEAT_ZONED for ZNS multipath disks
  nvme-pci: Add sleep quirk for Samsung 990 Evo
  nvme-pci: allocate tagset on reset if necessary
  nvmet-tcp: fix kernel crash if commands allocation fails
  nvme: use better description for async reset reason
  nvmet: Make nvmet_debugfs static
parents 703896be 4ba032bc

block/bio-integrity.c

+0 −4
Original line number Diff line number Diff line
@@ -167,10 +167,6 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, 
	struct request_queue *q = bdev_get_queue(bio->bi_bdev);

	struct bio_integrity_payload *bip = bio_integrity(bio);



	if (((bip->bip_iter.bi_size + len) >> SECTOR_SHIFT) >

	    queue_max_hw_sectors(q))

		return 0;



	if (bip->bip_vcnt > 0) {

		struct bio_vec *bv = &bip->bip_vec[bip->bip_vcnt - 1];

		bool same_page = false;

drivers/block/ublk_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -2663,6 +2663,8 @@ static int ublk_ctrl_start_recovery(struct ublk_device *ub, 
	mutex_lock(&ub->mutex);

	if (!ublk_can_use_recovery(ub))

		goto out_unlock;

	if (!ub->nr_queues_ready)

		goto out_unlock;

	/*

	 * START_RECOVERY is only allowd after:

	 *

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -4437,7 +4437,8 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) 


static void nvme_handle_aer_persistent_error(struct nvme_ctrl *ctrl)

{

	dev_warn(ctrl->device, "resetting controller due to AER\n");

	dev_warn(ctrl->device,

		"resetting controller due to persistent internal error\n");

	nvme_reset_ctrl(ctrl);

}

drivers/nvme/host/multipath.c

+3 −1
Original line number Diff line number Diff line
@@ -616,7 +616,9 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) 
	blk_set_stacking_limits(&lim);

	lim.dma_alignment = 3;

	lim.features |= BLK_FEAT_IO_STAT | BLK_FEAT_NOWAIT | BLK_FEAT_POLL;

	if (head->ids.csi != NVME_CSI_ZNS)

	if (head->ids.csi == NVME_CSI_ZNS)

		lim.features |= BLK_FEAT_ZONED;

	else

		lim.max_zone_append_sectors = 0;



	head->disk = blk_alloc_disk(&lim, ctrl->numa_node);

drivers/nvme/host/pci.c

+17 −0
Original line number Diff line number Diff line
@@ -2508,6 +2508,12 @@ static unsigned int nvme_pci_nr_maps(struct nvme_dev *dev) 


static void nvme_pci_update_nr_queues(struct nvme_dev *dev)

{

	if (!dev->ctrl.tagset) {

		nvme_alloc_io_tag_set(&dev->ctrl, &dev->tagset, &nvme_mq_ops,

				nvme_pci_nr_maps(dev), sizeof(struct nvme_iod));

		return;

	}



	blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);

	/* free previously allocated queues that are no longer usable */

	nvme_free_queues(dev, dev->online_queues);
@@ -2967,6 +2973,17 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) 
		    dmi_match(DMI_BOARD_NAME, "NS5x_7xPU") ||

		    dmi_match(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1"))

			return NVME_QUIRK_FORCE_NO_SIMPLE_SUSPEND;

	} else if (pdev->vendor == 0x144d && pdev->device == 0xa80d) {

		/*

		 * Exclude Samsung 990 Evo from NVME_QUIRK_SIMPLE_SUSPEND

		 * because of high power consumption (> 2 Watt) in s2idle

		 * sleep. Only some boards with Intel CPU are affected.

		 */

		if (dmi_match(DMI_BOARD_NAME, "GMxPXxx") ||

		    dmi_match(DMI_BOARD_NAME, "PH4PG31") ||

		    dmi_match(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1") ||

		    dmi_match(DMI_BOARD_NAME, "PH6PG01_PH6PG71"))

			return NVME_QUIRK_FORCE_NO_SIMPLE_SUSPEND;

	}



	/*