Commit 7b47ef52 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: add a bdev_discard_granularity helper 



Abstract away implementation details from file systems by providing a
block_device based helper to retrieve the discard granularity.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Acked-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com> [drbd]
Acked-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Acked-by: David Sterba <dsterba@suse.com> [btrfs]
Link: https://lore.kernel.org/r/20220415045258.199825-26-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 70200574

block/blk-lib.c

+2 −3
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 


static sector_t bio_discard_limit(struct block_device *bdev, sector_t sector)

{

	unsigned int discard_granularity =

		bdev_get_queue(bdev)->limits.discard_granularity;

	unsigned int discard_granularity = bdev_discard_granularity(bdev);

	sector_t granularity_aligned_sector;



	if (bdev_is_partition(bdev))
@@ -59,7 +58,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
	}



	/* In case the discard granularity isn't set by buggy device driver */

	if (WARN_ON_ONCE(!q->limits.discard_granularity)) {

	if (WARN_ON_ONCE(!bdev_discard_granularity(bdev))) {

		char dev_name[BDEVNAME_SIZE];



		bdevname(bdev, dev_name);

drivers/block/drbd/drbd_nl.c

+5 −4
Original line number Diff line number Diff line
@@ -1425,7 +1425,6 @@ static void sanitize_disk_conf(struct drbd_device *device, struct disk_conf *dis 
			       struct drbd_backing_dev *nbc)

{

	struct block_device *bdev = nbc->backing_bdev;

	struct request_queue *q = bdev->bd_disk->queue;



	if (disk_conf->al_extents < DRBD_AL_EXTENTS_MIN)

		disk_conf->al_extents = DRBD_AL_EXTENTS_MIN;
@@ -1442,12 +1441,14 @@ static void sanitize_disk_conf(struct drbd_device *device, struct disk_conf *dis 
	if (disk_conf->rs_discard_granularity) {

		int orig_value = disk_conf->rs_discard_granularity;

		sector_t discard_size = bdev_max_discard_sectors(bdev) << 9;

		unsigned int discard_granularity = bdev_discard_granularity(bdev);

		int remainder;



		if (q->limits.discard_granularity > disk_conf->rs_discard_granularity)

			disk_conf->rs_discard_granularity = q->limits.discard_granularity;

		if (discard_granularity > disk_conf->rs_discard_granularity)

			disk_conf->rs_discard_granularity = discard_granularity;



		remainder = disk_conf->rs_discard_granularity % q->limits.discard_granularity;

		remainder = disk_conf->rs_discard_granularity %

				discard_granularity;

		disk_conf->rs_discard_granularity += remainder;



		if (disk_conf->rs_discard_granularity > discard_size)

drivers/block/drbd/drbd_receiver.c

+1 −2
Original line number Diff line number Diff line
@@ -1511,7 +1511,6 @@ void drbd_bump_write_ordering(struct drbd_resource *resource, struct drbd_backin 
int drbd_issue_discard_or_zero_out(struct drbd_device *device, sector_t start, unsigned int nr_sectors, int flags)

{

	struct block_device *bdev = device->ldev->backing_bdev;

	struct request_queue *q = bdev_get_queue(bdev);

	sector_t tmp, nr;

	unsigned int max_discard_sectors, granularity;

	int alignment;
@@ -1521,7 +1520,7 @@ int drbd_issue_discard_or_zero_out(struct drbd_device *device, sector_t start, u 
		goto zero_out;



	/* Zero-sector (unknown) and one-sector granularities are the same.  */

	granularity = max(q->limits.discard_granularity >> 9, 1U);

	granularity = max(bdev_discard_granularity(bdev) >> 9, 1U);

	alignment = (bdev_discard_alignment(bdev) >> 9) % granularity;



	max_discard_sectors = min(bdev_max_discard_sectors(bdev), (1U << 22));

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static void loop_config_discard(struct loop_device *lo) 
		struct request_queue *backingq = bdev_get_queue(I_BDEV(inode));



		max_discard_sectors = backingq->limits.max_write_zeroes_sectors;

		granularity = backingq->limits.discard_granularity ?:

		granularity = bdev_discard_granularity(I_BDEV(inode)) ?:

			queue_physical_block_size(backingq);



	/*

drivers/target/target_core_device.c

+1 −2
Original line number Diff line number Diff line
@@ -835,7 +835,6 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) 
bool target_configure_unmap_from_queue(struct se_dev_attrib *attrib,

				       struct block_device *bdev)

{

	struct request_queue *q = bdev_get_queue(bdev);

	int block_size = bdev_logical_block_size(bdev);



	if (!bdev_max_discard_sectors(bdev))
@@ -847,7 +846,7 @@ bool target_configure_unmap_from_queue(struct se_dev_attrib *attrib, 
	 * Currently hardcoded to 1 in Linux/SCSI code..

	 */

	attrib->max_unmap_block_desc_count = 1;

	attrib->unmap_granularity = q->limits.discard_granularity / block_size;

	attrib->unmap_granularity = bdev_discard_granularity(bdev) / block_size;

	attrib->unmap_granularity_alignment =

		bdev_discard_alignment(bdev) / block_size;

	return true;