Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4335af6c authored by Miaohe Lin's avatar Miaohe Lin Committed by Greg Kroah-Hartman
Browse files

mm/hugetlb: fix potential missing huge page size info 

commit 0eb98f1588c2cc7a79816d84ab18a55d254f481c upstream.

The huge page size is encoded for VM_FAULT_HWPOISON errors only.  So if
we return VM_FAULT_HWPOISON, huge page size would just be ignored.

Link: https://lkml.kernel.org/r/20210107123449.38481-1-linmiaohe@huawei.com


Fixes: aa50d3a7 ("Encode huge page size for VM_FAULT_HWPOISON errors")
Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6436662

mm/hugetlb.c

+1 −1
Original line number Diff line number Diff line
@@ -4036,7 +4036,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, 
		 * So we need to block hugepage fault by PG_hwpoison bit check.

		 */

		if (unlikely(PageHWPoison(page))) {

			ret = VM_FAULT_HWPOISON |

			ret = VM_FAULT_HWPOISON_LARGE |

				VM_FAULT_SET_HINDEX(hstate_index(h));

			goto backout_unlocked;

		}