Skip to content

Commit f10628d

Browse files
Michal Hockotorvalds
authored andcommitted
Revert "mm/gup: check page posion status for coredump."
While reviewing [1] I came across commit d3378e8 ("mm/gup: check page posion status for coredump.") and noticed that this patch is broken in two ways. First it doesn't really prevent hwpoison pages from being dumped because hwpoison pages can be marked asynchornously at any time after the check. Secondly, and more importantly, the patch introduces a ref count leak because get_dump_page takes a reference on the page which is not released. It also seems that the patch was merged incorrectly because there were follow up changes not included as well as discussions on how to address the underlying problem [2] Therefore revert the original patch. Link: http://lkml.kernel.org/r/[email protected] [1] Link: http://lkml.kernel.org/r/[email protected] [2] Link: https://lkml.kernel.org/r/[email protected] Fixes: d3378e8 ("mm/gup: check page posion status for coredump.") Signed-off-by: Michal Hocko <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Cc: Aili Yao <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent f9f74dc commit f10628d

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

mm/gup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,10 +1593,6 @@ struct page *get_dump_page(unsigned long addr)
15931593
FOLL_FORCE | FOLL_DUMP | FOLL_GET);
15941594
if (locked)
15951595
mmap_read_unlock(mm);
1596-
1597-
if (ret == 1 && is_page_poisoned(page))
1598-
return NULL;
1599-
16001596
return (ret == 1) ? page : NULL;
16011597
}
16021598
#endif /* CONFIG_ELF_CORE */

mm/internal.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,26 +96,6 @@ static inline void set_page_refcounted(struct page *page)
9696
set_page_count(page, 1);
9797
}
9898

99-
/*
100-
* When kernel touch the user page, the user page may be have been marked
101-
* poison but still mapped in user space, if without this page, the kernel
102-
* can guarantee the data integrity and operation success, the kernel is
103-
* better to check the posion status and avoid touching it, be good not to
104-
* panic, coredump for process fatal signal is a sample case matching this
105-
* scenario. Or if kernel can't guarantee the data integrity, it's better
106-
* not to call this function, let kernel touch the poison page and get to
107-
* panic.
108-
*/
109-
static inline bool is_page_poisoned(struct page *page)
110-
{
111-
if (PageHWPoison(page))
112-
return true;
113-
else if (PageHuge(page) && PageHWPoison(compound_head(page)))
114-
return true;
115-
116-
return false;
117-
}
118-
11999
extern unsigned long highest_memmap_pfn;
120100

121101
/*

0 commit comments

Comments
 (0)