From 707c7ba811ca78bba889f5239a071f9abd83d849 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 16 Dec 2010 20:13:47 +0000 Subject: [PATCH] x86: Define pte_{read,write}[_atomic] in terms of atomic_readN Signed-off-by: Keir Fraser xen-unstable changeset: 22565:1cc551716430 xen-unstable date: Thu Dec 16 19:36:35 2010 +0000 --- xen/include/asm-x86/x86_32/page.h | 18 +++++------------- 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 bae4d8ea2..8b6aa6ee0 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 f1448c12a..9f029440a 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) -- 2.39.5