New: Pass wrong index value to DEFINE_READAHEAD which leads to almost no readahead of fsverity data
Andrew Morton
maintainer(switched to email. Please respond via emailed reply-to-all, not via the bugzilla web interface).
Quoted 19 lines · On Tue, 11 Oct 2022 06:52:49 +0000 [email protected] wrote:
https://bugzilla.kernel.org/show_bug.cgi?id=216570
Bug ID: 216570
Summary: Pass wrong index value toDEFINE_READAHEADwhich leads
to almost no readahead of fsverity data
Product: Memory Management
Version: 2.5
Kernel Version: 6.0
Hardware: All
OS: Linux
Tree: Mainline
Status: NEW
Severity: low
Priority: P1
Component: Other
Assignee: [email protected]
Reporter: [email protected]
Regression: No
Quoted 6 lines
It was introduced by commit
73bb49da50cd460bb3ba31250ed2e7fbf2115edfIn function
ext4_read_merkle_tree_pageandf2fs_read_merkle_tree_page, parameter index was added by a offset and then passed topage_cache_readahead_unbounded.
For now, index is passed toDEFINE_READAHEADdirectly with wrong value.
oops, yes, thanks. Matthew, could you please take a look?
Quoted 45 lines
Possible fix is not changing the value of parameter index and defining a new local variable
ra_indexto replace all the other reference to index. Like:static struct page *ext4_read_merkle_tree_page(struct inode *inode,
pgoff_tindex, unsigned longnum_ra_pages)
{
pgoff_tra_index= index +ext4_verity_metadata_pos(inode)>>PAGE_SHIFT; DEFINE_READAHEAD(ractl, NULL, NULL, inode->i_mapping, ra_index); struct page *page; page = find_get_page_flags(inode->i_mapping, ra_index, FGP_ACCESSED); if (!page || !PageUptodate(page)) { if (page) put_page(page); else if (num_ra_pages > 1) page_cache_ra_unbounded(&ractl, num_ra_pages, 0); page = read_mapping_page(inode->i_mapping, ra_index, NULL); } return page; }static struct page *f2fs_read_merkle_tree_page(struct inode *inode,
pgoff_tindex, unsigned longnum_ra_pages)
{
pgoff_tra_index= index +f2fs_verity_metadata_pos(inode)>>PAGE_SHIFT; DEFINE_READAHEAD(ractl, NULL, NULL, inode->i_mapping, ra_index); struct page *page; page = find_get_page_flags(inode->i_mapping, ra_index, FGP_ACCESSED); if (!page || !PageUptodate(page)) { if (page) put_page(page); else if (num_ra_pages > 1) page_cache_ra_unbounded(&ractl, num_ra_pages, 0); page = read_mapping_page(inode->i_mapping, ra_index, NULL); } return page; }
Quoted 8 lines · Andrew Morton
Quoted 6 lines
It was introduced by commit
73bb49da50cd460bb3ba31250ed2e7fbf2115edfIn function
ext4_read_merkle_tree_pageandf2fs_read_merkle_tree_page, parameter index was added by a offset and then passed topage_cache_readahead_unbounded.
For now, index is passed toDEFINE_READAHEADdirectly with wrong value.oops, yes, thanks. Matthew, could you please take a look?
Oh, yes, oops indeed. I'll send a fix in the morning.