mm/filemap: Align last_index to folio size
Subsystems (3)
PATCH 1/1 mm/filemap: Align last_index to folio size
From: Youling Tang <[email protected]>
On XFS systems with pagesize=4K, blocksize=16K, and CONFIG_TRANSPARENT_HUGEPAGE enabled, We observed the following readahead behaviors:
# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=64k count=1 # ./tools/mm/page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 f 136bbb __RU_l__________T_____t_________________F_1 <-- first read 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]
# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136048 __RU_l_________H______t_________________F_1 ... c 110a40 __RU_l_________H______t_________________F_1 d 110a41 __RU_l__________T_____t_________________F_1 e 110a42 __RU_l__________T_____t_________________F_1 <-- first read f 110a43 __RU_l__________T_____t_________________F_1 <-- first readahead flag 10 13e7a8 ___U_l_________H______t_________________F_1 ... 20 137a00 ___U_l_________H______t_______P______I__F_1 <-- second readahead flag (20 - 2f) 21 137a01 ___U_l__________T_____t_______P______I__F_1 ... 3f 10d4af ___U_l__________T_____t_______P_________F_1 [first readahead: ra_size = 32, req_count = 15, async_size = 17]
When reading 64k data (same for 61-63k range, where last_index is page-aligned in filemap_get_pages()), 128k readahead is triggered via page_cache_sync_ra() and the PG_readahead flag is set on the next folio (the one containing 0x10 page).
When reading 60k data, 128k readahead is also triggered via page_cache_sync_ra(). However, in this case the readahead flag is set on the 0xf page. Although the requested read size (req_count) is 60k, the actual read will be aligned to folio size (64k), which triggers the readahead flag and initiates asynchronous readahead via page_cache_async_ra(). This results in two readahead operations totaling 256k.
The root cause is that when the requested size is smaller than the actual read size (due to folio alignment), it triggers asynchronous readahead. By changing last_index alignment from page size to folio size, we ensure the requested size matches the actual read size, preventing the case where a single read operation triggers two readahead operations.
After applying the patch:
# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 <-- first read f 136bbb __RU_l__________T_____t_________________F_1 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]
The same phenomenon will occur when reading from 49k to 64k. Set the readahead flag to the next folio.
Because the minimum order of folio in address_space equals the block size (at least in xfs and bcachefs that already support bs > ps), having request_count aligned to block size will not cause overread.
--- include/linux/pagemap.h | 6 ++++++ mm/filemap.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)
include/linux/pagemap.h +6 -0
@@ -480,6 +480,12 @@ mapping_min_folio_nrpages(struct address_space *mapping)return 1UL <<mapping_min_folio_order (mapping); } +static inline unsigned long +mapping_min_folio_nrbytes (struct address_space *mapping) +{ +return mapping_min_folio_nrpages (mapping) <<PAGE_SHIFT ; +} +/** * mapping_align_index() - Align index for this mapping. * @mapping: The address_space.
mm/filemap.c +3 -2
@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); + last_index >>=PAGE_SHIFT ; retry:if (fatal_signal_pending (current))return -EINTR ;
Signature · 1 line
2.34.1
CCing Ryan, who recently fiddled with readahead.
Quoted 136 lines · Youling Tang
From: Youling Tang <[email protected]>
On XFS systems with pagesize=4K, blocksize=16K, and
CONFIG_TRANSPARENT_HUGEPAGEenabled, We observed the following readahead behaviors:# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=64k count=1 # ./tools/mm/page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 f 136bbb __RU_l__________T_____t_________________F_1 <-- first read 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136048 __RU_l_________H______t_________________F_1 ... c 110a40 __RU_l_________H______t_________________F_1 d 110a41 __RU_l__________T_____t_________________F_1 e 110a42 __RU_l__________T_____t_________________F_1 <-- first read f 110a43 __RU_l__________T_____t_________________F_1 <-- first readahead flag 10 13e7a8 ___U_l_________H______t_________________F_1 ... 20 137a00 ___U_l_________H______t_______P______I__F_1 <-- second readahead flag (20 - 2f) 21 137a01 ___U_l__________T_____t_______P______I__F_1 ... 3f 10d4af ___U_l__________T_____t_______P_________F_1 [first readahead: ra_size = 32, req_count = 15, async_size = 17]When reading 64k data (same for 61-63k range, where
last_indexis page-aligned infilemap_get_pages()), 128k readahead is triggered viapage_cache_sync_ra()and thePG_readaheadflag is set on the next folio (the one containing0x10page).When reading 60k data, 128k readahead is also triggered via
page_cache_sync_ra(). However, in this case the readahead flag is set on the0xfpage. Although the requested read size (req_count) is 60k, the actual read will be aligned to folio size (64k), which triggers the readahead flag and initiates asynchronous readahead viapage_cache_async_ra(). This results in two readahead operations totaling 256k.The root cause is that when the requested size is smaller than the actual read size (due to folio alignment), it triggers asynchronous readahead. By changing
last_indexalignment from page size to folio size, we ensure the requested size matches the actual read size, preventing the case where a single read operation triggers two readahead operations.After applying the patch:
# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 <-- first read f 136bbb __RU_l__________T_____t_________________F_1 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]The same phenomenon will occur when reading from 49k to 64k. Set the readahead flag to the next folio.
Because the minimum order of folio in
address_spaceequals the block size (at least in xfs and bcachefs that already support bs > ps), havingrequest_countaligned to block size will not cause overread.Co-developed-by Chi Zhiling <[email protected]>Signed-off-by Chi Zhiling <[email protected]>Signed-off-by Youling Tang <[email protected]>--- include/linux/pagemap.h | 6 ++++++ mm/filemap.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)include/linux/pagemap.h +6
-0@@ -480,6 +480,12 @@ mapping_min_folio_nrpages(struct address_space *mapping)return 1UL <<mapping_min_folio_order (mapping); } +static inline unsigned long +mapping_min_folio_nrbytes (struct address_space *mapping) +{ +return mapping_min_folio_nrpages (mapping) <<PAGE_SHIFT ; +} +/** * mapping_align_index() - Align index for this mapping. * @mapping: The address_space. mm/filemap.c +3
-2@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); + last_index >>=PAGE_SHIFT ; retry:if (fatal_signal_pending (current))return -EINTR ;
Signature · 3 lines
Cheers, David / dhildenb
Ryan Roberts
Reviewed-byQuoted 70 lines · David Hildenbrand
CCing Ryan, who recently fiddled with readahead.
Quoted 66 lines · Youling Tang
From: Youling Tang <[email protected]>
On XFS systems with pagesize=4K, blocksize=16K, and
CONFIG_TRANSPARENT_HUGEPAGEenabled, We observed the following readahead behaviors:# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=64k count=1 # ./tools/mm/page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 f 136bbb __RU_l__________T_____t_________________F_1 <-- first read 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136048 __RU_l_________H______t_________________F_1 ... c 110a40 __RU_l_________H______t_________________F_1 d 110a41 __RU_l__________T_____t_________________F_1 e 110a42 __RU_l__________T_____t_________________F_1 <-- first read f 110a43 __RU_l__________T_____t_________________F_1 <-- first readahead flag 10 13e7a8 ___U_l_________H______t_________________F_1 ... 20 137a00 ___U_l_________H______t_______P______I__F_1 <-- second readahead flag (20 - 2f) 21 137a01 ___U_l__________T_____t_______P______I__F_1 ... 3f 10d4af ___U_l__________T_____t_______P_________F_1 [first readahead: ra_size = 32, req_count = 15, async_size = 17]When reading 64k data (same for 61-63k range, where
last_indexis page-aligned infilemap_get_pages()), 128k readahead is triggered viapage_cache_sync_ra()and thePG_readaheadflag is set on the next folio (the one containing0x10page).When reading 60k data, 128k readahead is also triggered via
page_cache_sync_ra(). However, in this case the readahead flag is set on the0xfpage. Although the requested read size (req_count) is 60k, the actual read will be aligned to folio size (64k), which triggers the readahead flag and initiates asynchronous readahead viapage_cache_async_ra(). This results in two readahead operations totaling 256k.The root cause is that when the requested size is smaller than the actual read size (due to folio alignment), it triggers asynchronous readahead. By changing
last_indexalignment from page size to folio size, we ensure the requested size matches the actual read size, preventing the case where a single read operation triggers two readahead operations.
I recently fiddled with mmap readahead paths, doing similar-ish things. I haven't looked at the non-mmap paths so don't consider myself expert here. But what you are saying makes sense and superficially the solution looks good to me, so:
with one nit below...
Quoted 61 lines
Quoted 61 lines
After applying the patch:
# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 <-- first read f 136bbb __RU_l__________T_____t_________________F_1 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]The same phenomenon will occur when reading from 49k to 64k. Set the readahead flag to the next folio.
Because the minimum order of folio in
address_spaceequals the block size (at least in xfs and bcachefs that already support bs > ps), havingrequest_countaligned to block size will not cause overread.Co-developed-by Chi Zhiling <[email protected]>Signed-off-by Chi Zhiling <[email protected]>Signed-off-by Youling Tang <[email protected]>---
include/linux/pagemap.h| 6 ++++++
mm/filemap.c | 5 +++--2 files changed, 9 insertions(+), 2 deletions(-)include/linux/pagemap.h +0
-0@@ -480,6 +480,12 @@ mapping_min_folio_nrpages(struct address_space *mapping) return 1UL << mapping_min_folio_order(mapping); }+static inline unsigned long
include/linux/pagemap.h +5
-0+mapping_min_folio_nrbytes(struct address_space *mapping) +{ + return mapping_min_folio_nrpages(mapping) << PAGE_SHIFT; +} +/**
*mapping_align_index()- Align index for this mapping.
* @mapping: Theaddress_space.mm/filemap.c +0
-1--- a/mm/filemap.c
Quoted 8 lines
Quoted 8 lines
+++
b/mm/filemap.cmm/filemap.c +0
-0@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count, unsigned int flags; int err = 0;- /* "
last_index" is the index of the page beyond the end of the read */ -last_index=DIV_ROUND_UP(iocb->ki_pos + count, PAGE_SIZE); + /* "last_index" is the index of the folio beyond the end of the read */
pedantic nit: I think you actually mean "the index of the first page within the first minimum-sized folio beyond the end of the read"?
Thanks,
Ryan
Quoted 8 lines
Quoted 6 lines
+
last_index= round_up(iocb->ki_pos + count,mapping_min_folio_nrbytes(mapping));
+last_index>>=PAGE_SHIFT;
retry:
if (fatal_signal_pending(current))
return-EINTR;
Jan Kara
maintainerQuoted 91 lines · Youling Tang
From: Youling Tang <[email protected]>
On XFS systems with pagesize=4K, blocksize=16K, and
CONFIG_TRANSPARENT_HUGEPAGEenabled, We observed the following readahead behaviors:# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=64k count=1 # ./tools/mm/page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 f 136bbb __RU_l__________T_____t_________________F_1 <-- first read 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136048 __RU_l_________H______t_________________F_1 ... c 110a40 __RU_l_________H______t_________________F_1 d 110a41 __RU_l__________T_____t_________________F_1 e 110a42 __RU_l__________T_____t_________________F_1 <-- first read f 110a43 __RU_l__________T_____t_________________F_1 <-- first readahead flag 10 13e7a8 ___U_l_________H______t_________________F_1 ... 20 137a00 ___U_l_________H______t_______P______I__F_1 <-- second readahead flag (20 - 2f) 21 137a01 ___U_l__________T_____t_______P______I__F_1 ... 3f 10d4af ___U_l__________T_____t_______P_________F_1 [first readahead: ra_size = 32, req_count = 15, async_size = 17]When reading 64k data (same for 61-63k range, where
last_indexis page-aligned infilemap_get_pages()), 128k readahead is triggered viapage_cache_sync_ra()and thePG_readaheadflag is set on the next folio (the one containing0x10page).When reading 60k data, 128k readahead is also triggered via
page_cache_sync_ra(). However, in this case the readahead flag is set on the0xfpage. Although the requested read size (req_count) is 60k, the actual read will be aligned to folio size (64k), which triggers the readahead flag and initiates asynchronous readahead viapage_cache_async_ra(). This results in two readahead operations totaling 256k.The root cause is that when the requested size is smaller than the actual read size (due to folio alignment), it triggers asynchronous readahead. By changing
last_indexalignment from page size to folio size, we ensure the requested size matches the actual read size, preventing the case where a single read operation triggers two readahead operations.After applying the patch:
# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 <-- first read f 136bbb __RU_l__________T_____t_________________F_1 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]The same phenomenon will occur when reading from 49k to 64k. Set the readahead flag to the next folio.
Quoted 7 lines
Because the minimum order of folio in
address_spaceequals the block size (at least in xfs and bcachefs that already support bs > ps), havingrequest_countaligned to block size will not cause overread.Co-developed-by Chi Zhiling <[email protected]>Signed-off-by Chi Zhiling <[email protected]>Signed-off-by Youling Tang <[email protected]>
I agree with analysis of the problem but not quite with the solution. See below.
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2589
Quoted 13 lines
mm/filemap.c +3
-2@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); + last_index >>=PAGE_SHIFT ;
I think that filemap_get_pages() shouldn't be really trying to guess what readahead code needs and round last_index based on min folio order. After all the situation isn't special for LBS filesystems. It can also happen that the readahead mark ends up in the middle of large folio for other reasons. In fact, we already do have code in page_cache_ra_order() -> ra_alloc_folio() that handles rounding of index where mark should be placed so your changes essentially try to outsmart that code which is not good. I think the solution should really be placed in page_cache_ra_order() + ra_alloc_folio() instead.
In fact the problem you are trying to solve was kind of introduced (or at least made more visible) by my commit ab4443fe3ca62 ("readahead: avoid multiple marked readahead pages"). There I've changed the code to round the index down because I've convinced myself it doesn't matter and rounding down is easier to handle in that place. But your example shows there are cases where rounding down has weird consequences and rounding up would have been better. So I think we need to come up with a method how to round up the index of marked folio to fix your case without reintroducing problems mentioned in commit ab4443fe3ca62.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Hi, Jan
Quoted 125 lines · Jan Kara
Quoted 91 lines · Youling Tang
From: Youling Tang <[email protected]>
On XFS systems with pagesize=4K, blocksize=16K, and
CONFIG_TRANSPARENT_HUGEPAGEenabled, We observed the following readahead behaviors:# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=64k count=1 # ./tools/mm/page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 f 136bbb __RU_l__________T_____t_________________F_1 <-- first read 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136048 __RU_l_________H______t_________________F_1 ... c 110a40 __RU_l_________H______t_________________F_1 d 110a41 __RU_l__________T_____t_________________F_1 e 110a42 __RU_l__________T_____t_________________F_1 <-- first read f 110a43 __RU_l__________T_____t_________________F_1 <-- first readahead flag 10 13e7a8 ___U_l_________H______t_________________F_1 ... 20 137a00 ___U_l_________H______t_______P______I__F_1 <-- second readahead flag (20 - 2f) 21 137a01 ___U_l__________T_____t_______P______I__F_1 ... 3f 10d4af ___U_l__________T_____t_______P_________F_1 [first readahead: ra_size = 32, req_count = 15, async_size = 17]When reading 64k data (same for 61-63k range, where
last_indexis page-aligned infilemap_get_pages()), 128k readahead is triggered viapage_cache_sync_ra()and thePG_readaheadflag is set on the next folio (the one containing0x10page).When reading 60k data, 128k readahead is also triggered via
page_cache_sync_ra(). However, in this case the readahead flag is set on the0xfpage. Although the requested read size (req_count) is 60k, the actual read will be aligned to folio size (64k), which triggers the readahead flag and initiates asynchronous readahead viapage_cache_async_ra(). This results in two readahead operations totaling 256k.The root cause is that when the requested size is smaller than the actual read size (due to folio alignment), it triggers asynchronous readahead. By changing
last_indexalignment from page size to folio size, we ensure the requested size matches the actual read size, preventing the case where a single read operation triggers two readahead operations.After applying the patch:
# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 <-- first read f 136bbb __RU_l__________T_____t_________________F_1 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]The same phenomenon will occur when reading from 49k to 64k. Set the readahead flag to the next folio.
Quoted 7 lines
Because the minimum order of folio in
address_spaceequals the block size (at least in xfs and bcachefs that already support bs > ps), havingrequest_countaligned to block size will not cause overread.Co-developed-by Chi Zhiling <[email protected]>Signed-off-by Chi Zhiling <[email protected]>Signed-off-by Youling Tang <[email protected]>I agree with analysis of the problem but not quite with the solution. See below.
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2589
Quoted 13 lines
mm/filemap.c +3
-2@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); + last_index >>=PAGE_SHIFT ;I think that
filemap_get_pages()shouldn't be really trying to guess what readahead code needs and roundlast_indexbased on min folio order. After all the situation isn't special for LBS filesystems. It can also happen that the readahead mark ends up in the middle of large folio for other reasons. In fact, we already do have code inpage_cache_ra_order()->ra_alloc_folio()that handles rounding of index where mark should be placed so your changes essentially try to outsmart that code which is not good. I think the solution should really be placed inpage_cache_ra_order()+ra_alloc_folio()instead.
Quoted 9 lines
In fact the problem you are trying to solve was kind of introduced (or at least made more visible) by my commit
ab4443fe3ca62("readahead: avoid multiple marked readahead pages"). There I've changed the code to round the index down because I've convinced myself it doesn't matter and rounding down is easier to handle in that place. But your example shows there are cases where rounding down has weird consequences and rounding up would have been better. So I think we need to come up with a method how to round up the index of marked folio to fix your case without reintroducing problems mentioned in commitab4443fe3ca62.
Yes, I simply replaced round_up() in ra_alloc_folio() with round_down() to avoid this phenomenon before submitting this patch.
But at present, I haven't found a suitable way to solve both of these problems simultaneously. Do you have a better solution on your side?
Thanks,
Youling.
Quoted 2 lines
Honza
Andrew Morton
maintainerQuoted 37 lines · On Tue, 12 Aug 2025 17:08:53 +0800 Youling Tang <[email protected]> wrote:
Hi, Jan
Quoted 2 lines · Jan Kara
Quoted 1 line · Youling Tang
From: Youling Tang <[email protected]>
...
Quoted 21 lines
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2589
Quoted 11 lines
mm/filemap.c +3
-2@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); + last_index >>=PAGE_SHIFT ;I think that
filemap_get_pages()shouldn't be really trying to guess what readahead code needs and roundlast_indexbased on min folio order. After all the situation isn't special for LBS filesystems. It can also happen that the readahead mark ends up in the middle of large folio for other reasons. In fact, we already do have code inpage_cache_ra_order()->ra_alloc_folio()that handles rounding of index where mark should be placed so your changes essentially try to outsmart that code which is not good. I think the solution should really be placed inpage_cache_ra_order()+ra_alloc_folio()instead.Quoted 9 lines
In fact the problem you are trying to solve was kind of introduced (or at least made more visible) by my commit
ab4443fe3ca62("readahead: avoid multiple marked readahead pages"). There I've changed the code to round the index down because I've convinced myself it doesn't matter and rounding down is easier to handle in that place. But your example shows there are cases where rounding down has weird consequences and rounding up would have been better. So I think we need to come up with a method how to round up the index of marked folio to fix your case without reintroducing problems mentioned in commitab4443fe3ca62.
Quoted 7 lines
Yes, I simply replaced
round_up()inra_alloc_folio()withround_down()to avoid this phenomenon before submitting this patch.But at present, I haven't found a suitable way to solve both of these problems
simultaneously. Do you have a better solution on your side?
fyi, this patch remains stuck in mm.git awaiting resolution.
Do we have any information regarding its importance? Which means do we have any measurement of its effect upon any real-world workload?
Thanks.
Quoted 41 lines · Andrew Morton
Quoted 39 lines · On Tue, 12 Aug 2025 17:08:53 +0800 Youling Tang <[email protected]> wrote:
Hi, Jan
Quoted 2 lines · Jan Kara
Quoted 1 line · Youling Tang
From: Youling Tang <[email protected]>
...
Quoted 21 lines
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2589
Quoted 11 lines
mm/filemap.c +3
-2@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); + last_index >>=PAGE_SHIFT ;I think that
filemap_get_pages()shouldn't be really trying to guess what readahead code needs and roundlast_indexbased on min folio order. After all the situation isn't special for LBS filesystems. It can also happen that the readahead mark ends up in the middle of large folio for other reasons. In fact, we already do have code inpage_cache_ra_order()->ra_alloc_folio()that handles rounding of index where mark should be placed so your changes essentially try to outsmart that code which is not good. I think the solution should really be placed inpage_cache_ra_order()+ra_alloc_folio()instead.Quoted 9 lines
In fact the problem you are trying to solve was kind of introduced (or at least made more visible) by my commit
ab4443fe3ca62("readahead: avoid multiple marked readahead pages"). There I've changed the code to round the index down because I've convinced myself it doesn't matter and rounding down is easier to handle in that place. But your example shows there are cases where rounding down has weird consequences and rounding up would have been better. So I think we need to come up with a method how to round up the index of marked folio to fix your case without reintroducing problems mentioned in commitab4443fe3ca62.Yes, I simply replaced
round_up()inra_alloc_folio()withround_down()to avoid this phenomenon before submitting this patch.
Quoted 8 lines
Quoted 4 lines
But at present, I haven't found a suitable way to solve both of these problems
simultaneously. Do you have a better solution on your side?fyi, this patch remains stuck in mm.git awaiting resolution.
Do we have any information regarding its importance? Which means do we have any measurement of its effect upon any real-world workload?
No measurements were taken regarding the impact on real-world workloads, this was merely a line of thinking triggered by unusual readahead behavior.
Thanks,
Youling.
Quoted 3 lines
Thanks.
Quoted 47 lines · Andrew Morton
Quoted 37 lines · On Tue, 12 Aug 2025 17:08:53 +0800 Youling Tang <[email protected]> wrote:
Hi, Jan
Quoted 2 lines · Jan Kara
Quoted 1 line · Youling Tang
From: Youling Tang <[email protected]>
...
Quoted 21 lines
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2589
Quoted 11 lines
mm/filemap.c +3
-2@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); + last_index >>=PAGE_SHIFT ;I think that
filemap_get_pages()shouldn't be really trying to guess what readahead code needs and roundlast_indexbased on min folio order. After all the situation isn't special for LBS filesystems. It can also happen that the readahead mark ends up in the middle of large folio for other reasons. In fact, we already do have code inpage_cache_ra_order()->ra_alloc_folio()that handles rounding of index where mark should be placed so your changes essentially try to outsmart that code which is not good. I think the solution should really be placed inpage_cache_ra_order()+ra_alloc_folio()instead.Quoted 9 lines
In fact the problem you are trying to solve was kind of introduced (or at least made more visible) by my commit
ab4443fe3ca62("readahead: avoid multiple marked readahead pages"). There I've changed the code to round the index down because I've convinced myself it doesn't matter and rounding down is easier to handle in that place. But your example shows there are cases where rounding down has weird consequences and rounding up would have been better. So I think we need to come up with a method how to round up the index of marked folio to fix your case without reintroducing problems mentioned in commitab4443fe3ca62.Quoted 7 lines
Yes, I simply replaced
round_up()inra_alloc_folio()withround_down()to avoid this phenomenon before submitting this patch.But at present, I haven't found a suitable way to solve both of these problems
simultaneously. Do you have a better solution on your side?
Quoted 4 lines
fyi, this patch remains stuck in mm.git awaiting resolution.
Do we have any information regarding its importance? Which means do we have any measurement of its effect upon any real-world workload?
OK, after experimenting with the code some more and with rounding the readahead mark index up, I've found out we need something like Youling proposed anyway because otherwise it could happen that the whole readahead area fits into a single min-order folio and thus with rounding up we wouldn't have a folio to place readahead mark on. So with that I'm withdrawing my objections and feel free to add:
to Youling's patch.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Hi, Andrew
I see there are two fix patches for my patch in the mm-unstable branch, should I send a v2 that incorporates these fixes, or is it not necessary?
Thanks,
Youling.
Quoted 62 lines · Jan Kara
Quoted 41 lines · Andrew Morton
Quoted 39 lines · On Tue, 12 Aug 2025 17:08:53 +0800 Youling Tang <[email protected]> wrote:
Hi, Jan
Quoted 2 lines · Jan Kara
Quoted 1 line · Youling Tang
From: Youling Tang <[email protected]>
...
Quoted 21 lines
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2589
Quoted 11 lines
mm/filemap.c +3
-2@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); + last_index >>=PAGE_SHIFT ;I think that
filemap_get_pages()shouldn't be really trying to guess what readahead code needs and roundlast_indexbased on min folio order. After all the situation isn't special for LBS filesystems. It can also happen that the readahead mark ends up in the middle of large folio for other reasons. In fact, we already do have code inpage_cache_ra_order()->ra_alloc_folio()that handles rounding of index where mark should be placed so your changes essentially try to outsmart that code which is not good. I think the solution should really be placed inpage_cache_ra_order()+ra_alloc_folio()instead.Quoted 9 lines
In fact the problem you are trying to solve was kind of introduced (or at least made more visible) by my commit
ab4443fe3ca62("readahead: avoid multiple marked readahead pages"). There I've changed the code to round the index down because I've convinced myself it doesn't matter and rounding down is easier to handle in that place. But your example shows there are cases where rounding down has weird consequences and rounding up would have been better. So I think we need to come up with a method how to round up the index of marked folio to fix your case without reintroducing problems mentioned in commitab4443fe3ca62.Yes, I simply replaced
round_up()inra_alloc_folio()withround_down()to avoid this phenomenon before submitting this patch.Quoted 8 lines
Quoted 4 lines
But at present, I haven't found a suitable way to solve both of these problems
simultaneously. Do you have a better solution on your side?fyi, this patch remains stuck in mm.git awaiting resolution.
Do we have any information regarding its importance? Which means do we have any measurement of its effect upon any real-world workload?
OK, after experimenting with the code some more and with rounding the readahead mark index up, I've found out we need something like Youling proposed anyway because otherwise it could happen that the whole readahead area fits into a single min-order folio and thus with rounding up we wouldn't have a folio to place readahead mark on. So with that I'm withdrawing my objections and feel free to add:
Reviewed-by Jan Kara <[email protected]>to Youling's patch.
Honza
Andrew Morton
maintainerQuoted 3 lines · On Tue, 9 Sep 2025 14:15:12 +0800 Youling Tang <[email protected]> wrote:
I see there are two fix patches for my patch in the mm-unstable branch, should I send a v2 that incorporates these fixes, or is it not necessary?
That's OK, thanks. Before sending upstream those -fix patches will be folded into the base patch and appropriate changelog updates will be made. So the end result is as clean as we can make it and the various updates are shown.
Hi,
Quoted 91 lines · Youling Tang
From: Youling Tang <[email protected]>
On XFS systems with pagesize=4K, blocksize=16K, and
CONFIG_TRANSPARENT_HUGEPAGEenabled, We observed the following readahead behaviors:# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=64k count=1 # ./tools/mm/page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 f 136bbb __RU_l__________T_____t_________________F_1 <-- first read 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136048 __RU_l_________H______t_________________F_1 ... c 110a40 __RU_l_________H______t_________________F_1 d 110a41 __RU_l__________T_____t_________________F_1 e 110a42 __RU_l__________T_____t_________________F_1 <-- first read f 110a43 __RU_l__________T_____t_________________F_1 <-- first readahead flag 10 13e7a8 ___U_l_________H______t_________________F_1 ... 20 137a00 ___U_l_________H______t_______P______I__F_1 <-- second readahead flag (20 - 2f) 21 137a01 ___U_l__________T_____t_______P______I__F_1 ... 3f 10d4af ___U_l__________T_____t_______P_________F_1 [first readahead: ra_size = 32, req_count = 15, async_size = 17]When reading 64k data (same for 61-63k range, where
last_indexis page-aligned infilemap_get_pages()), 128k readahead is triggered viapage_cache_sync_ra()and thePG_readaheadflag is set on the next folio (the one containing0x10page).When reading 60k data, 128k readahead is also triggered via
page_cache_sync_ra(). However, in this case the readahead flag is set on the0xfpage. Although the requested read size (req_count) is 60k, the actual read will be aligned to folio size (64k), which triggers the readahead flag and initiates asynchronous readahead viapage_cache_async_ra(). This results in two readahead operations totaling 256k.The root cause is that when the requested size is smaller than the actual read size (due to folio alignment), it triggers asynchronous readahead. By changing
last_indexalignment from page size to folio size, we ensure the requested size matches the actual read size, preventing the case where a single read operation triggers two readahead operations.After applying the patch:
# echo 3 > /proc/sys/vm/drop_caches # dd if=test of=/dev/null bs=60k count=1 # ./page-types -r -L -f /mnt/xfs/test foffset offset flags 0 136d4c __RU_l_________H______t_________________F_1 1 136d4d __RU_l__________T_____t_________________F_1 2 136d4e __RU_l__________T_____t_________________F_1 3 136d4f __RU_l__________T_____t_________________F_1 ... c 136bb8 __RU_l_________H______t_________________F_1 d 136bb9 __RU_l__________T_____t_________________F_1 e 136bba __RU_l__________T_____t_________________F_1 <-- first read f 136bbb __RU_l__________T_____t_________________F_1 10 13c2cc ___U_l_________H______t______________I__F_1 <-- readahead flag 11 13c2cd ___U_l__________T_____t______________I__F_1 12 13c2ce ___U_l__________T_____t______________I__F_1 13 13c2cf ___U_l__________T_____t______________I__F_1 ... 1c 1405d4 ___U_l_________H______t_________________F_1 1d 1405d5 ___U_l__________T_____t_________________F_1 1e 1405d6 ___U_l__________T_____t_________________F_1 1f 1405d7 ___U_l__________T_____t_________________F_1 [ra_size = 32, req_count = 16, async_size = 16]The same phenomenon will occur when reading from 49k to 64k. Set the readahead flag to the next folio.
Quoted 7 lines
Because the minimum order of folio in
address_spaceequals the block size (at least in xfs and bcachefs that already support bs > ps), havingrequest_countaligned to block size will not cause overread.Co-developed-by Chi Zhiling <[email protected]>Signed-off-by Chi Zhiling <[email protected]>Signed-off-by Youling Tang <[email protected]>
I bisected boot failures on two of my 32-bit systems to this patch.
Quoted 27 lines
--- include/linux/pagemap.h | 6 ++++++ mm/filemap.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)include/linux/pagemap.h +6
-0@@ -480,6 +480,12 @@ mapping_min_folio_nrpages(struct address_space *mapping)return 1UL <<mapping_min_folio_order (mapping); } +static inline unsigned long +mapping_min_folio_nrbytes (struct address_space *mapping) +{ +return mapping_min_folio_nrpages (mapping) <<PAGE_SHIFT ; +} +/** * mapping_align_index() - Align index for this mapping. * @mapping: The address_space. mm/filemap.c +0
-0
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2589
Quoted 8 lines
mm/filemap.c +2
-2@@ -2584,8 +2584,9 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,unsigned int flags;int err =0 ; -/* "last_index" is the index of the page beyond the end of the read */ - last_index =DIV_ROUND_UP (iocb->ki_pos + count,PAGE_SIZE ); +/* "last_index" is the index of the folio beyond the end of the read */ + last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping));
iocb->ki_pos is loff_t (long long) while pgoff_t is unsigned long and this overflow seems to happen in practice, resulting in last_index being before index.
The following diff resolves the issue for me:
mm/filemap.c +2 -2
@@ -2585,8 +2585,8 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,int err =0 ;/* "last_index" is the index of the folio beyond the end of the read */ - last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); - last_index >>=PAGE_SHIFT ; + last_index =round_up (iocb->ki_pos + count, +mapping_min_folio_nrbytes (mapping)) >>PAGE_SHIFT ; retry:if (fatal_signal_pending (current))return -EINTR ;
Regards,
Klara Modin
Quoted 7 lines
mm/filemap.c +1
-0+ last_index >>=PAGE_SHIFT ; retry:if (fatal_signal_pending (current))return
-EINTR;Signature · 1 line
2.34.1
Andrew Morton
maintainerQuoted 11 lines · On Tue, 15 Jul 2025 00:34:12 +0200 Klara Modin <[email protected]> wrote:
iocb->ki_posisloff_t(long long) whilepgoff_tis unsigned long and this overflow seems to happen in practice, resulting inlast_indexbeing before index.The following diff resolves the issue for me:
mm/filemap.c +0
-0
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2592
Quoted 10 lines
mm/filemap.c +2
-2@@ -2585,8 +2585,8 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,int err =0 ;/* "last_index" is the index of the folio beyond the end of the read */ - last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); - last_index >>=PAGE_SHIFT ; + last_index =round_up (iocb->ki_pos + count, +mapping_min_folio_nrbytes (mapping)) >>PAGE_SHIFT ; retry:if (fatal_signal_pending (current))return -EINTR ;
Looks good, thanks. I added your signed-off-by (which I trust is OK?) and queued this up.
Quoted 15 lines · Andrew Morton
Quoted 13 lines · On Tue, 15 Jul 2025 00:34:12 +0200 Klara Modin <[email protected]> wrote:
iocb->ki_posisloff_t(long long) whilepgoff_tis unsigned long and this overflow seems to happen in practice, resulting inlast_indexbeing before index.The following diff resolves the issue for me:
mm/filemap.c +0
-0@@ -2585,8 +2585,8 @@ static int filemap_get_pages(struct kiocb *iocb, size_t count,int err =0 ;
Quoted 11 lines
mm/filemap.c static int filemap_get_pages(struct kiocb *iocb, size_t count, · line 2592
Quoted 8 lines
mm/filemap.c +2
-2/* "last_index" is the index of the folio beyond the end of the read */ - last_index =round_up (iocb->ki_pos + count,mapping_min_folio_nrbytes (mapping)); - last_index >>=PAGE_SHIFT ; + last_index =round_up (iocb->ki_pos + count, +mapping_min_folio_nrbytes (mapping)) >>PAGE_SHIFT ; retry:if (fatal_signal_pending (current))return -EINTR ;Looks good, thanks. I added your signed-off-by (which I trust is OK?) and queued this up.
Thanks, that's fine: