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

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

Pull block fixes from Jens Axboe:

 - NVMe pull request via Keith
     - Remove unused struct field (Nilay)
     - Fix fabrics keep-alive teardown order (Ming)

 - Write zeroes fixes (John)

* tag 'block-6.11-20240823' of git://git.kernel.dk/linux:
  nvme: Remove unused field
  nvme: move stopping keep-alive into nvme_uninit_ctrl()
  block: Drop NULL check in bdev_write_zeroes_sectors()
  block: Read max write zeroes once for __blkdev_issue_write_zeroes()
parents 489270f4 e6b09a17

block/blk-lib.c

+18 −7
Original line number Diff line number Diff line
@@ -111,13 +111,20 @@ static sector_t bio_write_zeroes_limit(struct block_device *bdev) 
		(UINT_MAX >> SECTOR_SHIFT) & ~bs_mask);

}



/*

 * There is no reliable way for the SCSI subsystem to determine whether a

 * device supports a WRITE SAME operation without actually performing a write

 * to media. As a result, write_zeroes is enabled by default and will be

 * disabled if a zeroing operation subsequently fails. This means that this

 * queue limit is likely to change at runtime.

 */

static void __blkdev_issue_write_zeroes(struct block_device *bdev,

		sector_t sector, sector_t nr_sects, gfp_t gfp_mask,

		struct bio **biop, unsigned flags)

		struct bio **biop, unsigned flags, sector_t limit)

{



	while (nr_sects) {

		unsigned int len = min_t(sector_t, nr_sects,

				bio_write_zeroes_limit(bdev));

		unsigned int len = min(nr_sects, limit);

		struct bio *bio;



		if ((flags & BLKDEV_ZERO_KILLABLE) &&
@@ -141,12 +148,14 @@ static void __blkdev_issue_write_zeroes(struct block_device *bdev, 
static int blkdev_issue_write_zeroes(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp, unsigned flags)

{

	sector_t limit = bio_write_zeroes_limit(bdev);

	struct bio *bio = NULL;

	struct blk_plug plug;

	int ret = 0;



	blk_start_plug(&plug);

	__blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp, &bio, flags);

	__blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp, &bio,

			flags, limit);

	if (bio) {

		if ((flags & BLKDEV_ZERO_KILLABLE) &&

		    fatal_signal_pending(current)) {
@@ -165,7 +174,7 @@ static int blkdev_issue_write_zeroes(struct block_device *bdev, sector_t sector, 
	 * on an I/O error, in which case we'll turn any error into

	 * "not supported" here.

	 */

	if (ret && !bdev_write_zeroes_sectors(bdev))

	if (ret && !limit)

		return -EOPNOTSUPP;

	return ret;

}
@@ -265,12 +274,14 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, 
		sector_t nr_sects, gfp_t gfp_mask, struct bio **biop,

		unsigned flags)

{

	sector_t limit = bio_write_zeroes_limit(bdev);



	if (bdev_read_only(bdev))

		return -EPERM;



	if (bdev_write_zeroes_sectors(bdev)) {

	if (limit) {

		__blkdev_issue_write_zeroes(bdev, sector, nr_sects,

				gfp_mask, biop, flags);

				gfp_mask, biop, flags, limit);

	} else {

		if (flags & BLKDEV_ZERO_NOFALLBACK)

			return -EOPNOTSUPP;

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -4612,7 +4612,6 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) 
{

	nvme_mpath_stop(ctrl);

	nvme_auth_stop(ctrl);

	nvme_stop_keep_alive(ctrl);

	nvme_stop_failfast_work(ctrl);

	flush_work(&ctrl->async_event_work);

	cancel_work_sync(&ctrl->fw_act_work);
@@ -4648,6 +4647,7 @@ EXPORT_SYMBOL_GPL(nvme_start_ctrl); 


void nvme_uninit_ctrl(struct nvme_ctrl *ctrl)

{

	nvme_stop_keep_alive(ctrl);

	nvme_hwmon_exit(ctrl);

	nvme_fault_inject_fini(&ctrl->fault_inject);

	dev_pm_qos_hide_latency_tolerance(ctrl->device);

drivers/nvme/host/nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ struct nvme_ctrl { 


	struct opal_dev *opal_dev;



	char name[12];

	u16 cntlid;



	u16 mtfa;

include/linux/blkdev.h

+1 −6
Original line number Diff line number Diff line
@@ -1296,12 +1296,7 @@ bdev_max_secure_erase_sectors(struct block_device *bdev) 


static inline unsigned int bdev_write_zeroes_sectors(struct block_device *bdev)

{

	struct request_queue *q = bdev_get_queue(bdev);



	if (q)

		return q->limits.max_write_zeroes_sectors;



	return 0;

	return bdev_get_queue(bdev)->limits.max_write_zeroes_sectors;

}



static inline bool bdev_nonrot(struct block_device *bdev)