forked from Minki/linux
mm, hwpoison: enable memory error handling on 1GB hugepage
Now error handling code is prepared, so remove the blocking code and enable memory error handling on 1GB hugepage. Link: https://lkml.kernel.org/r/20220714042420.1847125-9-naoya.horiguchi@linux.dev Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com> Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> Cc: David Hildenbrand <david@redhat.com> Cc: kernel test robot <lkp@intel.com> Cc: Liu Shixin <liushixin2@huawei.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: Muchun Song <songmuchun@bytedance.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: Yang Shi <shy828301@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
ceaf8fbea7
commit
6f4614886b
@ -3229,7 +3229,6 @@ enum mf_action_page_type {
|
||||
MF_MSG_DIFFERENT_COMPOUND,
|
||||
MF_MSG_HUGE,
|
||||
MF_MSG_FREE_HUGE,
|
||||
MF_MSG_NON_PMD_HUGE,
|
||||
MF_MSG_UNMAP_FAILED,
|
||||
MF_MSG_DIRTY_SWAPCACHE,
|
||||
MF_MSG_CLEAN_SWAPCACHE,
|
||||
|
@ -360,7 +360,6 @@ TRACE_EVENT(aer_event,
|
||||
EM ( MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking" ) \
|
||||
EM ( MF_MSG_HUGE, "huge page" ) \
|
||||
EM ( MF_MSG_FREE_HUGE, "free huge page" ) \
|
||||
EM ( MF_MSG_NON_PMD_HUGE, "non-pmd-sized huge page" ) \
|
||||
EM ( MF_MSG_UNMAP_FAILED, "unmapping failed page" ) \
|
||||
EM ( MF_MSG_DIRTY_SWAPCACHE, "dirty swapcache page" ) \
|
||||
EM ( MF_MSG_CLEAN_SWAPCACHE, "clean swapcache page" ) \
|
||||
|
@ -768,7 +768,6 @@ static const char * const action_page_types[] = {
|
||||
[MF_MSG_DIFFERENT_COMPOUND] = "different compound page after locking",
|
||||
[MF_MSG_HUGE] = "huge page",
|
||||
[MF_MSG_FREE_HUGE] = "free huge page",
|
||||
[MF_MSG_NON_PMD_HUGE] = "non-pmd-sized huge page",
|
||||
[MF_MSG_UNMAP_FAILED] = "unmapping failed page",
|
||||
[MF_MSG_DIRTY_SWAPCACHE] = "dirty swapcache page",
|
||||
[MF_MSG_CLEAN_SWAPCACHE] = "clean swapcache page",
|
||||
@ -1885,21 +1884,6 @@ retry:
|
||||
|
||||
page_flags = head->flags;
|
||||
|
||||
/*
|
||||
* TODO: hwpoison for pud-sized hugetlb doesn't work right now, so
|
||||
* simply disable it. In order to make it work properly, we need
|
||||
* make sure that:
|
||||
* - conversion of a pud that maps an error hugetlb into hwpoison
|
||||
* entry properly works, and
|
||||
* - other mm code walking over page table is aware of pud-aligned
|
||||
* hwpoison entries.
|
||||
*/
|
||||
if (huge_page_size(page_hstate(head)) > PMD_SIZE) {
|
||||
action_result(pfn, MF_MSG_NON_PMD_HUGE, MF_IGNORED);
|
||||
res = -EBUSY;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!hwpoison_user_mappings(p, pfn, flags, head)) {
|
||||
action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);
|
||||
res = -EBUSY;
|
||||
|
Loading…
Reference in New Issue
Block a user