x86: make mm/gup.c more virtualization friendly
PATCH 1/1 x86: make mm/gup.c more virtualization friendly
Since pte_flags() is much cheaper than pte_val() in some virtualized environments (namely, Xen), use the former whereever possible.
Signed-off-by Jan Beulich <[email protected]>
Cc Nick Piggin <[email protected]>
--- arch/x86/mm/gup.c | 10 +++++----- include/asm-x86/pgtable.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/mm/gup.c +5 -5
@@ -82,7 +82,7 @@ static noinline int gup_pte_range(pmd_tpte_t pte =gup_get_pte (ptep);struct page *page; -if ((pte_val (pte) & (mask | _PAGE_SPECIAL)) != mask) { +if ((pte_flags (pte) & (mask | _PAGE_SPECIAL)) != mask) {pte_unmap (ptep);return 0 ; }
@@ -116,10 +116,10 @@ static noinline int gup_huge_pmd(pmd_t p mask = _PAGE_PRESENT|_PAGE_USER;if (write) mask |= _PAGE_RW; -if ((pte_val (pte) & mask) != mask) +if ((pte_flags (pte) & mask) != mask)return 0 ;/* hugepages are never "special" */ -VM_BUG_ON (pte_val (pte) & _PAGE_SPECIAL); +VM_BUG_ON (pte_flags (pte) & _PAGE_SPECIAL);VM_BUG_ON (!pfn_valid (pte_pfn (pte))); refs =0 ;
@@ -173,10 +173,10 @@ static noinline int gup_huge_pud(pud_t p mask = _PAGE_PRESENT|_PAGE_USER;if (write) mask |= _PAGE_RW; -if ((pte_val (pte) & mask) != mask) +if ((pte_flags (pte) & mask) != mask)return 0 ;/* hugepages are never "special" */ -VM_BUG_ON (pte_val (pte) & _PAGE_SPECIAL); +VM_BUG_ON (pte_flags (pte) & _PAGE_SPECIAL);VM_BUG_ON (!pfn_valid (pte_pfn (pte))); refs =0 ;
include/asm-x86/pgtable.h +1 -1
@@ -183,7 +183,7 @@ static inline int pte_exec(pte_t pte)static inline int pte_special (pte_t pte) { -return pte_val (pte) & _PAGE_SPECIAL; +return pte_flags (pte) & _PAGE_SPECIAL; }static inline int pmd_large (pmd_t pte)
Ingo Molnar
AppliedQuoted 5 lines · Jan Beulich
Since
pte_flags()is much cheaper thanpte_val()in some virtualized environments (namely, Xen), use the former whereever possible.Signed-off-by Jan Beulich <[email protected]>Cc Nick Piggin <[email protected]>
applied to tip/x86/core, thanks Jan.
Ingo
No objections from me.
Quoted 61 lines · Jan Beulich
Since
pte_flags()is much cheaper thanpte_val()in some virtualized environments (namely, Xen), use the former whereever possible.Signed-off-by Jan Beulich <[email protected]>Cc Nick Piggin <[email protected]>--- arch/x86/mm/gup.c | 10 +++++----- include/asm-x86/pgtable.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)arch/x86/mm/gup.c +5
-5@@ -82,7 +82,7 @@ static noinline int gup_pte_range(pmd_tpte_t pte =gup_get_pte (ptep);struct page *page; -if ((pte_val (pte) & (mask | _PAGE_SPECIAL)) != mask) { +if ((pte_flags (pte) & (mask | _PAGE_SPECIAL)) != mask) {pte_unmap (ptep);return 0 ; }@@ -116,10 +116,10 @@ static noinline int gup_huge_pmd(pmd_t p mask = _PAGE_PRESENT|_PAGE_USER;if (write) mask |= _PAGE_RW; -if ((pte_val (pte) & mask) != mask) +if ((pte_flags (pte) & mask) != mask)return 0 ;/* hugepages are never "special" */ -VM_BUG_ON (pte_val (pte) & _PAGE_SPECIAL); +VM_BUG_ON (pte_flags (pte) & _PAGE_SPECIAL);VM_BUG_ON (!pfn_valid (pte_pfn (pte))); refs =0 ;@@ -173,10 +173,10 @@ static noinline int gup_huge_pud(pud_t p mask = _PAGE_PRESENT|_PAGE_USER;if (write) mask |= _PAGE_RW; -if ((pte_val (pte) & mask) != mask) +if ((pte_flags (pte) & mask) != mask)return 0 ;/* hugepages are never "special" */ -VM_BUG_ON (pte_val (pte) & _PAGE_SPECIAL); +VM_BUG_ON (pte_flags (pte) & _PAGE_SPECIAL);VM_BUG_ON (!pfn_valid (pte_pfn (pte))); refs =0 ;include/asm-x86/pgtable.h +1
-1@@ -183,7 +183,7 @@ static inline int pte_exec(pte_t pte)static inline int pte_special (pte_t pte) { -return pte_val (pte) & _PAGE_SPECIAL; +return pte_flags (pte) & _PAGE_SPECIAL; }static inline int pmd_large (pmd_t pte)