openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: revert "defer cr3 reload when doing pud_clear()" 

Revert "defer cr3 reload when doing pud_clear()" since I'm going to
replace it.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jeremy Fitzhardinge 2008-02-04 16:48:02 +01:00 committed by Ingo Molnar
parent e618c9579c
commit a67ad9c9f8
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/mm/pgtable_32.c
View File

@ -373,13 +373,6 @@ void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
{ {
/* This is called just after the pmd has been detached from
the pgd, which requires a full tlb flush to be recognized
by the CPU. Rather than incurring multiple tlb flushes
while the address space is being pulled down, make the tlb
gathering machinery do a full flush when we're done. */
tlb->fullmm = 1;
paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT); paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);
tlb_remove_page(tlb, virt_to_page(pmd)); tlb_remove_page(tlb, virt_to_page(pmd));
} }

21
include/asm-x86/pgtable-3level.h
View File

@ -96,23 +96,14 @@ static inline void pud_clear(pud_t *pudp)
set_pud(pudp, __pud(0)); set_pud(pudp, __pud(0));
/* /*
* In principle we need to do a cr3 reload here to make sure * Pentium-II erratum A13: in PAE mode we explicitly have to flush
* the processor recognizes the changed pgd. In practice, all * the TLB via cr3 if the top-level pgd is changed...
* the places where pud_clear() gets called are followed by
* full tlb flushes anyway, so we can defer the cost here.
* *
* Specifically: * XXX I don't think we need to worry about this here, since
* * when clearing the pud, the calling code needs to flush the
* mm/memory.c:free_pmd_range() - immediately after the * tlb anyway. But do it now for safety's sake. - jsgf
* pud_clear() it does a pmd_free_tlb(). We change the
* mmu_gather structure to do a full tlb flush (which has the
* effect of reloading cr3) when the pagetable free is
* complete.
*
* arch/x86/mm/hugetlbpage.c:huge_pmd_unshare() - the call to
* this is followed by a flush_tlb_range, which on x86 does a
* full tlb flush.
*/ */
write_cr3(read_cr3());
} }
#define pud_page(pud) \ #define pud_page(pud) \