Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 46dcde735c9d8953bbd8d105ca6779e5b5300c28

Authored by Gerald Schaefer
Committed by Linus Torvalds
1 parent e3ebcf6438
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

thp: introduce pmdp_invalidate() 

On s390, a valid page table entry must not be changed while it is attached
to any CPU.  So instead of pmd_mknotpresent() and set_pmd_at(), an IDTE
operation would be necessary there.  This patch introduces the
pmdp_invalidate() function, to allow architecture-specific
implementations.

Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Hillf Danton <dhillf@gmail.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>

Showing 3 changed files with 17 additions and 2 deletions Side-by-side Diff

include/asm-generic/pgtable.h
Diff comments   View file @ 46dcde7
... ... @@ -170,6 +170,11 @@
170 170 extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm);
171 171 #endif
172 172  
  173 +#ifndef __HAVE_ARCH_PMDP_INVALIDATE
  174 +extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
  175 + pmd_t *pmdp);
  176 +#endif
  177 +
173 178 #ifndef __HAVE_ARCH_PTE_SAME
174 179 static inline int pte_same(pte_t pte_a, pte_t pte_b)
175 180 {
... ... @@ -1361,8 +1361,7 @@
1361 1361 * SMP TLB and finally we write the non-huge version
1362 1362 * of the pmd entry with pmd_populate.
1363 1363 */
1364   - set_pmd_at(mm, address, pmd, pmd_mknotpresent(*pmd));
1365   - flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
  1364 + pmdp_invalidate(vma, address, pmd);
1366 1365 pmd_populate(mm, pmd, pgtable);
1367 1366 ret = 1;
1368 1367 }
mm/pgtable-generic.c
Diff comments   View file @ 46dcde7
... ... @@ -159,4 +159,15 @@
159 159 }
160 160 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
161 161 #endif
  162 +
  163 +#ifndef __HAVE_ARCH_PMDP_INVALIDATE
  164 +#ifdef CONFIG_TRANSPARENT_HUGEPAGE
  165 +void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
  166 + pmd_t *pmdp)
  167 +{
  168 + set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(*pmdp));
  169 + flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
  170 +}
  171 +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
  172 +#endif