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

Merge tag 'for-6.10/dm-fixes' of... 

Merge tag 'for-6.10/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:

 - Fix DM discard regressions due to DM core switching over to using
   queue_limits_set() without DM core and targets first being updated to
   set (and stack) discard limits in terms of max_hw_discard_sectors and
   not max_discard_sectors

 - Fix stable@ DM integrity discard support to set device's
   discard_granularity limit to the device's logical block size

* tag 'for-6.10/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm: always manage discard support in terms of max_hw_discard_sectors
  dm-integrity: set discard_granularity to logical block size
parents 98f312bc 825d8bbd

drivers/md/dm-cache-target.c

+2 −3
Original line number Diff line number Diff line
@@ -3390,7 +3390,7 @@ static void set_discard_limits(struct cache *cache, struct queue_limits *limits) 


	if (!cache->features.discard_passdown) {

		/* No passdown is done so setting own virtual limits */

		limits->max_discard_sectors = min_t(sector_t, cache->discard_block_size * 1024,

		limits->max_hw_discard_sectors = min_t(sector_t, cache->discard_block_size * 1024,

						       cache->origin_sectors);

		limits->discard_granularity = cache->discard_block_size << SECTOR_SHIFT;

		return;
@@ -3400,7 +3400,6 @@ static void set_discard_limits(struct cache *cache, struct queue_limits *limits) 
	 * cache_iterate_devices() is stacking both origin and fast device limits

	 * but discards aren't passed to fast device, so inherit origin's limits.

	 */

	limits->max_discard_sectors = origin_limits->max_discard_sectors;

	limits->max_hw_discard_sectors = origin_limits->max_hw_discard_sectors;

	limits->discard_granularity = origin_limits->discard_granularity;

	limits->discard_alignment = origin_limits->discard_alignment;

drivers/md/dm-clone-target.c

+2 −2
Original line number Diff line number Diff line
@@ -2046,7 +2046,8 @@ static void set_discard_limits(struct clone *clone, struct queue_limits *limits) 
	if (!test_bit(DM_CLONE_DISCARD_PASSDOWN, &clone->flags)) {

		/* No passdown is done so we set our own virtual limits */

		limits->discard_granularity = clone->region_size << SECTOR_SHIFT;

		limits->max_discard_sectors = round_down(UINT_MAX >> SECTOR_SHIFT, clone->region_size);

		limits->max_hw_discard_sectors = round_down(UINT_MAX >> SECTOR_SHIFT,

							    clone->region_size);

		return;

	}
@@ -2055,7 +2056,6 @@ static void set_discard_limits(struct clone *clone, struct queue_limits *limits) 
	 * device limits but discards aren't passed to the source device, so

	 * inherit destination's limits.

	 */

	limits->max_discard_sectors = dest_limits->max_discard_sectors;

	limits->max_hw_discard_sectors = dest_limits->max_hw_discard_sectors;

	limits->discard_granularity = dest_limits->discard_granularity;

	limits->discard_alignment = dest_limits->discard_alignment;

drivers/md/dm-integrity.c

+1 −0
Original line number Diff line number Diff line
@@ -3492,6 +3492,7 @@ static void dm_integrity_io_hints(struct dm_target *ti, struct queue_limits *lim 
		limits->physical_block_size = ic->sectors_per_block << SECTOR_SHIFT;

		blk_limits_io_min(limits, ic->sectors_per_block << SECTOR_SHIFT);

		limits->dma_alignment = limits->logical_block_size - 1;

		limits->discard_granularity = ic->sectors_per_block << SECTOR_SHIFT;

	}

	limits->max_integrity_segments = USHRT_MAX;

}

drivers/md/dm-log-writes.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static void log_writes_io_hints(struct dm_target *ti, struct queue_limits *limit 
	if (!bdev_max_discard_sectors(lc->dev->bdev)) {

		lc->device_supports_discard = false;

		limits->discard_granularity = lc->sectorsize;

		limits->max_discard_sectors = (UINT_MAX >> SECTOR_SHIFT);

		limits->max_hw_discard_sectors = (UINT_MAX >> SECTOR_SHIFT);

	}

	limits->logical_block_size = bdev_logical_block_size(lc->dev->bdev);

	limits->physical_block_size = bdev_physical_block_size(lc->dev->bdev);

drivers/md/dm-snap.c

+1 −1
Original line number Diff line number Diff line
@@ -2410,7 +2410,7 @@ static void snapshot_io_hints(struct dm_target *ti, struct queue_limits *limits) 


		/* All discards are split on chunk_size boundary */

		limits->discard_granularity = snap->store->chunk_size;

		limits->max_discard_sectors = snap->store->chunk_size;

		limits->max_hw_discard_sectors = snap->store->chunk_size;



		up_read(&_origins_lock);

	}