2 files changed, 10 insertions, 6 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index e2f7f5aaaafb..45eaae030628 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -713,6 +713,11 @@ static int __do_huge_pmd_anonymous_page(struct mm_struct *mm,
                return VM_FAULT_OOM;
        clear_huge_page(page, haddr, HPAGE_PMD_NR);
+        /*
+         * The memory barrier inside __SetPageUptodate makes sure that
+         * clear_huge_page writes become visible before the set_pmd_at()
+         * write.
+         */
        __SetPageUptodate(page);
        spin_lock(&mm->page_table_lock);
@@ -724,12 +729,6 @@ static int __do_huge_pmd_anonymous_page(struct mm_struct *mm,
        } else {
                pmd_t entry;
                entry = mk_huge_pmd(page, vma);
-                /*
-                 * The spinlocking to take the lru_lock inside
-                 * page_add_new_anon_rmap() acts as a full memory
-                 * barrier to be sure clear_huge_page writes become
-                 * visible after the set_pmd_at() write.
-                 */
                page_add_new_anon_rmap(page, vma, haddr);
                set_pmd_at(mm, haddr, pmd, entry);
                pgtable_trans_huge_deposit(mm, pgtable);
diff --git a/mm/memory.c b/mm/memory.c
index ba94dec5b259..f7a1fba85d14 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3244,6 +3244,11 @@ 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;
+        /*
+         * The memory barrier inside __SetPageUptodate makes sure that
+         * preceeding stores to the page contents become visible before
+         * the set_pte_at() write.
+         */
        __SetPageUptodate(page);
        if (mem_cgroup_newpage_charge(page, mm, GFP_KERNEL))