Using set_pte_at() does not do the right thing when putting down
HWPOISON swap entries for hugepages on architectures that support
contiguous ptes.

Fix this problem by using set_huge_swap_pte_at() which was introduced to
fix exactly this problem.

Signed-off-by: Punit Agrawal <punit.agra...@arm.com>
Acked-by: Steve Capper <steve.cap...@arm.com>
Cc: "Kirill A. Shutemov" <kirill.shute...@linux.intel.com>
---
 mm/rmap.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mm/rmap.c b/mm/rmap.c
index d405f0e0ee96..feb2352aa95f 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1379,15 +1379,18 @@ static bool try_to_unmap_one(struct page *page, struct 
vm_area_struct *vma,
                update_hiwater_rss(mm);
 
                if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) {
+                       pteval = swp_entry_to_pte(make_hwpoison_entry(subpage));
                        if (PageHuge(page)) {
                                int nr = 1 << compound_order(page);
                                hugetlb_count_sub(nr, mm);
+                               set_huge_swap_pte_at(mm, address,
+                                                    pvmw.pte, pteval,
+                                                    vma_mmu_pagesize(vma));
                        } else {
                                dec_mm_counter(mm, mm_counter(page));
+                               set_pte_at(mm, address, pvmw.pte, pteval);
                        }
 
-                       pteval = swp_entry_to_pte(make_hwpoison_entry(subpage));
-                       set_pte_at(mm, address, pvmw.pte, pteval);
                } else if (pte_unused(pteval)) {
                        /*
                         * The guest indicated that the page content is of no
-- 
2.11.0

Reply via email to