Commit 1e8aaedb authored Dec 14, 2020 by Oscar Salvador Committed by Linus Torvalds Dec 15, 2020

mm,memory_failure: always pin the page in madvise_inject_error

madvise_inject_error() uses get_user_pages_fast to translate the address
we specified to a page.  After [1], we drop the extra reference count for
memory_failure() path.  That commit says that memory_failure wanted to
keep the pin in order to take the page out of circulation.

The truth is that we need to keep the page pinned, otherwise the page
might be re-used after the put_page() and we can end up messing with
someone else's memory.

E.g:

CPU0
process X					CPU1
 madvise_inject_error
  get_user_pages
   put_page
					page gets reclaimed
					process Y allocates the page
  memory_failure
   // We mess with process Y memory

madvise() is meant to operate on a self address space, so messing with
pages that do not belong to us seems the wrong thing to do.
To avoid that, let us keep the page pinned for memory_failure as well.

Pages for DAX mappings will release this extra refcount in
memory_failure_dev_pagemap.

[1] ("23e7b5c2: mm, madvise_inject_error:
      Let memory_failure() optionally take a page reference")

Link: https://lkml.kernel.org/r/20201207094818.8518-1-osalvador@suse.de


Fixes: 23e7b5c2 ("mm, madvise_inject_error: Let memory_failure() optionally take a page reference")
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Suggested-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 47e431f4

mm/madvise.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -907,14 +907,7 @@ static int madvise_inject_error(int behavior,
		} else {
		pr_info("Injecting memory failure for pfn %#lx at process virtual address %#lx\n",
		pfn, start);
		/*
		* Drop the page reference taken by get_user_pages_fast(). In
		* the absence of MF_COUNT_INCREASED the memory_failure()
		* routine is responsible for pinning the page to prevent it
		* from being released back to the page allocator.
		*/
		put_page(page);
		ret = memory_failure(pfn, 0);
		ret = memory_failure(pfn, MF_COUNT_INCREASED);
		}

		if (ret)

mm/memory-failure.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1302,6 +1302,12 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags,
		loff_t start;
		dax_entry_t cookie;

		if (flags & MF_COUNT_INCREASED)
		/*
		* Drop the extra refcount in case we come from madvise().
		*/
		put_page(page);

		/*
		* Prevent the inode from being freed while we are interrogating
		* the address_space, typically this would be handled by

Admin message