x86/32: no need to use set_pte_present in set_pte_vaddr
Subsystems (5)
PATCH 1/2 x86/32: no need to use set_pte_present in set_pte_vaddr
From: Jeremy Fitzhardinge <[email protected]>
Impact: cleanup, remove last user of set_pte_present
set_pte_vaddr() is only used to install ptes in fixmaps, and should never be used to overwrite a present mapping.
--- arch/x86/mm/pgtable_32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/mm/pgtable_32.c +1 -1
@@ -50,7 +50,7 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval) } pte =pte_offset_kernel (pmd, vaddr);if (pte_val (pteval)) -set_pte_present (&init_mm, vaddr, pte, pteval); +set_pte_at (&init_mm, vaddr, pte, pteval);else pte_clear (&init_mm, vaddr, pte);
Signature · 1 line
1.6.0.6
PATCH 2/2 x86: with the last user gone, remove set_pte_present
From: Jeremy Fitzhardinge <[email protected]>
Impact: cleanup
set_pte_present() is no longer used, directly or indirectly, so remove it.
--- arch/x86/include/asm/paravirt.h | 15 --------------- arch/x86/include/asm/pgtable-2level.h | 7 ------- arch/x86/include/asm/pgtable-3level.h | 17 ----------------- arch/x86/include/asm/pgtable.h | 2 -- arch/x86/kernel/kvm.c | 7 ------- arch/x86/kernel/paravirt.c | 1 - arch/x86/kernel/vmi_32.c | 6 ------ arch/x86/xen/mmu.c | 1 - 8 files changed, 0 insertions(+), 56 deletions(-)
arch/x86/include/asm/paravirt.h +0 -15
@@ -321,8 +321,6 @@ struct pv_mmu_ops {#if PAGETABLE_LEVELS >=3 #ifdef CONFIG_X86_PAE void (*set_pte_atomic)(pte_t *ptep,pte_t pteval); -void (*set_pte_present)(struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pte);void (*pte_clear)(struct mm_struct *mm,unsigned long addr,pte_t *ptep);void (*pmd_clear)(pmd_t *pmdp);
@@ -1376,13 +1374,6 @@ static inline void set_pte_atomic(pte_t *ptep, pte_t pte) pte.pte, pte.pte >> 32); } -static inline void set_pte_present (struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pte) -{ -/* 5 arg words */ - pv_mmu_ops.set_pte_present (mm, addr, ptep, pte); -} -static inline void pte_clear (struct mm_struct *mm,unsigned long addr,pte_t *ptep) {
@@ -1399,12 +1390,6 @@ static inline void set_pte_atomic(pte_t *ptep, pte_t pte)set_pte (ptep, pte); } -static inline void set_pte_present (struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pte) -{ -set_pte (ptep, pte); -} -static inline void pte_clear (struct mm_struct *mm,unsigned long addr,pte_t *ptep) {
arch/x86/include/asm/pgtable-2level.h +0 -7
@@ -26,13 +26,6 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)native_set_pte (ptep, pte); } -static inline void native_set_pte_present (struct mm_struct *mm, -unsigned long addr, -pte_t *ptep,pte_t pte) -{ -native_set_pte (ptep, pte); -} -static inline void native_pmd_clear (pmd_t *pmdp) {native_set_pmd (pmdp,__pmd (0 ));
arch/x86/include/asm/pgtable-3level.h +0 -17
@@ -31,23 +31,6 @@ static inline void native_set_pte(pte_t *ptep, pte_t pte) ptep->pte_low = pte.pte_low; } -/* -* Since this is only called on user PTEs, and the page fault handler -* must handle the already racy situation of simultaneous page faults, -* we are justified in merely clearing the PTE present bit, followed -* by a set. The ordering here is important. -*/ -static inline void native_set_pte_present (struct mm_struct *mm, -unsigned long addr, -pte_t *ptep,pte_t pte) -{ - ptep->pte_low =0 ; -smp_wmb (); - ptep->pte_high = pte.pte_high; -smp_wmb (); - ptep->pte_low = pte.pte_low; -} -static inline void native_set_pte_atomic (pte_t *ptep,pte_t pte) {set_64bit ((unsigned long long *)(ptep),native_pte_val (pte));
arch/x86/include/asm/pgtable.h +0 -2
@@ -31,8 +31,6 @@ extern struct list_head pgd_list;#define set_pte (ptep, pte) native_set_pte(ptep, pte)#define set_pte_at (mm, addr, ptep, pte) native_set_pte_at(mm, addr, ptep, pte) -#define set_pte_present (mm, addr, ptep, pte) \ - native_set_pte_present(mm, addr, ptep, pte)#define set_pte_atomic (ptep, pte) \ native_set_pte_atomic(ptep, pte)
arch/x86/kernel/kvm.c +0 -7
@@ -138,12 +138,6 @@ static void kvm_set_pte_atomic(pte_t *ptep, pte_t pte)kvm_mmu_write (ptep,pte_val (pte)); } -static void kvm_set_pte_present (struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pte) -{ -kvm_mmu_write (ptep,pte_val (pte)); -} -static void kvm_pte_clear (struct mm_struct *mm,unsigned long addr,pte_t *ptep) {
@@ -220,7 +214,6 @@ static void paravirt_ops_setup(void)#if PAGETABLE_LEVELS >=3 #ifdef CONFIG_X86_PAE pv_mmu_ops.set_pte_atomic = kvm_set_pte_atomic; - pv_mmu_ops.set_pte_present = kvm_set_pte_present; pv_mmu_ops.pte_clear = kvm_pte_clear; pv_mmu_ops.pmd_clear = kvm_pmd_clear;#endif
arch/x86/kernel/paravirt.c +0 -1
@@ -467,7 +467,6 @@ struct pv_mmu_ops pv_mmu_ops = {#if PAGETABLE_LEVELS >=3 #ifdef CONFIG_X86_PAE .set_pte_atomic = native_set_pte_atomic, - .set_pte_present = native_set_pte_present, .pte_clear = native_pte_clear, .pmd_clear = native_pmd_clear,#endif
arch/x86/kernel/vmi_32.c +0 -6
@@ -395,11 +395,6 @@ static void vmi_set_pte_atomic(pte_t *ptep, pte_t pteval) vmi_ops.update_pte (ptep,VMI_PAGE_PT ); } -static void vmi_set_pte_present (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pte) -{ - vmi_ops.set_pte (pte, ptep,vmi_flags_addr_defer (mm, addr,VMI_PAGE_PT ,1 )); -} -static void vmi_set_pud (pud_t *pudp,pud_t pudval) {/* Um, eww */
@@ -756,7 +751,6 @@ static inline int __init activate_vmi(void) pv_mmu_ops.set_pmd = vmi_set_pmd;#ifdef CONFIG_X86_PAE pv_mmu_ops.set_pte_atomic = vmi_set_pte_atomic; - pv_mmu_ops.set_pte_present = vmi_set_pte_present; pv_mmu_ops.set_pud = vmi_set_pud; pv_mmu_ops.pte_clear = vmi_pte_clear; pv_mmu_ops.pmd_clear = vmi_pmd_clear;
arch/x86/xen/mmu.c +0 -1
@@ -2101,7 +2101,6 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {#ifdef CONFIG_X86_PAE .set_pte_atomic = xen_set_pte_atomic, - .set_pte_present = xen_set_pte_at, .pte_clear = xen_pte_clear, .pmd_clear = xen_pmd_clear,#endif /* CONFIG_X86_PAE */
Signature · 1 line
1.6.0.6
[tip:x86/mm] x86: with the last user gone, remove set_pte_present
Commit-ID: 71ff49d71bb5cfcd2689b54cb433c0e6990a1d86 Gitweb: http://git.kernel.org/tip/71ff49d71bb5cfcd2689b54cb433c0e6990a1d86 Author: Jeremy Fitzhardinge <[email protected]> AuthorDate: Wed, 18 Mar 2009 13:03:33 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 19 Mar 2009 14:04:19 +0100
x86: with the last user gone, remove set_pte_present
Impact: cleanup
set_pte_present() is no longer used, directly or indirectly, so remove it.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/paravirt.h | 15 --------------- arch/x86/include/asm/pgtable-2level.h | 7 ------- arch/x86/include/asm/pgtable-3level.h | 17 ----------------- arch/x86/include/asm/pgtable.h | 2 -- arch/x86/kernel/kvm.c | 7 ------- arch/x86/kernel/paravirt.c | 1 - arch/x86/kernel/vmi_32.c | 6 ------ arch/x86/xen/mmu.c | 1 - 8 files changed, 0 insertions(+), 56 deletions(-)
arch/x86/include/asm/paravirt.h +0 -15
@@ -317,8 +317,6 @@ struct pv_mmu_ops {#if PAGETABLE_LEVELS >=3 #ifdef CONFIG_X86_PAE void (*set_pte_atomic)(pte_t *ptep,pte_t pteval); -void (*set_pte_present)(struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pte);void (*pte_clear)(struct mm_struct *mm,unsigned long addr,pte_t *ptep);void (*pmd_clear)(pmd_t *pmdp);
@@ -1365,13 +1363,6 @@ static inline void set_pte_atomic(pte_t *ptep, pte_t pte) pte.pte, pte.pte >> 32); } -static inline void set_pte_present (struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pte) -{ -/* 5 arg words */ - pv_mmu_ops.set_pte_present (mm, addr, ptep, pte); -} -static inline void pte_clear (struct mm_struct *mm,unsigned long addr,pte_t *ptep) {
@@ -1388,12 +1379,6 @@ static inline void set_pte_atomic(pte_t *ptep, pte_t pte)set_pte (ptep, pte); } -static inline void set_pte_present (struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pte) -{ -set_pte (ptep, pte); -} -static inline void pte_clear (struct mm_struct *mm,unsigned long addr,pte_t *ptep) {
arch/x86/include/asm/pgtable-2level.h +0 -7
@@ -26,13 +26,6 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)native_set_pte (ptep, pte); } -static inline void native_set_pte_present (struct mm_struct *mm, -unsigned long addr, -pte_t *ptep,pte_t pte) -{ -native_set_pte (ptep, pte); -} -static inline void native_pmd_clear (pmd_t *pmdp) {native_set_pmd (pmdp,__pmd (0 ));
arch/x86/include/asm/pgtable-3level.h +0 -17
@@ -31,23 +31,6 @@ static inline void native_set_pte(pte_t *ptep, pte_t pte) ptep->pte_low = pte.pte_low; } -/* -* Since this is only called on user PTEs, and the page fault handler -* must handle the already racy situation of simultaneous page faults, -* we are justified in merely clearing the PTE present bit, followed -* by a set. The ordering here is important. -*/ -static inline void native_set_pte_present (struct mm_struct *mm, -unsigned long addr, -pte_t *ptep,pte_t pte) -{ - ptep->pte_low =0 ; -smp_wmb (); - ptep->pte_high = pte.pte_high; -smp_wmb (); - ptep->pte_low = pte.pte_low; -} -static inline void native_set_pte_atomic (pte_t *ptep,pte_t pte) {set_64bit ((unsigned long long *)(ptep),native_pte_val (pte));
arch/x86/include/asm/pgtable.h +0 -2
@@ -31,8 +31,6 @@ extern struct list_head pgd_list;#define set_pte (ptep, pte) native_set_pte(ptep, pte)#define set_pte_at (mm, addr, ptep, pte) native_set_pte_at(mm, addr, ptep, pte) -#define set_pte_present (mm, addr, ptep, pte) \ - native_set_pte_present(mm, addr, ptep, pte)#define set_pte_atomic (ptep, pte) \ native_set_pte_atomic(ptep, pte)
arch/x86/kernel/kvm.c +0 -7
@@ -138,12 +138,6 @@ static void kvm_set_pte_atomic(pte_t *ptep, pte_t pte)kvm_mmu_write (ptep,pte_val (pte)); } -static void kvm_set_pte_present (struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pte) -{ -kvm_mmu_write (ptep,pte_val (pte)); -} -static void kvm_pte_clear (struct mm_struct *mm,unsigned long addr,pte_t *ptep) {
@@ -220,7 +214,6 @@ static void paravirt_ops_setup(void)#if PAGETABLE_LEVELS >=3 #ifdef CONFIG_X86_PAE pv_mmu_ops.set_pte_atomic = kvm_set_pte_atomic; - pv_mmu_ops.set_pte_present = kvm_set_pte_present; pv_mmu_ops.pte_clear = kvm_pte_clear; pv_mmu_ops.pmd_clear = kvm_pmd_clear;#endif
arch/x86/kernel/paravirt.c +0 -1
@@ -470,7 +470,6 @@ struct pv_mmu_ops pv_mmu_ops = {#if PAGETABLE_LEVELS >=3 #ifdef CONFIG_X86_PAE .set_pte_atomic = native_set_pte_atomic, - .set_pte_present = native_set_pte_present, .pte_clear = native_pte_clear, .pmd_clear = native_pmd_clear,#endif
arch/x86/kernel/vmi_32.c +0 -6
@@ -395,11 +395,6 @@ static void vmi_set_pte_atomic(pte_t *ptep, pte_t pteval) vmi_ops.update_pte (ptep,VMI_PAGE_PT ); } -static void vmi_set_pte_present (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pte) -{ - vmi_ops.set_pte (pte, ptep,vmi_flags_addr_defer (mm, addr,VMI_PAGE_PT ,1 )); -} -static void vmi_set_pud (pud_t *pudp,pud_t pudval) {/* Um, eww */
@@ -750,7 +745,6 @@ static inline int __init activate_vmi(void) pv_mmu_ops.set_pmd = vmi_set_pmd;#ifdef CONFIG_X86_PAE pv_mmu_ops.set_pte_atomic = vmi_set_pte_atomic; - pv_mmu_ops.set_pte_present = vmi_set_pte_present; pv_mmu_ops.set_pud = vmi_set_pud; pv_mmu_ops.pte_clear = vmi_pte_clear; pv_mmu_ops.pmd_clear = vmi_pmd_clear;
arch/x86/xen/mmu.c +0 -1
@@ -1870,7 +1870,6 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {#ifdef CONFIG_X86_PAE .set_pte_atomic = xen_set_pte_atomic, - .set_pte_present = xen_set_pte_at, .pte_clear = xen_pte_clear, .pmd_clear = xen_pmd_clear,#endif /* CONFIG_X86_PAE */
Commit-ID: b40c757964bbad76ecfa88eda9eb0b4d76dd8b40 Gitweb: http://git.kernel.org/tip/b40c757964bbad76ecfa88eda9eb0b4d76dd8b40 Author: Jeremy Fitzhardinge <[email protected]> AuthorDate: Wed, 18 Mar 2009 13:03:32 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 19 Mar 2009 14:04:18 +0100
x86/32: no need to use set_pte_present in set_pte_vaddr
Impact: cleanup, remove last user of set_pte_present
set_pte_vaddr() is only used to install ptes in fixmaps, and should never be used to overwrite a present mapping.
LKML-Reference: <[email protected]>
--- arch/x86/mm/pgtable_32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/mm/pgtable_32.c +1 -1
@@ -50,7 +50,7 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval) } pte =pte_offset_kernel (pmd, vaddr);if (pte_val (pteval)) -set_pte_present (&init_mm, vaddr, pte, pteval); +set_pte_at (&init_mm, vaddr, pte, pteval);else pte_clear (&init_mm, vaddr, pte);