Merge: block: fix adding folio to bio

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6649

JIRA: https://issues.redhat.com/browse/RHEL-79410
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=67144184
Upstream Status: v6.15.rc1
Tested: Guest can boot with 16GB huge pages and none disk cache mode

It's possible a folio's size exceeds 4GB. For example, 16GB huge page
is available when the base page size is 64KB. In this case, the offset
of a folio can't be held in a 'unsigned int' variable. Otherwise, it
causes warning in bio_add_folio_nofail() and IO failure because of
overflowing, and eventually leads to guest booting failure when the
disk cache mode is none.

Pick up upstream commit 26064d3 ("block: fix adding folio to bio")
to fix the issue.

Signed-off-by: Gavin Shan <[email protected]>

Approved-by: Ming Lei <[email protected]>
Approved-by: Jeff Moyer <[email protected]>
Approved-by: CKI KWF Bot <[email protected]>

Merged-by: Augusto Caringi <[email protected]>

Author: caringi

block/bio.c

@@ -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);
 }
 
 /**
@@ -1048,9 +1049,11 @@ void bio_add_folio_nofail(struct bio *bio, struct folio *folio, size_t len,
 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;
 }
 
 void __bio_release_pages(struct bio *bio, bool mark_dirty)