z3fold: simplify the zhdr initialization code in init_z3fold_page()

[linux-2.6-microblaze.git] / mm / khugepaged.c

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 67ab391..75e246f 100644 (file)
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -991,38 +991,41 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address,
 
 static bool __collapse_huge_page_swapin(struct mm_struct *mm,
                                        struct vm_area_struct *vma,
-                                       unsigned long address, pmd_t *pmd,
+                                       unsigned long haddr, pmd_t *pmd,
                                        int referenced)
 {
        int swapped_in = 0;
        vm_fault_t ret = 0;
-       struct vm_fault vmf = {
-               .vma = vma,
-               .address = address,
-               .flags = FAULT_FLAG_ALLOW_RETRY,
-               .pmd = pmd,
-               .pgoff = linear_page_index(vma, address),
-       };
-
-       vmf.pte = pte_offset_map(pmd, address);
-       for (; vmf.address < address + HPAGE_PMD_NR*PAGE_SIZE;
-                       vmf.pte++, vmf.address += PAGE_SIZE) {
+       unsigned long address, end = haddr + (HPAGE_PMD_NR * PAGE_SIZE);
+
+       for (address = haddr; address < end; address += PAGE_SIZE) {
+               struct vm_fault vmf = {
+                       .vma = vma,
+                       .address = address,
+                       .pgoff = linear_page_index(vma, haddr),
+                       .flags = FAULT_FLAG_ALLOW_RETRY,
+                       .pmd = pmd,
+               };
+
+               vmf.pte = pte_offset_map(pmd, address);
                vmf.orig_pte = *vmf.pte;
-               if (!is_swap_pte(vmf.orig_pte))
+               if (!is_swap_pte(vmf.orig_pte)) {
+                       pte_unmap(vmf.pte);
                        continue;
+               }
                swapped_in++;
                ret = do_swap_page(&vmf);
 
                /* do_swap_page returns VM_FAULT_RETRY with released mmap_lock */
                if (ret & VM_FAULT_RETRY) {
                        mmap_read_lock(mm);
-                       if (hugepage_vma_revalidate(mm, address, &vmf.vma)) {
+                       if (hugepage_vma_revalidate(mm, haddr, &vma)) {
                                /* vma is no longer available, don't continue to swapin */
                                trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);
                                return false;
                        }
                        /* check if the pmd is still valid */
-                       if (mm_find_pmd(mm, address) != pmd) {
+                       if (mm_find_pmd(mm, haddr) != pmd) {
                                trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);
                                return false;
                        }
@@ -1031,11 +1034,7 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm,
                        trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);
                        return false;
                }
-               /* pte is unmapped now, we need to map it */
-               vmf.pte = pte_offset_map(pmd, vmf.address);
        }
-       vmf.pte--;
-       pte_unmap(vmf.pte);
 
        /* Drain LRU add pagevec to remove extra pin on the swapped in pages */
        if (swapped_in)
@@ -1644,6 +1643,7 @@ static void collapse_file(struct mm_struct *mm,
        XA_STATE_ORDER(xas, &mapping->i_pages, start, HPAGE_PMD_ORDER);
        int nr_none = 0, result = SCAN_SUCCEED;
        bool is_shmem = shmem_file(file);
+       int nr;
 
        VM_BUG_ON(!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && !is_shmem);
        VM_BUG_ON(start & (HPAGE_PMD_NR - 1));
@@ -1855,11 +1855,12 @@ out_unlock:
                put_page(page);
                goto xa_unlocked;
        }
+       nr = thp_nr_pages(new_page);
 
        if (is_shmem)
-               __inc_lruvec_page_state(new_page, NR_SHMEM_THPS);
+               __mod_lruvec_page_state(new_page, NR_SHMEM_THPS, nr);
        else {
-               __inc_lruvec_page_state(new_page, NR_FILE_THPS);
+               __mod_lruvec_page_state(new_page, NR_FILE_THPS, nr);
                filemap_nr_thps_inc(mapping);
        }