|
@@ -2081,11 +2081,12 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
|
goto oom;
|
|
|
cow_user_page(new_page, old_page, address, vma);
|
|
|
}
|
|
|
- __SetPageUptodate(new_page);
|
|
|
|
|
|
if (mem_cgroup_try_charge(new_page, mm, GFP_KERNEL, &memcg))
|
|
|
goto oom_free_new;
|
|
|
|
|
|
+ __SetPageUptodate(new_page);
|
|
|
+
|
|
|
mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end);
|
|
|
|
|
|
/*
|
|
@@ -2689,6 +2690,10 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
|
page = alloc_zeroed_user_highpage_movable(vma, address);
|
|
|
if (!page)
|
|
|
goto oom;
|
|
|
+
|
|
|
+ if (mem_cgroup_try_charge(page, mm, GFP_KERNEL, &memcg))
|
|
|
+ goto oom_free_page;
|
|
|
+
|
|
|
/*
|
|
|
* The memory barrier inside __SetPageUptodate makes sure that
|
|
|
* preceeding stores to the page contents become visible before
|
|
@@ -2696,9 +2701,6 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
|
*/
|
|
|
__SetPageUptodate(page);
|
|
|
|
|
|
- if (mem_cgroup_try_charge(page, mm, GFP_KERNEL, &memcg))
|
|
|
- goto oom_free_page;
|
|
|
-
|
|
|
entry = mk_pte(page, vma->vm_page_prot);
|
|
|
if (vma->vm_flags & VM_WRITE)
|
|
|
entry = pte_mkwrite(pte_mkdirty(entry));
|