superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Add a public bdev_zone_is_seq() helper 

Turn the private disk_zone_is_conv() function in blk-zoned.c into a
public and documented bdev_zone_is_seq() helper with the inverse
polarity of the original function, also adding a check for non-zoned
devices so that all file systems can use the helper, even with a regular
block device.

Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20241107064300.227731-3-dlemoal@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1083/head
Damien Le Moal 2024-11-07 15:43:00 +09:00 committed by Jens Axboe
parent d7cb6d7414
commit f3d9bf0514
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/blk-zoned.c
View File

@ -348,19 +348,6 @@ fail:
return ret; return ret;
} }
static inline bool disk_zone_is_conv(struct gendisk *disk, sector_t sector)
{
unsigned long *bitmap;
bool is_conv;
rcu_read_lock();
bitmap = rcu_dereference(disk->conv_zones_bitmap);
is_conv = bitmap && test_bit(disk_zone_no(disk, sector), bitmap);
rcu_read_unlock();
return is_conv;
}
static bool disk_zone_is_last(struct gendisk *disk, struct blk_zone *zone) static bool disk_zone_is_last(struct gendisk *disk, struct blk_zone *zone)
{ {
return zone->start + zone->len >= get_capacity(disk); return zone->start + zone->len >= get_capacity(disk);
@ -715,7 +702,7 @@ static bool blk_zone_wplug_handle_reset_or_finish(struct bio *bio,
struct blk_zone_wplug *zwplug; struct blk_zone_wplug *zwplug;
/* Conventional zones cannot be reset nor finished. */ /* Conventional zones cannot be reset nor finished. */
if (disk_zone_is_conv(disk, sector)) { if (!bdev_zone_is_seq(bio->bi_bdev, sector)) {
bio_io_error(bio); bio_io_error(bio);
return true; return true;
} }
@ -969,7 +956,7 @@ static bool blk_zone_wplug_handle_write(struct bio *bio, unsigned int nr_segs)
} }
/* Conventional zones do not need write plugging. */ /* Conventional zones do not need write plugging. */
if (disk_zone_is_conv(disk, sector)) { if (!bdev_zone_is_seq(bio->bi_bdev, sector)) {
/* Zone append to conventional zones is not allowed. */ /* Zone append to conventional zones is not allowed. */
if (bio_op(bio) == REQ_OP_ZONE_APPEND) { if (bio_op(bio) == REQ_OP_ZONE_APPEND) {
bio_io_error(bio); bio_io_error(bio);

27
include/linux/blkdev.h
View File

@ -1395,6 +1395,33 @@ static inline bool bdev_is_zone_start(struct block_device *bdev,
return bdev_offset_from_zone_start(bdev, sector) == 0; return bdev_offset_from_zone_start(bdev, sector) == 0;
} }
/**
* bdev_zone_is_seq - check if a sector belongs to a sequential write zone
* @bdev: block device to check
* @sector: sector number
*
* Check if @sector on @bdev is contained in a sequential write required zone.
*/
static inline bool bdev_zone_is_seq(struct block_device *bdev, sector_t sector)
{
bool is_seq = false;
#if IS_ENABLED(CONFIG_BLK_DEV_ZONED)
if (bdev_is_zoned(bdev)) {
struct gendisk *disk = bdev->bd_disk;
unsigned long *bitmap;
rcu_read_lock();
bitmap = rcu_dereference(disk->conv_zones_bitmap);
is_seq = !bitmap ||
!test_bit(disk_zone_no(disk, sector), bitmap);
rcu_read_unlock();
}
#endif
return is_seq;
}
static inline int queue_dma_alignment(const struct request_queue *q) static inline int queue_dma_alignment(const struct request_queue *q)
{ {
return q->limits.dma_alignment; return q->limits.dma_alignment;