Skip to content

Commit ceaf8fb

Browse files
nhoriguchiakpm00
authored andcommitted
mm, hwpoison: skip raw hwpoison page in freeing 1GB hugepage
Currently if memory_failure() (modified to remove blocking code with subsequent patch) is called on a page in some 1GB hugepage, memory error handling fails and the raw error page gets into leaked state. The impact is small in production systems (just leaked single 4kB page), but this limits the testability because unpoison doesn't work for it. We can no longer create 1GB hugepage on the 1GB physical address range with such leaked pages, that's not useful when testing on small systems. When a hwpoison page in a 1GB hugepage is handled, it's caught by the PageHWPoison check in free_pages_prepare() because the 1GB hugepage is broken down into raw error pages before coming to this point: if (unlikely(PageHWPoison(page)) && !order) { ... return false; } Then, the page is not sent to buddy and the page refcount is left 0. Originally this check is supposed to work when the error page is freed from page_handle_poison() (that is called from soft-offline), but now we are opening another path to call it, so the callers of __page_handle_poison() need to handle the case by considering the return value 0 as success. Then page refcount for hwpoison is properly incremented so unpoison works. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Naoya Horiguchi <[email protected]> Reviewed-by: Miaohe Lin <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: kernel test robot <[email protected]> Cc: Liu Shixin <[email protected]> Cc: Mike Kravetz <[email protected]> Cc: Muchun Song <[email protected]> Cc: Oscar Salvador <[email protected]> Cc: Yang Shi <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 7453bf6 commit ceaf8fb

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

mm/memory-failure.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -1084,17 +1084,18 @@ static int me_huge_page(struct page_state *ps, struct page *p)
10841084
res = truncate_error_page(hpage, page_to_pfn(p), mapping);
10851085
unlock_page(hpage);
10861086
} else {
1087-
res = MF_FAILED;
10881087
unlock_page(hpage);
10891088
/*
10901089
* migration entry prevents later access on error hugepage,
10911090
* so we can free and dissolve it into buddy to save healthy
10921091
* subpages.
10931092
*/
10941093
put_page(hpage);
1095-
if (__page_handle_poison(p) > 0) {
1094+
if (__page_handle_poison(p) >= 0) {
10961095
page_ref_inc(p);
10971096
res = MF_RECOVERED;
1097+
} else {
1098+
res = MF_FAILED;
10981099
}
10991100
}
11001101

@@ -1872,10 +1873,11 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
18721873
*/
18731874
if (res == 0) {
18741875
unlock_page(head);
1875-
res = MF_FAILED;
1876-
if (__page_handle_poison(p) > 0) {
1876+
if (__page_handle_poison(p) >= 0) {
18771877
page_ref_inc(p);
18781878
res = MF_RECOVERED;
1879+
} else {
1880+
res = MF_FAILED;
18791881
}
18801882
action_result(pfn, MF_MSG_FREE_HUGE, res);
18811883
return res == MF_RECOVERED ? 0 : -EBUSY;

0 commit comments

Comments
 (0)