Commit 5c72feee authored Apr 01, 2020 by Jan Kara Committed by Linus Torvalds Apr 02, 2020

mm/filemap.c: don't bother dropping mmap_sem for zero size readahead



When handling a page fault, we drop mmap_sem to start async readahead so
that we don't block on IO submission with mmap_sem held.  However there's
no point to drop mmap_sem in case readahead is disabled.  Handle that case
to avoid pointless dropping of mmap_sem and retrying the fault.  This was
actually reported to block mlockall(MCL_CURRENT) indefinitely.

Fixes: 6b4c9f44 ("filemap: drop the mmap_sem for all blocking operations")
Reported-by: Minchan Kim <minchan@kernel.org>
Reported-by: Robert Stupp <snazy@gmx.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Minchan Kim <minchan@kernel.org>
Link: http://lkml.kernel.org/r/20200212101356.30759-1-jack@suse.cz


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

parent 5f2d5026

mm/filemap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2416,7 +2416,7 @@ static struct file do_async_mmap_readahead(struct vm_fault vmf,
		pgoff_t offset = vmf->pgoff;

		/* If we don't want any read-ahead, don't bother */
		if (vmf->vma->vm_flags & VM_RAND_READ)
		if (vmf->vma->vm_flags & VM_RAND_READ \|\| !ra->ra_pages)
		return fpin;
		if (ra->mmap_miss > 0)
		ra->mmap_miss--;

Admin message