| Message ID | 13a38aa3e4b99f11970f96a85ce0a71498ff0737.1626871138.git.naohiro.aota@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix argument type of bio_trim() | expand |
On Wed, Jul 21, 2021 at 09:43:34PM +0900, Naohiro Aota wrote: > When on SINGLE block group, btrfs_get_io_geometry() will return "the > size of the block group - the offset of the logical address within the > block group" as geom.len. Since we allow up to 8 GB zone size on zoned > btrfs, we can have up to 8 GB block group, so can have up to 8 GB > geom.len. With this setup, we easily hit the "ASSERT(geom.len <= > INT_MAX);". > > The ASSERT looks like to guard btrfs_bio_clone_partial() and bio_trim() > which both take "int" (now "unsigned int" with the previous patch). So to ^^^^^^^^^^^^ That is now u64, fixed in the case below too. > be precise the ASSERT should check if clone_len <= UINT_MAX. But > actually, clone_len is already capped by bio.bi_iter.bi_size which is > unsigned int. So the ASSERT is not necessary. > > Drop the ASSERT and properly compare submit_len and geom.len in u64. Then, > let the implicit casting to convert it to unsigned int. ^^^^^^^^^^^^ As it's fixing the 8GB zone case I'd like to put the series to -rc queue. There are the two block layer patches, reviewed by Christoph but I'll wait a bit for acks before sending it to Linus. Meanwhile I'll add it to for-next for testing. Thanks.
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8f60314c36c5..8cd1a4f0174a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8206,8 +8206,8 @@ static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap, u64 start_sector; int async_submit = 0; u64 submit_len; - int clone_offset = 0; - int clone_len; + u64 clone_offset = 0; + u64 clone_len; u64 logical; int ret; blk_status_t status; @@ -8255,9 +8255,9 @@ static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap, status = errno_to_blk_status(ret); goto out_err_em; } - ASSERT(geom.len <= INT_MAX); - clone_len = min_t(int, submit_len, geom.len); + clone_len = min(submit_len, geom.len); + ASSERT(clone_len <= UINT_MAX); /* * This will never fail as it's passing GPF_NOFS and
When on SINGLE block group, btrfs_get_io_geometry() will return "the size of the block group - the offset of the logical address within the block group" as geom.len. Since we allow up to 8 GB zone size on zoned btrfs, we can have up to 8 GB block group, so can have up to 8 GB geom.len. With this setup, we easily hit the "ASSERT(geom.len <= INT_MAX);". The ASSERT looks like to guard btrfs_bio_clone_partial() and bio_trim() which both take "int" (now "unsigned int" with the previous patch). So to be precise the ASSERT should check if clone_len <= UINT_MAX. But actually, clone_len is already capped by bio.bi_iter.bi_size which is unsigned int. So the ASSERT is not necessary. Drop the ASSERT and properly compare submit_len and geom.len in u64. Then, let the implicit casting to convert it to unsigned int. Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com> --- fs/btrfs/inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)