diff options
author | Mel Gorman <mgorman@suse.de> | 2015-02-12 17:58:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 21:54:08 -0500 |
commit | e7bb4b6d1609cce391af1e7bc6f31d14f1a3a890 (patch) | |
tree | a6c5101e1b4cd9c9f0de605723b7c378b0c028d7 | |
parent | 5d833062139d290adb8b62c093b654a01a353448 (diff) |
mm: add p[te|md] protnone helpers for use by NUMA balancing
This is a preparatory patch that introduces protnone helpers for automatic
NUMA balancing.
Signed-off-by: Mel Gorman <mgorman@suse.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Tested-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/powerpc/include/asm/pgtable.h | 16 | ||||
-rw-r--r-- | arch/x86/include/asm/pgtable.h | 16 | ||||
-rw-r--r-- | include/asm-generic/pgtable.h | 20 |
3 files changed, 52 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index 7e77f2ca5132..1146006d3477 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h | |||
@@ -40,6 +40,22 @@ static inline int pte_none(pte_t pte) { return (pte_val(pte) & ~_PTE_NONE_MASK) | |||
40 | static inline pgprot_t pte_pgprot(pte_t pte) { return __pgprot(pte_val(pte) & PAGE_PROT_BITS); } | 40 | static inline pgprot_t pte_pgprot(pte_t pte) { return __pgprot(pte_val(pte) & PAGE_PROT_BITS); } |
41 | 41 | ||
42 | #ifdef CONFIG_NUMA_BALANCING | 42 | #ifdef CONFIG_NUMA_BALANCING |
43 | /* | ||
44 | * These work without NUMA balancing but the kernel does not care. See the | ||
45 | * comment in include/asm-generic/pgtable.h . On powerpc, this will only | ||
46 | * work for user pages and always return true for kernel pages. | ||
47 | */ | ||
48 | static inline int pte_protnone(pte_t pte) | ||
49 | { | ||
50 | return (pte_val(pte) & | ||
51 | (_PAGE_PRESENT | _PAGE_USER)) == _PAGE_PRESENT; | ||
52 | } | ||
53 | |||
54 | static inline int pmd_protnone(pmd_t pmd) | ||
55 | { | ||
56 | return pte_protnone(pmd_pte(pmd)); | ||
57 | } | ||
58 | |||
43 | static inline int pte_present(pte_t pte) | 59 | static inline int pte_present(pte_t pte) |
44 | { | 60 | { |
45 | return pte_val(pte) & _PAGE_NUMA_MASK; | 61 | return pte_val(pte) & _PAGE_NUMA_MASK; |
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 0fe03f834fb1..f519b0b529dd 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h | |||
@@ -483,6 +483,22 @@ static inline int pmd_present(pmd_t pmd) | |||
483 | _PAGE_NUMA); | 483 | _PAGE_NUMA); |
484 | } | 484 | } |
485 | 485 | ||
486 | #ifdef CONFIG_NUMA_BALANCING | ||
487 | /* | ||
488 | * These work without NUMA balancing but the kernel does not care. See the | ||
489 | * comment in include/asm-generic/pgtable.h | ||
490 | */ | ||
491 | static inline int pte_protnone(pte_t pte) | ||
492 | { | ||
493 | return pte_flags(pte) & _PAGE_PROTNONE; | ||
494 | } | ||
495 | |||
496 | static inline int pmd_protnone(pmd_t pmd) | ||
497 | { | ||
498 | return pmd_flags(pmd) & _PAGE_PROTNONE; | ||
499 | } | ||
500 | #endif /* CONFIG_NUMA_BALANCING */ | ||
501 | |||
486 | static inline int pmd_none(pmd_t pmd) | 502 | static inline int pmd_none(pmd_t pmd) |
487 | { | 503 | { |
488 | /* Only check low word on 32-bit platforms, since it might be | 504 | /* Only check low word on 32-bit platforms, since it might be |
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 129de9204d18..067922c06c29 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h | |||
@@ -673,6 +673,26 @@ static inline int pmd_trans_unstable(pmd_t *pmd) | |||
673 | #endif | 673 | #endif |
674 | } | 674 | } |
675 | 675 | ||
676 | #ifndef CONFIG_NUMA_BALANCING | ||
677 | /* | ||
678 | * Technically a PTE can be PROTNONE even when not doing NUMA balancing but | ||
679 | * the only case the kernel cares is for NUMA balancing and is only ever set | ||
680 | * when the VMA is accessible. For PROT_NONE VMAs, the PTEs are not marked | ||
681 | * _PAGE_PROTNONE so by by default, implement the helper as "always no". It | ||
682 | * is the responsibility of the caller to distinguish between PROT_NONE | ||
683 | * protections and NUMA hinting fault protections. | ||
684 | */ | ||
685 | static inline int pte_protnone(pte_t pte) | ||
686 | { | ||
687 | return 0; | ||
688 | } | ||
689 | |||
690 | static inline int pmd_protnone(pmd_t pmd) | ||
691 | { | ||
692 | return 0; | ||
693 | } | ||
694 | #endif /* CONFIG_NUMA_BALANCING */ | ||
695 | |||
676 | #ifdef CONFIG_NUMA_BALANCING | 696 | #ifdef CONFIG_NUMA_BALANCING |
677 | /* | 697 | /* |
678 | * _PAGE_NUMA distinguishes between an unmapped page table entry, an entry that | 698 | * _PAGE_NUMA distinguishes between an unmapped page table entry, an entry that |