Commit 26064d3e authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: fix adding folio to bio 



>4GB folio is possible on some ARCHs, such as aarch64, 16GB hugepage
is supported, then 'offset' of folio can't be held in 'unsigned int',
cause warning in bio_add_folio_nofail() and IO failure.

Fix it by adjusting 'page' & trimming 'offset' so that `->bi_offset` won't
be overflow, and folio can be added to bio successfully.

Fixes: ed9832bc ("block: introduce folio awareness and add a bigger size from folio")
Cc: Kundan Kumar <kundan.kumar@samsung.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Gavin Shan <gshan@redhat.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20250312145136.2891229-1-ming.lei@redhat.com


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

block/bio.c

+7 −4
Original line number Diff line number Diff line
@@ -1026,9 +1026,10 @@ EXPORT_SYMBOL(bio_add_page); 
void bio_add_folio_nofail(struct bio *bio, struct folio *folio, size_t len,

			  size_t off)

{

	unsigned long nr = off / PAGE_SIZE;



	WARN_ON_ONCE(len > UINT_MAX);

	WARN_ON_ONCE(off > UINT_MAX);

	__bio_add_page(bio, &folio->page, len, off);

	__bio_add_page(bio, folio_page(folio, nr), len, off % PAGE_SIZE);

}

EXPORT_SYMBOL_GPL(bio_add_folio_nofail);
@@ -1049,9 +1050,11 @@ EXPORT_SYMBOL_GPL(bio_add_folio_nofail); 
bool bio_add_folio(struct bio *bio, struct folio *folio, size_t len,

		   size_t off)

{

	if (len > UINT_MAX || off > UINT_MAX)

	unsigned long nr = off / PAGE_SIZE;



	if (len > UINT_MAX)

		return false;

	return bio_add_page(bio, &folio->page, len, off) > 0;

	return bio_add_page(bio, folio_page(folio, nr), len, off % PAGE_SIZE) > 0;

}

EXPORT_SYMBOL(bio_add_folio);