From: David Howells <dhowells@redhat.com>
To: willy@infradead.org
Cc: dhowells@redhat.com, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 1/7] Fix khugepaged's request size in collapse_file()
Date: Tue, 01 Sep 2020 17:28:22 +0100 [thread overview]
Message-ID: <159897770245.405783.16506873187032379873.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <159897769535.405783.17587409235571100774.stgit@warthog.procyon.org.uk>
collapse_file() in khugepaged passes PAGE_SIZE as the number of pages to be
read ahead to page_cache_sync_readahead(). It seems this was expressed as a
number of bytes rather than a number of pages.
Fix it to use the number of pages to the end of the window instead.
Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Matthew Wilcox <willy@infradead.org>
cc: Song Liu <songliubraving@fb.com>
---
mm/khugepaged.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 6d199c353281..f2d243077b74 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1706,7 +1706,7 @@ static void collapse_file(struct mm_struct *mm,
xas_unlock_irq(&xas);
page_cache_sync_readahead(mapping, &file->f_ra,
file, index,
- PAGE_SIZE);
+ end - index);
/* drain pagevecs to help isolate_lru_page() */
lru_add_drain();
page = find_lock_page(mapping, index);
next prev parent reply other threads:[~2020-09-01 16:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 16:28 [RFC PATCH 0/7] mm: Make more use of readahead_control David Howells
2020-09-01 16:28 ` David Howells [this message]
2020-09-01 18:06 ` [RFC PATCH 1/7] Fix khugepaged's request size in collapse_file() Song Liu
2020-09-01 16:28 ` [RFC PATCH 2/7] mm: Make ondemand_readahead() take a readahead_control struct David Howells
2020-09-01 16:28 ` [RFC PATCH 3/7] mm: Push readahead_control down into force_page_cache_readahead() David Howells
2020-09-01 16:28 ` [RFC PATCH 4/7] mm: Pass readahead_control into page_cache_{sync,async}_readahead() David Howells
2020-09-01 16:28 ` [RFC PATCH 5/7] mm: Make __do_page_cache_readahead() use rac->_nr_pages David Howells
2020-09-01 16:28 ` [RFC PATCH 6/7] mm: Fold ra_submit() into do_sync_mmap_readahead() David Howells
2020-09-01 16:29 ` [RFC PATCH 7/7] mm: Pass a file_ra_state struct into force_page_cache_readahead() David Howells
2020-09-01 16:41 ` [RFC PATCH 0/7] mm: Make more use of readahead_control Eric Biggers
2020-09-01 16:45 ` Matthew Wilcox
2020-09-02 15:42 ` David Howells
2020-09-01 16:48 ` Matthew Wilcox
2020-09-01 19:40 ` David Howells
2020-09-01 19:44 ` David Howells
2020-09-01 22:33 ` Matthew Wilcox
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=159897770245.405783.16506873187032379873.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--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).