iomap: use largest_zero_folio() in iomap_dio_zero()
Subsystems (2)
PATCH 1/1 iomap: use largest_zero_folio() in iomap_dio_zero()
From: Pankaj Raghav <[email protected]>
iomap_dio_zero() uses a custom allocated memory of zeroes for padding zeroes. This was a temporary solution until there was a way to request a zero folio that was greater than the PAGE_SIZE.
Use largest_zero_folio() function instead of using the custom allocated memory of zeroes. There is no guarantee from largest_zero_folio() function that it will always return a PMD sized folio. Adapt the code so that it can also work if largest_zero_folio() returns a ZERO_PAGE.
--- fs/iomap/direct-io.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-)
fs/iomap/direct-io.c +15 -23
@@ -24,13 +24,6 @@#define IOMAP_DIO_WRITE (1U << 30)#define IOMAP_DIO_DIRTY (1U << 31) -/* -* Used for sub block zeroing in iomap_dio_zero() -*/ -#define IOMAP_ZERO_PAGE_SIZE (SZ_64K) -#define IOMAP_ZERO_PAGE_ORDER (get_order(IOMAP_ZERO_PAGE_SIZE)) -static struct page *zero_page; -struct iomap_dio {struct kiocb *iocb;const struct iomap_dio_ops *dops;
@@ -285,24 +278,35 @@ static int iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, {struct inode *inode =file_inode (dio->iocb->ki_filp);struct bio *bio; +struct folio *zero_folio =largest_zero_folio (); +int nr_vecs =max (1 ,i_blocksize (inode) /folio_size (zero_folio));if (!len)return 0 ; +/* -* Max block size supported is 64k +* This limit shall never be reached as most filesystems have a +* maximum blocksize of 64k. */ -if (WARN_ON_ONCE (len >IOMAP_ZERO_PAGE_SIZE )) +if (WARN_ON_ONCE (nr_vecs >BIO_MAX_VECS ))return -EINVAL ; - bio =iomap_dio_alloc_bio (iter, dio,1 ,REQ_OP_WRITE |REQ_SYNC |REQ_IDLE ); + bio =iomap_dio_alloc_bio (iter, dio, nr_vecs, +REQ_OP_WRITE |REQ_SYNC |REQ_IDLE );fscrypt_set_bio_crypt_ctx (bio, inode, pos >> inode->i_blkbits,GFP_KERNEL ); bio->bi_iter.bi_sector =iomap_sector (&iter->iomap, pos); bio->bi_private = dio; bio->bi_end_io = iomap_dio_bio_end_io; -__bio_add_page (bio, zero_page, len,0 ); +while (len >0 ) { +unsigned int io_len =min (len,folio_size (zero_folio)); + +bio_add_folio_nofail (bio, zero_folio, io_len,0 ); + len -= io_len; + }iomap_dio_submit_bio (iter, dio, bio, pos); +return 0 ; }
@@ -822,15 +826,3 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,return iomap_dio_complete (dio); }EXPORT_SYMBOL_GPL (iomap_dio_rw); - -static int __init iomap_dio_init (void ) -{ - zero_page =alloc_pages (GFP_KERNEL | __GFP_ZERO, -IOMAP_ZERO_PAGE_ORDER ); - -if (!zero_page) -return -ENOMEM ; - -return 0 ; -} -fs_initcall (iomap_dio_init);
base-commit: 931e46dcbc7e6035a90e9c4a27a84b660e083f0a
Signature · 1 line
2.50.1
Quoted 6 lines · Pankaj Raghav (Samsung)
From: Pankaj Raghav <[email protected]>
iomap_dio_zero()uses a custom allocated memory of zeroes for padding zeroes. This was a temporary solution until there was a way to request a zero folio that was greater than thePAGE_SIZE.
Quoted 6 lines
Use
largest_zero_folio()function instead of using the custom allocated memory of zeroes. There is no guarantee fromlargest_zero_folio()function that it will always return a PMD sized folio. Adapt the code so that it can also work iflargest_zero_folio()returns aZERO_PAGE.Signed-off-by Pankaj Raghav <[email protected]>
Seems fine to me, though I wonder if this oughn't go along with the rest of the largest_zero_folio changes?
--D
Quoted 84 lines
--- fs/iomap/direct-io.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-)fs/iomap/direct-io.c +15
-23@@ -24,13 +24,6 @@#define IOMAP_DIO_WRITE (1U << 30)#define IOMAP_DIO_DIRTY (1U << 31) -/* -* Used for sub block zeroing in iomap_dio_zero() -*/ -#define IOMAP_ZERO_PAGE_SIZE (SZ_64K) -#define IOMAP_ZERO_PAGE_ORDER (get_order(IOMAP_ZERO_PAGE_SIZE)) -static struct page *zero_page; -struct iomap_dio {struct kiocb *iocb;const struct iomap_dio_ops *dops;@@ -285,24 +278,35 @@ static int iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, {struct inode *inode =file_inode (dio->iocb->ki_filp);struct bio *bio; +struct folio *zero_folio =largest_zero_folio (); +int nr_vecs =max (1 ,i_blocksize (inode) /folio_size (zero_folio));if (!len)return 0 ; +/* -* Max block size supported is 64k +* This limit shall never be reached as most filesystems have a +* maximum blocksize of 64k. */ -if (WARN_ON_ONCE (len >IOMAP_ZERO_PAGE_SIZE )) +if (WARN_ON_ONCE (nr_vecs >BIO_MAX_VECS ))return -EINVAL ; - bio =iomap_dio_alloc_bio (iter, dio,1 ,REQ_OP_WRITE |REQ_SYNC |REQ_IDLE ); + bio =iomap_dio_alloc_bio (iter, dio, nr_vecs, +REQ_OP_WRITE |REQ_SYNC |REQ_IDLE );fscrypt_set_bio_crypt_ctx (bio, inode, pos >> inode->i_blkbits,GFP_KERNEL ); bio->bi_iter.bi_sector =iomap_sector (&iter->iomap, pos); bio->bi_private = dio; bio->bi_end_io = iomap_dio_bio_end_io; -__bio_add_page (bio, zero_page, len,0 ); +while (len >0 ) { +unsigned int io_len =min (len,folio_size (zero_folio)); + +bio_add_folio_nofail (bio, zero_folio, io_len,0 ); + len -= io_len; + }iomap_dio_submit_bio (iter, dio, bio, pos); +return 0 ; }@@ -822,15 +826,3 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,return iomap_dio_complete (dio); }EXPORT_SYMBOL_GPL (iomap_dio_rw); - -static int __init iomap_dio_init (void ) -{ - zero_page =alloc_pages (GFP_KERNEL | __GFP_ZERO, -IOMAP_ZERO_PAGE_ORDER ); - -if (!zero_page) -return -ENOMEM ; - -return 0 ; -} -fs_initcall (iomap_dio_init);base-commit:
931e46dcbc7e6035a90e9c4a27a84b660e083f0aSignature · 1 line
2.50.1
Quoted 12 lines · Darrick J. Wong
Quoted 11 lines · Pankaj Raghav (Samsung)
From: Pankaj Raghav <[email protected]>
iomap_dio_zero()uses a custom allocated memory of zeroes for padding zeroes. This was a temporary solution until there was a way to request a zero folio that was greater than thePAGE_SIZE.Use
largest_zero_folio()function instead of using the custom allocated memory of zeroes. There is no guarantee fromlargest_zero_folio()function that it will always return a PMD sized folio. Adapt the code so that it can also work iflargest_zero_folio()returns aZERO_PAGE.
Quoted 4 lines
Quoted 1 line
Signed-off-by Pankaj Raghav <[email protected]>Seems fine to me, though I wonder if this oughn't go along with the rest of the
largest_zero_foliochanges?
I included them in one of the early versions but later removed as we had to rework the implementation multiple times. I just wanted to reduce the scope of the series and send out changes that uses the API separately :).
Quoted 2 lines
Reviewed-by "Darrick J. Wong" <[email protected]>
Thanks!
Signature · 1 line
Pankaj Raghav
Quoted 10 lines · Pankaj Raghav (Samsung)
iomap_dio_zero()uses a custom allocated memory of zeroes for padding zeroes. This was a temporary solution until there was a way to request a zero folio that was greater than thePAGE_SIZE.Use
largest_zero_folio()function instead of using the custom allocated memory of zeroes. There is no guarantee fromlargest_zero_folio()function that it will always return a PMD sized folio. Adapt the code so that it can also work iflargest_zero_folio()returns aZERO_PAGE.[...]
Applied to the vfs-6.18.iomap branch of the vfs/vfs.git tree. Patches in the vfs-6.18.iomap branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.18.iomap
[1/1] iomap: use largest_zero_folio() in iomap_dio_zero()
https://git.kernel.org/vfs/vfs/c/5589673e8d8d
Quoted 10 lines · Christian Brauner
Quoted 9 lines · Pankaj Raghav (Samsung)
iomap_dio_zero()uses a custom allocated memory of zeroes for padding zeroes. This was a temporary solution until there was a way to request a zero folio that was greater than thePAGE_SIZE.Use
largest_zero_folio()function instead of using the custom allocated memory of zeroes. There is no guarantee fromlargest_zero_folio()function that it will always return a PMD sized folio. Adapt the code so that it can also work iflargest_zero_folio()returns aZERO_PAGE.
Quoted 4 lines
Quoted 1 line
[...]
Applied to the vfs-6.18.iomap branch of the vfs/vfs.git tree. Patches in the vfs-6.18.iomap branch should appear in linux-next soon.
Hmm, AFAIK largest_zero_folio just showed up in mm.git a few days ago. Wouldn't it be better to queue up this change there?
Em 18/08/2025 01:41, Christoph Hellwig escreveu:
Quoted 11 lines · Christian Brauner
Quoted 10 lines · Pankaj Raghav (Samsung)
Quoted 9 lines
iomap_dio_zero()uses a custom allocated memory of zeroes for padding zeroes. This was a temporary solution until there was a way to request a zero folio that was greater than thePAGE_SIZE.Use
largest_zero_folio()function instead of using the custom allocated memory of zeroes. There is no guarantee fromlargest_zero_folio()function that it will always return a PMD sized folio. Adapt the code so that it can also work iflargest_zero_folio()returns aZERO_PAGE.
Quoted 9 lines
Quoted 4 lines
Quoted 1 line
[...]
Applied to the vfs-6.18.iomap branch of the vfs/vfs.git tree. Patches in the vfs-6.18.iomap branch should appear in linux-next soon.
Hmm, AFAIK
largest_zero_foliojust showed up in mm.git a few days ago. Wouldn't it be better to queue up this change there?
Indeed, compiling vfs/vfs.all as of today fails with:
fs/iomap/direct-io.c:281:36: error: implicit declaration of function ‘largest_zero_folio’; did you mean ‘is_zero_folio’? [-Wimplicit-function-declaration]
Reverting "iomap: use largest_zero_folio() in iomap_dio_zero()" fixes the compilation.
Quoted 22 lines · André Almeida
Em 18/08/2025 01:41, Christoph Hellwig escreveu:
Quoted 11 lines · Christian Brauner
Quoted 10 lines · Pankaj Raghav (Samsung)
Quoted 9 lines
iomap_dio_zero()uses a custom allocated memory of zeroes for padding zeroes. This was a temporary solution until there was a way to request a zero folio that was greater than thePAGE_SIZE.Use
largest_zero_folio()function instead of using the custom allocated memory of zeroes. There is no guarantee fromlargest_zero_folio()function that it will always return a PMD sized folio. Adapt the code so that it can also work iflargest_zero_folio()returns aZERO_PAGE.Quoted 9 lines
Quoted 4 lines
Quoted 1 line
[...]
Applied to the vfs-6.18.iomap branch of the vfs/vfs.git tree. Patches in the vfs-6.18.iomap branch should appear in linux-next soon.
Hmm, AFAIK
largest_zero_foliojust showed up in mm.git a few days ago. Wouldn't it be better to queue up this change there?
Quoted 6 lines
Indeed, compiling vfs/vfs.all as of today fails with:
fs/iomap/direct-io.c:281:36: error: implicit declaration of function ‘largest_zero_folio’; did you mean ‘is_zero_folio’? [-Wimplicit- function-declaration]Reverting "iomap: use
largest_zero_folio()iniomap_dio_zero()" fixes the compilation.
I also got some reports from Stephen in linux-next. As Christoph suggested, maybe we drop the patches from Christian's tree and queue it up via Andrew's tree
--
Pankaj
Quoted 14 lines · On Mon, 18 Aug 2025 16:35:04 +0200 Pankaj Raghav <[email protected]> wrote:
Quoted 14 lines
Quoted 7 lines
Quoted 2 lines
Applied to the vfs-6.18.iomap branch of the vfs/vfs.git tree. Patches in the vfs-6.18.iomap branch should appear in linux-next soon.
Hmm, AFAIK
largest_zero_foliojust showed up in mm.git a few days ago. Wouldn't it be better to queue up this change there?Indeed, compiling vfs/vfs.all as of today fails with:
fs/iomap/direct-io.c:281:36: error: implicit declaration of function ‘largest_zero_folio’; did you mean ‘is_zero_folio’? [-Wimplicit- function-declaration]
Quoted 7 lines
Quoted 3 lines
Reverting "iomap: use
largest_zero_folio()iniomap_dio_zero()" fixes the compilation.I also got some reports from Stephen in linux-next. As Christoph suggested, maybe we drop the patches from Christian's tree and queue it up via Andrew's tree
Thanks, I added it to mm.git.
Christian Brauner
maintainerQuoted 20 lines · Andrew Morton
Quoted 18 lines · On Mon, 18 Aug 2025 16:35:04 +0200 Pankaj Raghav <[email protected]> wrote:
Quoted 17 lines
Quoted 7 lines
Quoted 2 lines
Applied to the vfs-6.18.iomap branch of the vfs/vfs.git tree. Patches in the vfs-6.18.iomap branch should appear in linux-next soon.
Hmm, AFAIK
largest_zero_foliojust showed up in mm.git a few days ago. Wouldn't it be better to queue up this change there?Indeed, compiling vfs/vfs.all as of today fails with:
fs/iomap/direct-io.c:281:36: error: implicit declaration of function ‘largest_zero_folio’; did you mean ‘is_zero_folio’? [-Wimplicit- function-declaration]Reverting "iomap: use
largest_zero_folio()iniomap_dio_zero()" fixes the compilation.
Quoted 5 lines
Quoted 3 lines
I also got some reports from Stephen in linux-next. As Christoph suggested, maybe we drop the patches from Christian's tree and queue it up via Andrew's tree
Thanks, I added it to mm.git.
Please ask before you move stuff around between trees. You've complained to me before about this before too. I haven't agreed to that at all.
There's a bunch more iomap work coming and this will most certainly not start going through mm trees. So if there's merge conflicts where we rely on a helper that's in mm-next the good thing would simply to provide a branch for us with that helper that we can base this off of.
Hi Christian,
I think this patch was dropped from both the trees due to some confusion.
Could you requeue this patch given that the base patches for largest_zero_folio() are already in linus's tree[1]?
It applies cleanly on the current master branch.
[1] https://github.com/torvalds/linux/commit/2d8bd8049e89efe42a5397de4effd899e8dd2249
--
Pankaj
Quoted 10 lines · Pankaj Raghav (Samsung)
iomap_dio_zero()uses a custom allocated memory of zeroes for padding zeroes. This was a temporary solution until there was a way to request a zero folio that was greater than thePAGE_SIZE.Use
largest_zero_folio()function instead of using the custom allocated memory of zeroes. There is no guarantee fromlargest_zero_folio()function that it will always return a PMD sized folio. Adapt the code so that it can also work iflargest_zero_folio()returns aZERO_PAGE.[...]
Applied to the vfs-6.19.misc branch of the vfs/vfs.git tree. Patches in the vfs-6.19.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.19.misc
[1/1] iomap: use largest_zero_folio() in iomap_dio_zero()
https://git.kernel.org/vfs/vfs/c/5a5809e3ac58