+ mm-gup-check-page-posion-status-for-coredump-fix.patch added to -mm tree
Subsystems (3)
The patch titled
Subject: mm-gup-check-page-posion-status-for-coredump-fix
has been added to the -mm tree. Its filename is
mm-gup-check-page-posion-status-for-coredump-fix.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-gup-check-page-posion-status-for-coredump-fix.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-gup-check-page-posion-status-for-coredump-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <[email protected]>
Subject: mm-gup-check-page-posion-status-for-coredump-fix
s/0/false/
---
mm/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/internal.h renamed from mm/internal.h~mm-gup-check-page-posion-status-for-coredump-fix +1 -1
@@ -115,7 +115,7 @@ static inline bool is_page_poisoned(struelse if (PageHuge (page) &&PageHWPoison (compound_head (page)))return true; } -return 0 ; +return false; }extern unsigned long highest_memmap_pfn;
_
Patches currently in -mm which might be from [email protected] are
mm.patch mm-gup-check-page-posion-status-for-coredump-fix.patch mm-memcontrol-switch-to-rstat-fix.patch kasan-remove-redundant-config-option-fix.patch mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch
PATCH v4 1/1 mm/gup: check page posion status for coredump.
Hi Andrew:
Thanks for mergeing v3 patch into mm, but there is still a modification suggested by Matthew Wilcox needing to finish. I am not sure how does the right process works. I post patch v4 here, if anythong wrong, please point out.
Thanks!
When we do coredump for user process signal, this may be an SIGBUS signal with BUS_MCEERR_AR or BUS_MCEERR_AO code, which means this signal is resulted from ECC memory fail like SRAR or SRAO, we expect the memory recovery work is finished correctly, then the get_dump_page() will not return the error page as its process pte is set invalid by memory_failure().
But memory_failure() may fail, and the process's related pte may not be correctly set invalid, for current code, we will return the poison page, get it dumped, and then lead to system panic as its in kernel code.
So check the poison status in get_dump_page(), and if TRUE, return NULL.
There maybe other scenario that is also better to check the posion status and not to panic, so make a wrapper for this check, Thanks to David's suggestion(<[email protected]>).
--- mm/gup.c | 4 ++++ mm/internal.h | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+)
mm/gup.c +4 -0
@@ -1536,6 +1536,10 @@ struct page *get_dump_page(unsigned long addr) FOLL_FORCE | FOLL_DUMP | FOLL_GET);if (locked)mmap_read_unlock (mm); + +if (ret ==1 &&is_page_poisoned (page)) +return NULL ; + return (ret == 1) ? page : NULL; }#endif /* CONFIG_ELF_CORE */
mm/internal.h +20 -0
@@ -97,6 +97,26 @@ static inline void set_page_refcounted(struct page *page)set_page_count (page,1 ); } +/* +* When kernel touch the user page, the user page may be have been marked +* poison but still mapped in user space, if without this page, the kernel +* can guarantee the data integrity and operation success, the kernel is +* better to check the posion status and avoid touching it, be good not to +* panic, coredump for process fatal signal is a sample case matching this +* scenario. Or if kernel can't guarantee the data integrity, it's better +* not to call this function, let kernel touch the poison page and get to +* panic. +*/ +static inline bool is_page_poisoned (struct page *page) +{ +if (PageHWPoison (page)) +return true; +else if (PageHuge (page) &&PageHWPoison (compound_head (page))) +return true; + +return false; +} +extern unsigned long highest_memmap_pfn;/*
Signature · 1 line
1.8.3.1
Re: [PATCH v4] mm/gup: check page posion status for coredump.
Quoted 26 lines · Aili Yao
Hi Andrew:
Thanks for mergeing v3 patch into mm, but there is still a modification suggested by Matthew Wilcox needing to finish. I am not sure how does the right process works. I post patch v4 here, if anythong wrong, please point out.
Thanks!
When we do coredump for user process signal, this may be an SIGBUS signal with
BUS_MCEERR_ARorBUS_MCEERR_AOcode, which means this signal is resulted from ECC memory fail like SRAR or SRAO, we expect the memory recovery work is finished correctly, then theget_dump_page()will not return the error page as its process pte is set invalid bymemory_failure().But
memory_failure()may fail, and the process's related pte may not be correctly set invalid, for current code, we will return the poison page, get it dumped, and then lead to system panic as its in kernel code.So check the poison status in
get_dump_page(), and if TRUE, return NULL.There maybe other scenario that is also better to check the posion status and not to panic, so make a wrapper for this check, Thanks to David's suggestion(<[email protected]>).
Quoted 9 lines
Signed-off-by Aili Yao <[email protected]>Cc David Hildenbrand <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Naoya Horiguchi <[email protected]>Cc Oscar Salvador <[email protected]>Cc Mike Kravetz <[email protected]>Cc Aili Yao <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Thank you.
This is a simple and clear fix, so I think it's worth ccing to -stable.
Quoted 29 lines
--- mm/gup.c | 4 ++++ mm/internal.h | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+)mm/gup.c +4
-0@@ -1536,6 +1536,10 @@ struct page *get_dump_page(unsigned long addr) FOLL_FORCE | FOLL_DUMP | FOLL_GET);if (locked)mmap_read_unlock (mm); + +if (ret ==1 &&is_page_poisoned (page)) +return NULL ; + return (ret == 1) ? page : NULL; }#endif /* CONFIG_ELF_CORE */ mm/internal.h +1
-0@@ -97,6 +97,26 @@ static inline void set_page_refcounted(struct page *page)set_page_count (page,1 ); } +/*
mm/internal.h static inline void set_page_refcounted(struct page *page) · line 110
Quoted 10 lines
mm/internal.h +10
-0+* When kernel touch the user page, the user page may be have been marked +* poison but still mapped in user space, if without this page, the kernel +* can guarantee the data integrity and operation success, the kernel is +* better to check the posion status and avoid touching it, be good not to +* panic, coredump for process fatal signal is a sample case matching this +* scenario. Or if kernel can't guarantee the data integrity, it's better +* not to call this function, let kernel touch the poison page and get to +* panic. +*/ +static inline bool is_page_poisoned (struct page *page)
The word "poison" is abused even in mm subsystem, so please use "hwpoison" to be distinct. And please send a patch to linux-mm for review instead of replying to this thread.
Thanks,
Naoya Horiguchi
Quoted 15 lines
mm/internal.h +9
-0+{ +if (PageHWPoison (page)) +return true; +else if (PageHuge (page) &&PageHWPoison (compound_head (page))) +return true; + +return false; +} +extern unsigned long highest_memmap_pfn;/* Signature · 1 line
1.8.3.1