1 files changed, 20 insertions, 8 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 10a4b6cea0d1..6352c1dfa898 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2109,7 +2109,7 @@ static void release_pte_pages(pte_t *pte, pte_t *_pte)
 {
         while (--_pte >= pte) {
                 pte_t pteval = *_pte;
-                if (!pte_none(pteval))
+                if (!pte_none(pteval) && !is_zero_pfn(pte_pfn(pteval)))
                         release_pte_page(pte_page(pteval));
         }
 }
@@ -2120,13 +2120,13 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
 {
         struct page *page;
         pte_t *_pte;
-        int none = 0;
+        int none_or_zero = 0;
         bool referenced = false, writable = false;
         for (_pte = pte; _pte < pte+HPAGE_PMD_NR;
              _pte++, address += PAGE_SIZE) {
                 pte_t pteval = *_pte;
-                if (pte_none(pteval)) {
-                        if (++none <= khugepaged_max_ptes_none)
+                if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) {
+                        if (++none_or_zero <= khugepaged_max_ptes_none)
                                 continue;
                         else
                                 goto out;
@@ -2207,9 +2207,21 @@ static void __collapse_huge_page_copy(pte_t *pte, struct page *page,
                 pte_t pteval = *_pte;
                 struct page *src_page;
 
-                if (pte_none(pteval)) {
+                if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) {
                         clear_user_highpage(page, address);
                         add_mm_counter(vma->vm_mm, MM_ANONPAGES, 1);
+                        if (is_zero_pfn(pte_pfn(pteval))) {
+                                /*
+                                 * ptl mostly unnecessary.
+                                 */
+                                spin_lock(ptl);
+                                /*
+                                 * paravirt calls inside pte_clear here are
+                                 * superfluous.
+                                 */
+                                pte_clear(vma->vm_mm, address, _pte);
+                                spin_unlock(ptl);
+                        }
                 } else {
                         src_page = pte_page(pteval);
                         copy_user_highpage(page, src_page, address, vma);
@@ -2543,7 +2555,7 @@ static int khugepaged_scan_pmd(struct mm_struct *mm,
 {
         pmd_t *pmd;
         pte_t *pte, *_pte;
-        int ret = 0, none = 0;
+        int ret = 0, none_or_zero = 0;
         struct page *page;
         unsigned long _address;
         spinlock_t *ptl;
@@ -2561,8 +2573,8 @@ static int khugepaged_scan_pmd(struct mm_struct *mm,
         for (_address = address, _pte = pte; _pte < pte+HPAGE_PMD_NR;
              _pte++, _address += PAGE_SIZE) {
                 pte_t pteval = *_pte;
-                if (pte_none(pteval)) {
-                        if (++none <= khugepaged_max_ptes_none)
+                if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) {
+                        if (++none_or_zero <= khugepaged_max_ptes_none)
                                 continue;
                         else
                                 goto out_unmap;