diff options
| author | Keir Fraser <keir@xen.org> | 2010-12-16 20:13:47 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-12-16 20:13:47 +0000 |
| commit | 6c43e7d6a3836b23cd235f6b3e5c3a616bb59cdd (patch) | |
| tree | 3d695d336ce08b6937ed9805f19d208001cfcdd2 | |
| parent | 9408dd0c45085ba533a30cb32c7e1d0debcb24ba (diff) | |
| download | xen-6c43e7d6a3836b23cd235f6b3e5c3a616bb59cdd.tar.gz xen-6c43e7d6a3836b23cd235f6b3e5c3a616bb59cdd.tar.bz2 xen-6c43e7d6a3836b23cd235f6b3e5c3a616bb59cdd.zip | |
x86: Define pte_{read,write}[_atomic] in terms of atomic_readN
Signed-off-by: Keir Fraser <keir@xen.org>
xen-unstable changeset: 22565:1cc551716430
xen-unstable date: Thu Dec 16 19:36:35 2010 +0000
| -rw-r--r-- | xen/include/asm-x86/x86_32/page.h | 18 | ||||
| -rw-r--r-- | xen/include/asm-x86/x86_64/page.h | 6 |
2 files changed, 8 insertions, 16 deletions
diff --git a/xen/include/asm-x86/x86_32/page.h b/xen/include/asm-x86/x86_32/page.h index bae4d8ea2d..8b6aa6ee04 100644 --- a/xen/include/asm-x86/x86_32/page.h +++ b/xen/include/asm-x86/x86_32/page.h @@ -79,23 +79,15 @@ extern unsigned int PAGE_HYPERVISOR_NOCACHE; #endif -#define pte_read_atomic(ptep) ({ \ - intpte_t __pte = *(ptep), __npte; \ - while ( (__npte = cmpxchg(ptep, __pte, __pte)) != __pte ) \ - __pte = __npte; \ - __pte; }) -#define pte_write_atomic(ptep, pte) do { \ - intpte_t __pte = *(ptep), __npte; \ - while ( (__npte = cmpxchg(ptep, __pte, (pte))) != __pte ) \ - __pte = __npte; \ -} while ( 0 ) +#define pte_read_atomic(ptep) atomic_read64(ptep) +#define pte_write_atomic(ptep, pte) atomic_write64(ptep, pte) #define pte_write(ptep, pte) do { \ u32 *__ptep_words = (u32 *)(ptep); \ - __ptep_words[0] = 0; \ + atomic_write32(&__ptep_words[0], 0); \ wmb(); \ - __ptep_words[1] = (pte) >> 32; \ + atomic_write32(&__ptep_words[1], (pte) >> 32); \ wmb(); \ - __ptep_words[0] = (pte) >> 0; \ + atomic_write32(&__ptep_words[0], (pte) >> 0); \ } while ( 0 ) /* root table */ diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index f1448c12a8..9f029440ae 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -99,9 +99,9 @@ typedef l4_pgentry_t root_pgentry_t; #endif /* !__ASSEMBLY__ */ -#define pte_read_atomic(ptep) (*(ptep)) -#define pte_write_atomic(ptep, pte) (*(ptep) = (pte)) -#define pte_write(ptep, pte) (*(ptep) = (pte)) +#define pte_read_atomic(ptep) atomic_read64(ptep) +#define pte_write_atomic(ptep, pte) atomic_write64(ptep, pte) +#define pte_write(ptep, pte) atomic_write64(ptep, pte) /* Given a virtual address, get an entry offset into a linear page table. */ #define l1_linear_offset(_a) (((_a) & VADDR_MASK) >> L1_PAGETABLE_SHIFT) |