git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-x86_64
/
mmu_context.h
diff --git
a/include/asm-x86_64/mmu_context.h
b/include/asm-x86_64/mmu_context.h
index
8f80f15
..
af03b9f
100644
(file)
--- a/
include/asm-x86_64/mmu_context.h
+++ b/
include/asm-x86_64/mmu_context.h
@@
-1,7
+1,6
@@
#ifndef __X86_64_MMU_CONTEXT_H
#define __X86_64_MMU_CONTEXT_H
#ifndef __X86_64_MMU_CONTEXT_H
#define __X86_64_MMU_CONTEXT_H
-#include <linux/config.h>
#include <asm/desc.h>
#include <asm/atomic.h>
#include <asm/pgalloc.h>
#include <asm/desc.h>
#include <asm/atomic.h>
#include <asm/pgalloc.h>
@@
-15,18
+14,18
@@
int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
void destroy_context(struct mm_struct *mm);
int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
void destroy_context(struct mm_struct *mm);
-#ifdef CONFIG_SMP
-
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
+#ifdef CONFIG_SMP
if (read_pda(mmu_state) == TLBSTATE_OK)
write_pda(mmu_state, TLBSTATE_LAZY);
if (read_pda(mmu_state) == TLBSTATE_OK)
write_pda(mmu_state, TLBSTATE_LAZY);
+#endif
}
}
-#else
-static inline void
enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk
)
+
+static inline void
load_cr3(pgd_t *pgd
)
{
{
+ asm volatile("movq %0,%%cr3" :: "r" (__pa(pgd)) : "memory");
}
}
-#endif
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
struct task_struct *tsk)
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
struct task_struct *tsk)
@@
-34,15
+33,13
@@
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
unsigned cpu = smp_processor_id();
if (likely(prev != next)) {
/* stop flush ipis for the previous mm */
unsigned cpu = smp_processor_id();
if (likely(prev != next)) {
/* stop flush ipis for the previous mm */
- c
lear_bit(cpu, &
prev->cpu_vm_mask);
+ c
pu_clear(cpu,
prev->cpu_vm_mask);
#ifdef CONFIG_SMP
write_pda(mmu_state, TLBSTATE_OK);
write_pda(active_mm, next);
#endif
#ifdef CONFIG_SMP
write_pda(mmu_state, TLBSTATE_OK);
write_pda(active_mm, next);
#endif
- set_bit(cpu, &next->cpu_vm_mask);
- /* Re-load page tables */
- *read_pda(level4_pgt) = __pa(next->pgd) | _PAGE_TABLE;
- __flush_tlb();
+ cpu_set(cpu, next->cpu_vm_mask);
+ load_cr3(next->pgd);
if (unlikely(next->context.ldt != prev->context.ldt))
load_LDT_nolock(&next->context, cpu);
if (unlikely(next->context.ldt != prev->context.ldt))
load_LDT_nolock(&next->context, cpu);
@@
-52,11
+49,12
@@
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
write_pda(mmu_state, TLBSTATE_OK);
if (read_pda(active_mm) != next)
out_of_line_bug();
write_pda(mmu_state, TLBSTATE_OK);
if (read_pda(active_mm) != next)
out_of_line_bug();
- if
(!test_and_set_bit(cpu, &
next->cpu_vm_mask)) {
+ if
(!cpu_test_and_set(cpu,
next->cpu_vm_mask)) {
/* We were in lazy tlb mode and leave_mm disabled
/* We were in lazy tlb mode and leave_mm disabled
- * tlb flush IPI delivery. We must flush our tlb.
+ * tlb flush IPI delivery. We must reload CR3
+ * to make sure to use no freed page tables.
*/
*/
- lo
cal_flush_tlb(
);
+ lo
ad_cr3(next->pgd
);
load_LDT_nolock(&next->context, cpu);
}
}
load_LDT_nolock(&next->context, cpu);
}
}