Commit 5dc92186 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.19/drivers-2022-05-22' of git://git.kernel.dk/linux-block 

Pull block driver updates from Jens Axboe:
 "Here are the driver updates queued up for 5.19. This contains:

   - NVMe pull requests via Christoph:
       - tighten the PCI presence check (Stefan Roese)
       - fix a potential NULL pointer dereference in an error path (Kyle
         Miller Smith)
       - fix interpretation of the DMRSL field (Tom Yan)
       - relax the data transfer alignment (Keith Busch)
       - verbose error logging improvements (Max Gurtovoy, Chaitanya
         Kulkarni)
       - misc cleanups (Chaitanya Kulkarni, Christoph)
       - set non-mdts limits in nvme_scan_work (Chaitanya Kulkarni)
       - add support for TP4084 - Time-to-Ready Enhancements (Christoph)

   - MD pull request via Song:
       - Improve annotation in raid5 code, by Logan Gunthorpe
       - Support MD_BROKEN flag in raid-1/5/10, by Mariusz Tkaczyk
       - Other small fixes/cleanups

   - null_blk series making the configfs side much saner (Damien)

   - Various minor drbd cleanups and fixes (Haowen, Uladzislau, Jiapeng,
     Arnd, Cai)

   - Avoid using the system workqueue (and hence flushing it) in rnbd
     (Jack)

   - Avoid using the system workqueue (and hence flushing it) in aoe
     (Tetsuo)

   - Series fixing discard_alignment issues in drivers (Christoph)

   - Small series fixing drivers poking at disk->part0 for openers
     information (Christoph)

   - Series fixing deadlocks in loop (Christoph, Tetsuo)

   - Remove loop.h and add SPDX headers (Christoph)

   - Various fixes and cleanups (Julia, Xie, Yu)"

* tag 'for-5.19/drivers-2022-05-22' of git://git.kernel.dk/linux-block: (72 commits)
  mtip32xx: fix typo in comment
  nvme: set non-mdts limits in nvme_scan_work
  nvme: add support for TP4084 - Time-to-Ready Enhancements
  nvme: split the enum used for various register constants
  nbd: Fix hung on disconnect request if socket is closed before
  nvme-fabrics: add a request timeout helper
  nvme-pci: harden drive presence detect in nvme_dev_disable()
  nvme-pci: fix a NULL pointer dereference in nvme_alloc_admin_tags
  nvme: mark internal passthru request RQF_QUIET
  nvme: remove unneeded include from constants file
  nvme: add missing status values to verbose logging
  nvme: set dma alignment to dword
  nvme: fix interpretation of DMRSL
  loop: remove most the top-of-file boilerplate comment from the UAPI header
  loop: remove most the top-of-file boilerplate comment
  loop: add a SPDX header
  loop: remove loop.h
  block: null_blk: Improve device creation with configfs
  block: null_blk: Cleanup messages
  block: null_blk: Cleanup device creation and deletion
  ...
parents 115cd471 537b9f2b

arch/um/drivers/ubd_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -799,7 +799,6 @@ static int ubd_open_dev(struct ubd *ubd_dev) 
	}

	if (ubd_dev->no_trim == 0) {

		ubd_dev->queue->limits.discard_granularity = SECTOR_SIZE;

		ubd_dev->queue->limits.discard_alignment = SECTOR_SIZE;

		blk_queue_max_discard_sectors(ubd_dev->queue, UBD_MAX_REQUEST);

		blk_queue_max_write_zeroes_sectors(ubd_dev->queue, UBD_MAX_REQUEST);

	}

block/bdev.c

+8 −8
Original line number Diff line number Diff line
@@ -673,17 +673,17 @@ static int blkdev_get_whole(struct block_device *bdev, fmode_t mode) 
		}

	}



	if (!bdev->bd_openers)

	if (!atomic_read(&bdev->bd_openers))

		set_init_blocksize(bdev);

	if (test_bit(GD_NEED_PART_SCAN, &disk->state))

		bdev_disk_changed(disk, false);

	bdev->bd_openers++;

	atomic_inc(&bdev->bd_openers);

	return 0;

}



static void blkdev_put_whole(struct block_device *bdev, fmode_t mode)

{

	if (!--bdev->bd_openers)

	if (atomic_dec_and_test(&bdev->bd_openers))

		blkdev_flush_mapping(bdev);

	if (bdev->bd_disk->fops->release)

		bdev->bd_disk->fops->release(bdev->bd_disk, mode);
@@ -694,7 +694,7 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode) 
	struct gendisk *disk = part->bd_disk;

	int ret;



	if (part->bd_openers)

	if (atomic_read(&part->bd_openers))

		goto done;



	ret = blkdev_get_whole(bdev_whole(part), mode);
@@ -708,7 +708,7 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode) 
	disk->open_partitions++;

	set_init_blocksize(part);

done:

	part->bd_openers++;

	atomic_inc(&part->bd_openers);

	return 0;



out_blkdev_put:
@@ -720,7 +720,7 @@ static void blkdev_put_part(struct block_device *part, fmode_t mode) 
{

	struct block_device *whole = bdev_whole(part);



	if (--part->bd_openers)

	if (!atomic_dec_and_test(&part->bd_openers))

		return;

	blkdev_flush_mapping(part);

	whole->bd_disk->open_partitions--;
@@ -899,7 +899,7 @@ void blkdev_put(struct block_device *bdev, fmode_t mode) 
	 * of the world and we want to avoid long (could be several minute)

	 * syncs while holding the mutex.

	 */

	if (bdev->bd_openers == 1)

	if (atomic_read(&bdev->bd_openers) == 1)

		sync_blockdev(bdev);



	mutex_lock(&disk->open_mutex);
@@ -1044,7 +1044,7 @@ void sync_bdevs(bool wait) 
		bdev = I_BDEV(inode);



		mutex_lock(&bdev->bd_disk->open_mutex);

		if (!bdev->bd_openers) {

		if (!atomic_read(&bdev->bd_openers)) {

			; /* skip */

		} else if (wait) {

			/*

block/partitions/core.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ int bdev_del_partition(struct gendisk *disk, int partno) 
		goto out_unlock;



	ret = -EBUSY;

	if (part->bd_openers)

	if (atomic_read(&part->bd_openers))

		goto out_unlock;



	delete_partition(part);

drivers/block/aoe/aoe.h

+2 −0
Original line number Diff line number Diff line
@@ -244,3 +244,5 @@ void aoenet_exit(void); 
void aoenet_xmit(struct sk_buff_head *);

int is_aoe_netif(struct net_device *ifp);

int set_aoe_iflist(const char __user *str, size_t size);



extern struct workqueue_struct *aoe_wq;

drivers/block/aoe/aoeblk.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ aoeblk_gdalloc(void *vp) 
err:

	spin_lock_irqsave(&d->lock, flags);

	d->flags &= ~DEVFL_GD_NOW;

	schedule_work(&d->work);

	queue_work(aoe_wq, &d->work);

	spin_unlock_irqrestore(&d->lock, flags);

}