Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm,hwpoison: return 0 if the page is already poisoned in soft-offline

Currently, there is an inconsistency when calling soft-offline from
different paths on a page that is already poisoned.

1) madvise:

madvise_inject_error skips any poisoned page and continues
the loop.
If that was the only page to madvise, it returns 0.

2) /sys/devices/system/memory/:

When calling soft_offline_page_store()->soft_offline_page(),
we return -EBUSY in case the page is already poisoned.
This is inconsistent with a) the above example and b)
memory_failure, where we return 0 if the page was poisoned.

Fix this by dropping the PageHWPoison() check in madvise_inject_error, and
let soft_offline_page return 0 if it finds the page already poisoned.

Please, note that this represents a user-api change, since now the return
error when calling soft_offline_page_store()->soft_offline_page() will be
different.

Signed-off-by: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.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: Aristeu Rozanski <aris@ruivo.org>
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-12-osalvador@suse.de
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Oscar Salvador and committed by
Linus Torvalds
5a2ffca3 6b9a217e

+2 -7
-5
mm/madvise.c
··· 896 896 */ 897 897 size = page_size(compound_head(page)); 898 898 899 - if (PageHWPoison(page)) { 900 - put_page(page); 901 - continue; 902 - } 903 - 904 899 if (behavior == MADV_SOFT_OFFLINE) { 905 900 pr_info("Soft offlining pfn %#lx at process virtual address %#lx\n", 906 901 pfn, start);
+2 -2
mm/memory-failure.c
··· 1802 1802 unlock_page(page); 1803 1803 put_page(page); 1804 1804 pr_info("soft offline: %#lx page already poisoned\n", pfn); 1805 - return -EBUSY; 1805 + return 0; 1806 1806 } 1807 1807 1808 1808 if (!PageHuge(page)) ··· 1906 1906 pr_info("soft offline: %#lx page already poisoned\n", pfn); 1907 1907 if (flags & MF_COUNT_INCREASED) 1908 1908 put_page(page); 1909 - return -EBUSY; 1909 + return 0; 1910 1910 } 1911 1911 1912 1912 get_online_mems();