aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorZachary Amsden <zach@vmware.com>2006-10-01 02:29:34 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:34 -0400
commit25e4df5bae333a06cd2c9b88baf14432652dc9f7 (patch)
treed1391bf273a3a30cc428fee24a626207f5dc331b /include
parent6606c3e0da5360799e07ae24b05080cc85c68e72 (diff)
[PATCH] paravirt: combine flush accessed dirty.patch
Remove ptep_test_and_clear_{dirty|young} from i386, and instead use the dominating functions, ptep_clear_flush_{dirty|young}. This allows the TLB page flush to be contained in the same macro, and allows for an eager optimization - if reading the PTE initially returned dirty/accessed, we can assume the fact that no subsequent update to the PTE which cleared accessed / dirty has occurred, as the only way A/D bits can change without holding the page table lock is if a remote processor clears them. This eliminates an extra branch which came from the generic version of the code, as we know that no other CPU could have cleared the A/D bit, so the flush will always be needed. We still export these two defines, even though we do not actually define the macros in the i386 code: #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY The reason for this is that the only use of these functions is within the generic clear_flush functions, and we want a strong guarantee that there are no other users of these functions, so we want to prevent the generic code from defining them for us. Signed-off-by: Zachary Amsden <zach@vmware.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Jeremy Fitzhardinge <jeremy@xensource.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-i386/pgtable.h41
1 files changed, 28 insertions, 13 deletions
diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h
index 541b3e234335..94c87ff4b5ac 100644
--- a/include/asm-i386/pgtable.h
+++ b/include/asm-i386/pgtable.h
@@ -262,21 +262,36 @@ do { \
262 } \ 262 } \
263} while (0) 263} while (0)
264 264
265/*
266 * We don't actually have these, but we want to advertise them so that
267 * we can encompass the flush here.
268 */
265#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY 269#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
266static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
267{
268 if (!pte_dirty(*ptep))
269 return 0;
270 return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte_low);
271}
272
273#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG 270#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
274static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) 271
275{ 272#define __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH
276 if (!pte_young(*ptep)) 273#define ptep_clear_flush_dirty(vma, address, ptep) \
277 return 0; 274({ \
278 return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte_low); 275 int __dirty; \
279} 276 __dirty = pte_dirty(*(ptep)); \
277 if (__dirty) { \
278 clear_bit(_PAGE_BIT_DIRTY, &(ptep)->pte_low); \
279 flush_tlb_page(vma, address); \
280 } \
281 __dirty; \
282})
283
284#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
285#define ptep_clear_flush_young(vma, address, ptep) \
286({ \
287 int __young; \
288 __young = pte_young(*(ptep)); \
289 if (__young) { \
290 clear_bit(_PAGE_BIT_ACCESSED, &(ptep)->pte_low); \
291 flush_tlb_page(vma, address); \
292 } \
293 __young; \
294})
280 295
281#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL 296#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
282static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long addr, pte_t *ptep, int full) 297static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long addr, pte_t *ptep, int full)