Use set_pte macros in a couple places where they were missing.
Also, setting PDPEs in PAE mode does not require atomic operations,
since the PDPEs are cached by the processor, and only reloaded on
an explicit or implicit reload of CR3.
Since the four PDPEs must always be present in an active root, and the kernel
PDPE is never updated, we are safe even from SMIs and interrupts / NMIs using
task gates (which reload CR3). Actually, much of this is moot, since the
user PDPEs are never updated either, and the only usage of task gates is by
the doublefault handler. It appears the only place PGDs get updated in PAE
mode is in init_low_mappings() / zap_low_mapping() for initial page table
creation and recovery from ACPI sleep state, and these sites are safe by
inspection. Getting rid of the cmpxchg8b saves code space and 720 cycles
in pgd_alloc on P4.
Signed-off-by: Zachary Amsden <[EMAIL PROTECTED]>
Index: linux-2.6.13/arch/i386/mm/pageattr.c
===================================================================
--- linux-2.6.13.orig/arch/i386/mm/pageattr.c 2005-07-29 14:06:16.000000000
-0700
+++ linux-2.6.13/arch/i386/mm/pageattr.c 2005-07-29 14:10:42.000000000
-0700
@@ -12,6 +12,7 @@
#include <asm/uaccess.h>
#include <asm/processor.h>
#include <asm/tlbflush.h>
+#include <asm/pgalloc.h>
static DEFINE_SPINLOCK(cpa_lock);
static struct list_head df_list = LIST_HEAD_INIT(df_list);
@@ -52,8 +53,8 @@
addr = address & LARGE_PAGE_MASK;
pbase = (pte_t *)page_address(base);
for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE) {
- pbase[i] = pfn_pte(addr >> PAGE_SHIFT,
- addr == address ? prot : PAGE_KERNEL);
+ set_pte(&pbase[i], pfn_pte(addr >> PAGE_SHIFT,
+ addr == address ? prot :
PAGE_KERNEL));
}
return base;
}
Index: linux-2.6.13/arch/i386/mm/init.c
===================================================================
--- linux-2.6.13.orig/arch/i386/mm/init.c 2005-07-29 11:02:58.000000000
-0700
+++ linux-2.6.13/arch/i386/mm/init.c 2005-07-29 14:37:18.000000000 -0700
@@ -348,7 +348,7 @@
* All user-space mappings are explicitly cleared after
* SMP startup.
*/
- pgd_base[0] = pgd_base[USER_PTRS_PER_PGD];
+ set_pgd(&pgd_base[0], pgd_base[USER_PTRS_PER_PGD]);
#endif
}
Index: linux-2.6.13/include/asm-i386/pgtable-3level.h
===================================================================
--- linux-2.6.13.orig/include/asm-i386/pgtable-3level.h 2005-06-17
12:48:29.000000000 -0700
+++ linux-2.6.13/include/asm-i386/pgtable-3level.h 2005-07-29
14:18:57.000000000 -0700
@@ -64,7 +64,7 @@
#define set_pmd(pmdptr,pmdval) \
set_64bit((unsigned long long *)(pmdptr),pmd_val(pmdval))
#define set_pud(pudptr,pudval) \
- set_64bit((unsigned long long *)(pudptr),pud_val(pudval))
+ (*(pudptr) = (pudval))
/*
* Pentium-II erratum A13: in PAE mode we explicitly have to flush
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
