1 files changed, 24 insertions, 17 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 5c55270729f7..6d7648773dc4 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2049,6 +2049,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
         struct page *dirty_page = NULL;
         unsigned long mmun_start = 0;   /* For mmu_notifiers */
         unsigned long mmun_end = 0;     /* For mmu_notifiers */
+        struct mem_cgroup *memcg;
 
         old_page = vm_normal_page(vma, address, orig_pte);
         if (!old_page) {
@@ -2204,7 +2205,7 @@ gotten:
         }
         __SetPageUptodate(new_page);
 
-        if (mem_cgroup_charge_anon(new_page, mm, GFP_KERNEL))
+        if (mem_cgroup_try_charge(new_page, mm, GFP_KERNEL, &memcg))
                 goto oom_free_new;
 
         mmun_start  = address & PAGE_MASK;
@@ -2234,6 +2235,8 @@ gotten:
                  */
                 ptep_clear_flush(vma, address, page_table);
                 page_add_new_anon_rmap(new_page, vma, address);
+                mem_cgroup_commit_charge(new_page, memcg, false);
+                lru_cache_add_active_or_unevictable(new_page, vma);
                 /*
                  * We call the notify macro here because, when using secondary
                  * mmu page tables (such as kvm shadow page tables), we want the
@@ -2271,7 +2274,7 @@ gotten:
                 new_page = old_page;
                 ret |= VM_FAULT_WRITE;
         } else
-                mem_cgroup_uncharge_page(new_page);
+                mem_cgroup_cancel_charge(new_page, memcg);
 
         if (new_page)
                 page_cache_release(new_page);
@@ -2410,10 +2413,10 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 {
         spinlock_t *ptl;
         struct page *page, *swapcache;
+        struct mem_cgroup *memcg;
         swp_entry_t entry;
         pte_t pte;
         int locked;
-        struct mem_cgroup *ptr;
         int exclusive = 0;
         int ret = 0;
 
@@ -2489,7 +2492,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 goto out_page;
         }
 
-        if (mem_cgroup_try_charge_swapin(mm, page, GFP_KERNEL, &ptr)) {
+        if (mem_cgroup_try_charge(page, mm, GFP_KERNEL, &memcg)) {
                 ret = VM_FAULT_OOM;
                 goto out_page;
         }
@@ -2514,10 +2517,6 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
          * while the page is counted on swap but not yet in mapcount i.e.
          * before page_add_anon_rmap() and swap_free(); try_to_free_swap()
          * must be called after the swap_free(), or it will never succeed.
-         * Because delete_from_swap_page() may be called by reuse_swap_page(),
-         * mem_cgroup_commit_charge_swapin() may not be able to find swp_entry
-         * in page->private. In this case, a record in swap_cgroup  is silently
-         * discarded at swap_free().
          */
 
         inc_mm_counter_fast(mm, MM_ANONPAGES);
@@ -2533,12 +2532,14 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
         if (pte_swp_soft_dirty(orig_pte))
                 pte = pte_mksoft_dirty(pte);
         set_pte_at(mm, address, page_table, pte);
-        if (page == swapcache)
+        if (page == swapcache) {
                 do_page_add_anon_rmap(page, vma, address, exclusive);
-        else /* ksm created a completely new copy */
+                mem_cgroup_commit_charge(page, memcg, true);
+        } else { /* ksm created a completely new copy */
                 page_add_new_anon_rmap(page, vma, address);
-        /* It's better to call commit-charge after rmap is established */
-        mem_cgroup_commit_charge_swapin(page, ptr);
+                mem_cgroup_commit_charge(page, memcg, false);
+                lru_cache_add_active_or_unevictable(page, vma);
+        }
 
         swap_free(entry);
         if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
@@ -2571,7 +2572,7 @@ unlock:
 out:
         return ret;
 out_nomap:
-        mem_cgroup_cancel_charge_swapin(ptr);
+        mem_cgroup_cancel_charge(page, memcg);
         pte_unmap_unlock(page_table, ptl);
 out_page:
         unlock_page(page);
@@ -2627,6 +2628,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 unsigned long address, pte_t *page_table, pmd_t *pmd,
                 unsigned int flags)
 {
+        struct mem_cgroup *memcg;
         struct page *page;
         spinlock_t *ptl;
         pte_t entry;
@@ -2660,7 +2662,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
          */
         __SetPageUptodate(page);
 
-        if (mem_cgroup_charge_anon(page, mm, GFP_KERNEL))
+        if (mem_cgroup_try_charge(page, mm, GFP_KERNEL, &memcg))
                 goto oom_free_page;
 
         entry = mk_pte(page, vma->vm_page_prot);
@@ -2673,6 +2675,8 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
         inc_mm_counter_fast(mm, MM_ANONPAGES);
         page_add_new_anon_rmap(page, vma, address);
+        mem_cgroup_commit_charge(page, memcg, false);
+        lru_cache_add_active_or_unevictable(page, vma);
 setpte:
         set_pte_at(mm, address, page_table, entry);
 
@@ -2682,7 +2686,7 @@ unlock:
         pte_unmap_unlock(page_table, ptl);
         return 0;
 release:
-        mem_cgroup_uncharge_page(page);
+        mem_cgroup_cancel_charge(page, memcg);
         page_cache_release(page);
         goto unlock;
 oom_free_page:
@@ -2919,6 +2923,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                 pgoff_t pgoff, unsigned int flags, pte_t orig_pte)
 {
         struct page *fault_page, *new_page;
+        struct mem_cgroup *memcg;
         spinlock_t *ptl;
         pte_t *pte;
         int ret;
@@ -2930,7 +2935,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
         if (!new_page)
                 return VM_FAULT_OOM;
 
-        if (mem_cgroup_charge_anon(new_page, mm, GFP_KERNEL)) {
+        if (mem_cgroup_try_charge(new_page, mm, GFP_KERNEL, &memcg)) {
                 page_cache_release(new_page);
                 return VM_FAULT_OOM;
         }
@@ -2950,12 +2955,14 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                 goto uncharge_out;
         }
         do_set_pte(vma, address, new_page, pte, true, true);
+        mem_cgroup_commit_charge(new_page, memcg, false);
+        lru_cache_add_active_or_unevictable(new_page, vma);
         pte_unmap_unlock(pte, ptl);
         unlock_page(fault_page);
         page_cache_release(fault_page);
         return ret;
 uncharge_out:
-        mem_cgroup_uncharge_page(new_page);
+        mem_cgroup_cancel_charge(new_page, memcg);
         page_cache_release(new_page);
         return ret;
 }