diff options
| author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-13 21:52:46 +0000 |
|---|---|---|
| committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-13 21:52:46 +0000 |
| commit | 38e8f172c3fb44eb738bc21cdfafa34b25d12e17 (patch) | |
| tree | 8d1ead1cadb67cd90e53648ba9d2e0b81a3a441d | |
| parent | 8bbdb3ceb664b4eab621159fa4b4c3ddaa7188d2 (diff) | |
| download | xen-38e8f172c3fb44eb738bc21cdfafa34b25d12e17.tar.gz xen-38e8f172c3fb44eb738bc21cdfafa34b25d12e17.tar.bz2 xen-38e8f172c3fb44eb738bc21cdfafa34b25d12e17.zip | |
Add "set_pte_at_sync" (integrated invlpg) in Linux i386/mm/highmem.c to improve performance for domains with >900MB of memory.
Signed-off-by: ian@xensource.com
3 files changed, 23 insertions, 2 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/i386/mm/highmem.c b/linux-2.6-xen-sparse/arch/xen/i386/mm/highmem.c index 1cfe059f8b..c5b64185a5 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/highmem.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/highmem.c @@ -41,8 +41,7 @@ static void *__kmap_atomic(struct page *page, enum km_type type, pgprot_t prot) if (!pte_none(*(kmap_pte-idx))) BUG(); #endif - set_pte(kmap_pte-idx, mk_pte(page, prot)); - __flush_tlb_one(vaddr); + set_pte_at_sync(&init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot)); return (void*) vaddr; } diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h index 1ed6625fff..a8d2bcfaa8 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h @@ -25,6 +25,17 @@ inline static void set_pte_at(struct mm_struct *mm, unsigned long addr, } } +inline static void set_pte_at_sync(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t val ) +{ + if ( ((mm != current->mm) && (mm != &init_mm)) || + HYPERVISOR_update_va_mapping( (addr), (val), UVMF_INVLPG ) ) + { + set_pte(ptep, val); + xen_invlpg(addr); + } +} + #define set_pte_atomic(pteptr, pteval) set_pte(pteptr,pteval) #ifndef CONFIG_XEN_SHADOW_MODE diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h index 16079faf2a..7bdd48e70f 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h @@ -79,6 +79,17 @@ inline static void set_pte_at(struct mm_struct *mm, unsigned long addr, } } +inline static void set_pte_at_sync(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t val ) +{ + if ( ((mm != current->mm) && (mm != &init_mm)) || + HYPERVISOR_update_va_mapping( (addr), (val), UVMF_INVLPG ) ) + { + set_pte(ptep, val); + xen_invlpg(addr); + } +} + #ifdef CONFIG_XEN_SHADOW_MODE # define set_pmd(pmdptr,pmdval) \ set_64bit((unsigned long long *)(pmdptr),pmd_val(pmdval)) |