Skip to content

Commit

Permalink
mm,hwpoison: try to narrow window race for free pages
Browse files Browse the repository at this point in the history
Aristeu Rozanski reported that a customer test case started to report
-EBUSY after the hwpoison rework patchset.

There is a race window between spotting a free page and taking it off its
buddy freelist, so it might be that by the time we try to take it off, the
page has been already allocated.

This patch tries to handle such race window by trying to handle the new
type of page again if the page was allocated under us.

Reported-by: Aristeu Rozanski <aris@ruivo.org>
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: Aristeu Rozanski <aris@ruivo.org>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Dmitry Yakunin <zeil@yandex-team.ru>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Oscar Salvador <osalvador@suse.com>
Cc: Qian Cai <cai@lca.pw>
Cc: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20200922135650.1634-15-osalvador@suse.de
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
osalvadorvilardaga authored and torvalds committed Oct 16, 2020
1 parent 1f2481d commit b94e028
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion mm/memory-failure.c
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,7 @@ int soft_offline_page(unsigned long pfn, int flags)
{
int ret;
struct page *page;
bool try_again = true;

if (!pfn_valid(pfn))
return -ENXIO;
Expand All @@ -1918,14 +1919,18 @@ int soft_offline_page(unsigned long pfn, int flags)
return 0;
}

retry:
get_online_mems();
ret = get_any_page(page, pfn, flags);
put_online_mems();

if (ret > 0)
ret = soft_offline_in_use_page(page);
else if (ret == 0)
ret = soft_offline_free_page(page);
if (soft_offline_free_page(page) && try_again) {
try_again = false;
goto retry;
}

return ret;
}

0 comments on commit b94e028

Please sign in to comment.