From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 2 Jun 2021 03:52:41 +0000 (+1000)
Subject: mm-memory-failure-use-a-mutex-to-avoid-memory_failure-races-fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d98703d07b166da23adc0fdb94eaa348825317e1;p=users%2Fjedix%2Flinux-maple.git

mm-memory-failure-use-a-mutex-to-avoid-memory_failure-races-fix

make mf_mutex local to memory_failure()

Cc: Aili Yao <yaoaili@kingsoft.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jue Wang <juew@google.com>
Cc: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index c4aa318ec9a8a..8bbdb4513d257 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1381,8 +1381,6 @@ out:
 	return rc;
 }
 
-static DEFINE_MUTEX(mf_mutex);
-
 /**
  * memory_failure - Handle memory failure of a page.
  * @pfn: Page Number of the corrupted page
@@ -1409,6 +1407,7 @@ int memory_failure(unsigned long pfn, int flags)
 	int res = 0;
 	unsigned long page_flags;
 	bool retry = true;
+	static DEFINE_MUTEX(mf_mutex);
 
 	if (!sysctl_memory_failure_recovery)
 		panic("Memory failure on page %lx", pfn);