Commit 4cdd9c89 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Andi Kleen

[PATCH] i386: PARAVIRT: drop unused ptep_get_and_clear

In shadow mode hypervisors, ptep_get_and_clear achieves the desired
purpose of keeping the shadows in sync by issuing a native_get_and_clear,
followed by a call to pte_update, which indicates the PTE has been
modified.

Direct mode hypervisors (Xen) have no need for this anyway, and will trap
the update using writable pagetables.

This means no hypervisor makes use of ptep_get_and_clear; there is no
reason to have it in the paravirt-ops structure.  Change confusing
terminology about raw vs. native functions into consistent use of
native_pte_xxx for operations which do not invoke paravirt-ops.
Signed-off-by: default avatarZachary Amsden <zach@vmware.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 1a45b7aa
...@@ -315,8 +315,6 @@ struct paravirt_ops paravirt_ops = { ...@@ -315,8 +315,6 @@ struct paravirt_ops paravirt_ops = {
.pte_update = paravirt_nop, .pte_update = paravirt_nop,
.pte_update_defer = paravirt_nop, .pte_update_defer = paravirt_nop,
.ptep_get_and_clear = native_ptep_get_and_clear,
#ifdef CONFIG_HIGHPTE #ifdef CONFIG_HIGHPTE
.kmap_atomic_pte = kmap_atomic, .kmap_atomic_pte = kmap_atomic,
#endif #endif
......
...@@ -188,8 +188,6 @@ struct paravirt_ops ...@@ -188,8 +188,6 @@ struct paravirt_ops
void (*pte_update_defer)(struct mm_struct *mm, void (*pte_update_defer)(struct mm_struct *mm,
unsigned long addr, pte_t *ptep); unsigned long addr, pte_t *ptep);
pte_t (*ptep_get_and_clear)(pte_t *ptep);
#ifdef CONFIG_HIGHPTE #ifdef CONFIG_HIGHPTE
void *(*kmap_atomic_pte)(struct page *page, enum km_type type); void *(*kmap_atomic_pte)(struct page *page, enum km_type type);
#endif #endif
...@@ -859,12 +857,8 @@ static inline void pmd_clear(pmd_t *pmdp) ...@@ -859,12 +857,8 @@ static inline void pmd_clear(pmd_t *pmdp)
PVOP_VCALL1(pmd_clear, pmdp); PVOP_VCALL1(pmd_clear, pmdp);
} }
static inline pte_t raw_ptep_get_and_clear(pte_t *p)
{
unsigned long long val = PVOP_CALL1(unsigned long long, ptep_get_and_clear, p);
return (pte_t) { val, val >> 32 };
}
#else /* !CONFIG_X86_PAE */ #else /* !CONFIG_X86_PAE */
static inline pte_t __pte(unsigned long val) static inline pte_t __pte(unsigned long val)
{ {
return (pte_t) { PVOP_CALL1(unsigned long, make_pte, val) }; return (pte_t) { PVOP_CALL1(unsigned long, make_pte, val) };
...@@ -900,11 +894,6 @@ static inline void set_pmd(pmd_t *pmdp, pmd_t pmdval) ...@@ -900,11 +894,6 @@ static inline void set_pmd(pmd_t *pmdp, pmd_t pmdval)
{ {
PVOP_VCALL2(set_pmd, pmdp, pmdval.pud.pgd.pgd); PVOP_VCALL2(set_pmd, pmdp, pmdval.pud.pgd.pgd);
} }
static inline pte_t raw_ptep_get_and_clear(pte_t *p)
{
return (pte_t) { PVOP_CALL1(unsigned long, ptep_get_and_clear, p) };
}
#endif /* CONFIG_X86_PAE */ #endif /* CONFIG_X86_PAE */
#define __HAVE_ARCH_ENTER_LAZY_CPU_MODE #define __HAVE_ARCH_ENTER_LAZY_CPU_MODE
......
...@@ -267,8 +267,6 @@ extern void vmalloc_sync_all(void); ...@@ -267,8 +267,6 @@ extern void vmalloc_sync_all(void);
*/ */
#define pte_update(mm, addr, ptep) do { } while (0) #define pte_update(mm, addr, ptep) do { } while (0)
#define pte_update_defer(mm, addr, ptep) do { } while (0) #define pte_update_defer(mm, addr, ptep) do { } while (0)
#define raw_ptep_get_and_clear(xp) native_ptep_get_and_clear(xp)
#endif #endif
/* /*
...@@ -335,7 +333,7 @@ do { \ ...@@ -335,7 +333,7 @@ do { \
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{ {
pte_t pte = raw_ptep_get_and_clear(ptep); pte_t pte = native_ptep_get_and_clear(ptep);
pte_update(mm, addr, ptep); pte_update(mm, addr, ptep);
return pte; return pte;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment