Commit a521fc3c authored Oct 13, 2022 by Linus Torvalds

Merge tag 'block-6.1-2022-10-13' of git://git.kernel.dk/linux

Pull more block updates from Jens Axboe:
 "Fixes that ended up landing later than the initial block pull request.
  Nothing really major in here:

   - NVMe pull request via Christoph:
        - add NVME_QUIRK_BOGUS_NID for Lexar NM760 (Abhijit)
        - add NVME_QUIRK_NO_DEEPEST_PS to avoid the deepest sleep state
          on ZHITAI TiPro5000 SSDs (Xi Ruoyao)
        - fix possible hang caused during ctrl deletion (Sagi Grimberg)
        - fix possible hang in live ns resize with ANA access (Sagi
          Grimberg)

   - Proactively avoid a sign extension issue with the queue flags
     (Brian)

   - Regression fix for hidden disks (Christoph)

   - Update OPAL maintainers entry (Jonathan)

   - blk-wbt regression initialization fix (Yu)"

* tag 'block-6.1-2022-10-13' of git://git.kernel.dk/linux:
  nvme-multipath: fix possible hang in live ns resize with ANA access
  nvme-pci: avoid the deepest sleep state on ZHITAI TiPro5000 SSDs
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM760
  nvme-tcp: fix possible hang caused during ctrl deletion
  nvme-rdma: fix possible hang caused during ctrl deletion
  block: fix leaking minors of hidden disks
  block: avoid sign extend problem with default queue flags mask
  blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init()
  block: Remove the repeat word 'can'
  MAINTAINERS: Update SED-Opal Maintainers

parents c98c70ed 3bc429c1

MAINTAINERS

+1 −2

Original line number	Diff line number	Diff line
		@@ -18515,8 +18515,7 @@ S: Maintained
		F: drivers/mmc/host/sdhci-esdhc-imx.c

		SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
		M: Jonathan Derrick <jonathan.derrick@intel.com>
		M: Revanth Rajashekar <revanth.rajashekar@intel.com>
		M: Jonathan Derrick <jonathan.derrick@linux.dev>
		L: linux-block@vger.kernel.org
		S: Supported
		F: block/opal_proto.h

block/bio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@ EXPORT_SYMBOL(bio_alloc_bioset);
		* be reused by calling bio_uninit() before calling bio_init() again.
		*
		* Note that unlike bio_alloc() or bio_alloc_bioset() allocations from this
		* function are not backed by a mempool can can fail. Do not use this function
		* function are not backed by a mempool can fail. Do not use this function
		* for allocations in the file system I/O path.
		*
		* Returns: Pointer to new bio on success, NULL on failure.

block/blk-wbt.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -841,12 +841,11 @@ int wbt_init(struct request_queue *q)
		rwb->last_comp = rwb->last_issue = jiffies;
		rwb->win_nsec = RWB_WINDOW_NSEC;
		rwb->enable_state = WBT_STATE_ON_DEFAULT;
		rwb->wc = 1;
		rwb->wc = test_bit(QUEUE_FLAG_WC, &q->queue_flags);
		rwb->rq_depth.default_depth = RWB_DEF_DEPTH;
		rwb->min_lat_nsec = wbt_default_latency_nsec(q);

		wbt_queue_depth_changed(&rwb->rqos);
		wbt_set_write_cache(q, test_bit(QUEUE_FLAG_WC, &q->queue_flags));

		/*
		* Assign rwb and add the stats callback.

block/genhd.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -507,6 +507,13 @@ int __must_check device_add_disk(struct device parent, struct gendisk disk,
		*/
		dev_set_uevent_suppress(ddev, 0);
		disk_uevent(disk, KOBJ_ADD);
		} else {
		/*
		* Even if the block_device for a hidden gendisk is not
		* registered, it needs to have a valid bd_dev so that the
		* freeing of the dynamic major works.
		*/
		disk->part0->bd_dev = MKDEV(disk->major, disk->first_minor);
		}

		disk_update_readahead(disk);

drivers/nvme/host/multipath.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,7 @@ void nvme_mpath_revalidate_paths(struct nvme_ns *ns)

		for_each_node(node)
		rcu_assign_pointer(head->current_path[node], NULL);
		kblockd_schedule_work(&head->requeue_work);
		}

		static bool nvme_path_is_disabled(struct nvme_ns *ns)