Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: take chunk_sectors into account in bio_split_write_zeroes

Browse Source 
For zoned devices, write zeroes must be split at the zone boundary
which is represented as chunk_sectors.  For other uses like the
internally RAIDed NVMe devices it is probably at least useful.

Enhance get_max_io_size to know about write zeroes and use it in
bio_split_write_zeroes.  Also add a comment about the seemingly
nonsensical zero max_write_zeroes limit.

Fixes: 885fa13f65 ("block: implement splitting of REQ_OP_WRITE_ZEROES bios")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20241104062647.91160-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2024-11-04 07:26:29 +01:00 committed by Jens Axboe
parent 4cf58d9529
commit 60dc5ea6bc
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
block/blk-merge.c
View File

@ -171,17 +171,6 @@ struct bio *bio_split_discard(struct bio *bio, const struct queue_limits *lim,
return bio_submit_split(bio, split_sectors); return bio_submit_split(bio, split_sectors);
} }
struct bio *bio_split_write_zeroes(struct bio *bio,
const struct queue_limits *lim, unsigned *nsegs)
{
*nsegs = 0;
if (!lim->max_write_zeroes_sectors)
return bio;
if (bio_sectors(bio) <= lim->max_write_zeroes_sectors)
return bio;
return bio_submit_split(bio, lim->max_write_zeroes_sectors);
}
static inline unsigned int blk_boundary_sectors(const struct queue_limits *lim, static inline unsigned int blk_boundary_sectors(const struct queue_limits *lim,
bool is_atomic) bool is_atomic)
{ {
@ -216,7 +205,9 @@ static inline unsigned get_max_io_size(struct bio *bio,
* We ignore lim->max_sectors for atomic writes because it may less * We ignore lim->max_sectors for atomic writes because it may less
* than the actual bio size, which we cannot tolerate. * than the actual bio size, which we cannot tolerate.
*/ */
if (is_atomic) if (bio_op(bio) == REQ_OP_WRITE_ZEROES)
max_sectors = lim->max_write_zeroes_sectors;
else if (is_atomic)
max_sectors = lim->atomic_write_max_sectors; max_sectors = lim->atomic_write_max_sectors;
else else
max_sectors = lim->max_sectors; max_sectors = lim->max_sectors;
@ -403,6 +394,26 @@ struct bio *bio_split_zone_append(struct bio *bio,
return bio_submit_split(bio, split_sectors); return bio_submit_split(bio, split_sectors);
} }
struct bio *bio_split_write_zeroes(struct bio *bio,
const struct queue_limits *lim, unsigned *nsegs)
{
unsigned int max_sectors = get_max_io_size(bio, lim);
*nsegs = 0;
/*
* An unset limit should normally not happen, as bio submission is keyed
* off having a non-zero limit. But SCSI can clear the limit in the
* I/O completion handler, and we can race and see this. Splitting to a
* zero limit obviously doesn't make sense, so band-aid it here.
*/
if (!max_sectors)
return bio;
if (bio_sectors(bio) <= max_sectors)
return bio;
return bio_submit_split(bio, max_sectors);
}
/** /**
* bio_split_to_limits - split a bio to fit the queue limits * bio_split_to_limits - split a bio to fit the queue limits
* @bio: bio to be split * @bio: bio to be split