Commit e5a59d30 authored Sep 04, 2020 by David Howells Committed by Linus Torvalds Sep 05, 2020

mm/khugepaged.c: fix khugepaged's request size in collapse_file



collapse_file() in khugepaged passes PAGE_SIZE as the number of pages to
be read to page_cache_sync_readahead().  The intent was probably to read
a single page.  Fix it to use the number of pages to the end of the
window instead.

Fixes: 99cb0dbd ("mm,thp: add read-only THP support for (non-shmem) FS")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Yang Shi <shy828301@gmail.com>
Acked-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Cc: Eric Biggers <ebiggers@google.com>
Link: https://lkml.kernel.org/r/20200903140844.14194-2-willy@infradead.org


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 17743798

mm/khugepaged.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1709,7 +1709,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);

Admin message