From: Yin Fengwei <fengwei.yin@intel.com>
To: akpm@linux-foundation.org, mike.kravetz@oracle.com,
willy@infradead.org, ackerleytng@google.com,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Cc: fengwei.yin@intel.com, oliver.sang@intel.com
Subject: [PATCH v2] readahead: Correct the start and size in ondemand_readahead()
Date: Wed, 28 Jun 2023 12:43:03 +0800 [thread overview]
Message-ID: <20230628044303.1412624-1-fengwei.yin@intel.com> (raw)
The commit
9425c591e06a ("page cache: fix page_cache_next/prev_miss off by one")
updated the page_cache_next_miss() to return the index beyond
range.
But it breaks the start/size of ra in ondemand_readahead() because
the offset by one is accumulated to readahead_index. As a consequence,
not best readahead order is picked.
Tracing of the order parameter of filemap_alloc_folio() showed:
page order : count distribution
0 : 892073 | |
1 : 0 | |
2 : 65120457 |****************************************|
3 : 32914005 |******************** |
4 : 33020991 |******************** |
with 9425c591e06a9.
With parent commit:
page order : count distribution
0 : 3417288 |**** |
1 : 0 | |
2 : 877012 |* |
3 : 288 | |
4 : 5607522 |******* |
5 : 29974228 |****************************************|
Fix the issue by removing the offset by one when page_cache_next_miss()
returns no gaps in the range.
After the fix:
page order : count distribution
0 : 2598561 |*** |
1 : 0 | |
2 : 687739 | |
3 : 288 | |
4 : 207210 | |
5 : 32628260 |****************************************|
Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202306211346.1e9ff03e-oliver.sang@intel.com
Fixes: 9425c591e06a ("page cache: fix page_cache_next/prev_miss off by one")
Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
---
Changes from v1:
- only removing offset by one when there is no gaps found by
page_cache_next_miss()
- Update commit message to include the histogram of page order
after fix
mm/readahead.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/mm/readahead.c b/mm/readahead.c
index 47afbca1d122..a93af773686f 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -614,9 +614,17 @@ static void ondemand_readahead(struct readahead_control *ractl,
max_pages);
rcu_read_unlock();
- if (!start || start - index > max_pages)
+ if (!start || start - index - 1 > max_pages)
return;
+ /*
+ * If no gaps in the range, page_cache_next_miss() returns
+ * index beyond range. Adjust it back to make sure
+ * ractl->_index is updated correctly later.
+ */
+ if ((start - index - 1) == max_pages)
+ start--;
+
ra->start = start;
ra->size = start - index; /* old async_size */
ra->size += req_size;
--
2.39.2
next reply other threads:[~2023-06-28 4:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-28 4:43 Yin Fengwei [this message]
2023-07-03 18:49 ` [PATCH v2] readahead: Correct the start and size in ondemand_readahead() Mike Kravetz
2023-07-04 1:41 ` Yin, Fengwei
2023-07-05 16:52 ` Mike Kravetz
2023-07-06 1:32 ` Yin Fengwei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230628044303.1412624-1-fengwei.yin@intel.com \
--to=fengwei.yin@intel.com \
--cc=ackerleytng@google.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=oliver.sang@intel.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).