mm: convert p[te|md]_numa users to p[te|md]_protnone_numa

Convert existing users of pte_numa and friends to the new helper.  Note
that the kernel is broken after this patch is applied until the other page
table modifiers are also altered.  This patch layout is to make review
easier.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Aneesh Kumar <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Dave Jones <davej@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kirill Shutemov <kirill.shutemov@linux.intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 28 deletions

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 33121662f08b..44ffa698484d 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -75,36 +75,18 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                 oldpte = *pte;
                 if (pte_present(oldpte)) {
                         pte_t ptent;
-                        bool updated = false;
 
-                        if (!prot_numa) {
-                                ptent = ptep_modify_prot_start(mm, addr, pte);
-                                if (pte_numa(ptent))
-                                        ptent = pte_mknonnuma(ptent);
-                                ptent = pte_modify(ptent, newprot);
-                                /*
-                                 * Avoid taking write faults for pages we
-                                 * know to be dirty.
-                                 */
-                                if (dirty_accountable && pte_dirty(ptent) &&
-                                    (pte_soft_dirty(ptent) ||
-                                     !(vma->vm_flags & VM_SOFTDIRTY)))
-                                        ptent = pte_mkwrite(ptent);
-                                ptep_modify_prot_commit(mm, addr, pte, ptent);
-                                updated = true;
-                        } else {
-                                struct page *page;
-
-                                page = vm_normal_page(vma, addr, oldpte);
-                                if (page && !PageKsm(page)) {
-                                        if (!pte_numa(oldpte)) {
-                                                ptep_set_numa(mm, addr, pte);
-                                                updated = true;
-                                        }
-                                }
+                        ptent = ptep_modify_prot_start(mm, addr, pte);
+                        ptent = pte_modify(ptent, newprot);
+
+                        /* Avoid taking write faults for known dirty pages */
+                        if (dirty_accountable && pte_dirty(ptent) &&
+                                        (pte_soft_dirty(ptent) ||
+                                         !(vma->vm_flags & VM_SOFTDIRTY))) {
+                                ptent = pte_mkwrite(ptent);
                         }
-                        if (updated)
-                                pages++;
+                        ptep_modify_prot_commit(mm, addr, pte, ptent);
+                        pages++;
                 } else if (IS_ENABLED(CONFIG_MIGRATION)) {
                         swp_entry_t entry = pte_to_swp_entry(oldpte);