On 2022/6/24 7:51, Naoya Horiguchi wrote:
> From: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>
>
> Now error handling code is prepared, so remove the blocking code and
> enable memory error handling on 1GB hugepage.
>
> Signed-off-by: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>
The patch itself looks good to me.
Reviewed-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Thanks!
BTW: There might still be some places need to be changed. Maybe we can
process them altogether after this series is done?
> ---
> include/linux/mm.h | 1 -
> include/ras/ras_event.h | 1 -
> mm/memory-failure.c | 16 ----------------
> 3 files changed, 18 deletions(-)
>
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 044dc5a2e361..9d7e9b5a4d1d 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -3284,7 +3284,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,
> diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
> index d0337a41141c..cbd3ddd7c33d 100644
> --- a/include/ras/ras_event.h
> +++ b/include/ras/ras_event.h
> @@ -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" ) \
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index fc7b83cb6468..33521e059f7f 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -728,7 +728,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",
> @@ -1717,21 +1716,6 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
>
> 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;
>
