mm/hugetlb: add more arch-defined huge_pte functions

Commit abf09bed3cce ("s390/mm: implement software dirty bits")
introduced another difference in the pte layout vs.  the pmd layout on
s390, thoroughly breaking the s390 support for hugetlbfs.  This requires
replacing some more pte_xxx functions in mm/hugetlbfs.c with a
huge_pte_xxx version.

This patch introduces those huge_pte_xxx functions and their generic
implementation in asm-generic/hugetlb.h, which will now be included on
all architectures supporting hugetlbfs apart from s390.  This change
will be a no-op for those architectures.

[akpm@linux-foundation.org: fix warning]
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Hugh Dickins <hughd@google.com>
Cc: Hillf Danton <dhillf@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.cz>	[for !s390 parts]
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 13 insertions, 11 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1a12f5b9a0ab..73b864a32017 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2247,10 +2247,11 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page,
         pte_t entry;
 
         if (writable) {
-                entry =
-                    pte_mkwrite(pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
+                entry = huge_pte_mkwrite(huge_pte_mkdirty(mk_huge_pte(page,
+                                         vma->vm_page_prot)));
         } else {
-                entry = huge_pte_wrprotect(mk_pte(page, vma->vm_page_prot));
+                entry = huge_pte_wrprotect(mk_huge_pte(page,
+                                           vma->vm_page_prot));
         }
         entry = pte_mkyoung(entry);
         entry = pte_mkhuge(entry);
@@ -2264,7 +2265,7 @@ static void set_huge_ptep_writable(struct vm_area_struct *vma,
 {
         pte_t entry;
 
-        entry = pte_mkwrite(pte_mkdirty(huge_ptep_get(ptep)));
+        entry = huge_pte_mkwrite(huge_pte_mkdirty(huge_ptep_get(ptep)));
         if (huge_ptep_set_access_flags(vma, address, ptep, entry, 1))
                 update_mmu_cache(vma, address, ptep);
 }
@@ -2379,7 +2380,7 @@ again:
                  * HWPoisoned hugepage is already unmapped and dropped reference
                  */
                 if (unlikely(is_hugetlb_entry_hwpoisoned(pte))) {
-                        pte_clear(mm, address, ptep);
+                        huge_pte_clear(mm, address, ptep);
                         continue;
                 }
 
@@ -2403,7 +2404,7 @@ again:
 
                 pte = huge_ptep_get_and_clear(mm, address, ptep);
                 tlb_remove_tlb_entry(tlb, ptep, address);
-                if (pte_dirty(pte))
+                if (huge_pte_dirty(pte))
                         set_page_dirty(page);
 
                 page_remove_rmap(page);
@@ -2856,7 +2857,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
          * page now as it is used to determine if a reservation has been
          * consumed.
          */
-        if ((flags & FAULT_FLAG_WRITE) && !pte_write(entry)) {
+        if ((flags & FAULT_FLAG_WRITE) && !huge_pte_write(entry)) {
                 if (vma_needs_reservation(h, vma, address) < 0) {
                         ret = VM_FAULT_OOM;
                         goto out_mutex;
@@ -2886,12 +2887,12 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 
 
         if (flags & FAULT_FLAG_WRITE) {
-                if (!pte_write(entry)) {
+                if (!huge_pte_write(entry)) {
                         ret = hugetlb_cow(mm, vma, address, ptep, entry,
                                                         pagecache_page);
                         goto out_page_table_lock;
                 }
-                entry = pte_mkdirty(entry);
+                entry = huge_pte_mkdirty(entry);
         }
         entry = pte_mkyoung(entry);
         if (huge_ptep_set_access_flags(vma, address, ptep, entry,
@@ -2972,7 +2973,8 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
                  * directly from any kind of swap entries.
                  */
                 if (absent || is_swap_pte(huge_ptep_get(pte)) ||
-                    ((flags & FOLL_WRITE) && !pte_write(huge_ptep_get(pte)))) {
+                    ((flags & FOLL_WRITE) &&
+                      !huge_pte_write(huge_ptep_get(pte)))) {
                         int ret;
 
                         spin_unlock(&mm->page_table_lock);
@@ -3042,7 +3044,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
                 }
                 if (!huge_pte_none(huge_ptep_get(ptep))) {
                         pte = huge_ptep_get_and_clear(mm, address, ptep);
-                        pte = pte_mkhuge(pte_modify(pte, newprot));
+                        pte = pte_mkhuge(huge_pte_modify(pte, newprot));
                         pte = arch_make_huge_pte(pte, vma, NULL, 0);
                         set_huge_pte_at(mm, address, ptep, pte);
                         pages++;