From: "H. Peter Anvin" <hpa@zytor.com>
To: Ian Campbell <ijc@hellion.org.uk>
Cc: "Mika Penttilä" <mika.penttila@kolumbus.fi>,
linux-kernel@vger.kernel.org,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Eric W. Biederman" <ebiederm@xmission.com>
Subject: Re: [PATCH] x86: Construct 32 bit boot time page tables in native format.
Date: Mon, 21 Jan 2008 18:16:29 -0800 [thread overview]
Message-ID: <479551FD.5040801@zytor.com> (raw)
In-Reply-To: <1200951996.15491.28.camel@cthulhu.hellion.org.uk>
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
Ian Campbell wrote:
>
> I'm just preparing to send out a version which uses the native_* way of
> doing things, its not actually as clean as I would like so I'd be
> interested to see the ASM variant.
>
This is the asm version I came up with. This is only the actual
assembly part; it doesn't require the (obviously necessary) bootmem
adjustments.
-hpa
[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 6794 bytes --]
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index f409fe2..d1d30db 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -18,6 +18,10 @@
#include <asm/thread_info.h>
#include <asm/asm-offsets.h>
#include <asm/setup.h>
+#include <asm/processor-flags.h>
+
+/* Physical address */
+#define pa(X) ((X) - __PAGE_OFFSET)
/*
* References to members of the new_cpu_data structure.
@@ -79,10 +83,6 @@ INIT_MAP_BEYOND_END = BOOTBITMAP_SIZE + (PAGE_TABLE_SIZE + ALLOCATOR_SLOP)*PAGE_
*/
.section .text.head,"ax",@progbits
ENTRY(startup_32)
- /* check to see if KEEP_SEGMENTS flag is meaningful */
- cmpw $0x207, BP_version(%esi)
- jb 1f
-
/* test KEEP_SEGMENTS flag to see if the bootloader is asking
us to not reload segments */
testb $(1<<6), BP_loadflags(%esi)
@@ -91,7 +91,7 @@ ENTRY(startup_32)
/*
* Set segments to known values.
*/
-1: lgdt boot_gdt_descr - __PAGE_OFFSET
+1: lgdt pa(boot_gdt_descr)
movl $(__BOOT_DS),%eax
movl %eax,%ds
movl %eax,%es
@@ -104,8 +104,8 @@ ENTRY(startup_32)
*/
cld
xorl %eax,%eax
- movl $__bss_start - __PAGE_OFFSET,%edi
- movl $__bss_stop - __PAGE_OFFSET,%ecx
+ movl $pa(__bss_start),%edi
+ movl $pa(__bss_stop),%ecx
subl %edi,%ecx
shrl $2,%ecx
rep ; stosl
@@ -117,31 +117,32 @@ ENTRY(startup_32)
* (kexec on panic case). Hence copy out the parameters before initializing
* page tables.
*/
- movl $(boot_params - __PAGE_OFFSET),%edi
+ movl $pa(boot_params),%edi
movl $(PARAM_SIZE/4),%ecx
cld
rep
movsl
- movl boot_params - __PAGE_OFFSET + NEW_CL_POINTER,%esi
+ movl pa(boot_params) + NEW_CL_POINTER,%esi
andl %esi,%esi
jz 1f # No comand line
- movl $(boot_command_line - __PAGE_OFFSET),%edi
+ movl $pa(boot_command_line),%edi
movl $(COMMAND_LINE_SIZE/4),%ecx
rep
movsl
1:
#ifdef CONFIG_PARAVIRT
- cmpw $0x207, (boot_params + BP_version - __PAGE_OFFSET)
+ /* This is can only trip for a broken bootloader... */
+ cmpw $0x207, pa(boot_params + BP_version)
jb default_entry
/* Paravirt-compatible boot parameters. Look to see what architecture
we're booting under. */
- movl (boot_params + BP_hardware_subarch - __PAGE_OFFSET), %eax
+ movl pa(boot_params + BP_hardware_subarch), %eax
cmpl $num_subarch_entries, %eax
jae bad_subarch
- movl subarch_entries - __PAGE_OFFSET(,%eax,4), %eax
+ movl pa(subarch_entries)(,%eax,4), %eax
subl $__PAGE_OFFSET, %eax
jmp *%eax
@@ -167,17 +168,74 @@ num_subarch_entries = (. - subarch_entries) / 4
* Mappings are created both at virtual address 0 (identity mapping)
* and PAGE_OFFSET for up to _end+sizeof(page tables)+INIT_MAP_BEYOND_END.
*
- * Warning: don't use %esi or the stack in this code. However, %esp
- * can be used as a GPR if you really need it...
+ * Note that the stack is not yet set up!
*/
-page_pde_offset = (__PAGE_OFFSET >> 20);
+#define PTE_ATTR 0x007 /* PRESENT+RW+USER */
+#define PDE_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
+#define PGD_ATTR 0x001 /* PRESENT (no other attributes) */
default_entry:
- movl $(pg0 - __PAGE_OFFSET), %edi
- movl $(swapper_pg_dir - __PAGE_OFFSET), %edx
- movl $0x007, %eax /* 0x007 = PRESENT+RW+USER */
+#ifdef CONFIG_X86_PAE
+ /*
+ * In PAE mode, the kernel PMD is shared, and __PAGE_OFFSET
+ * is guaranteed to be a multiple of 1 GB (the PGD granulatity.)
+ * Thus, we only need to set up a single PMD here; the identity
+ * mapping is handled by pointing two PGD entries to the PMD.
+ *
+ * Note the upper half of each PMD or PTE are always zero at
+ * this stage.
+ */
+page_pde_offset = (__PAGE_OFFSET >> 27);
+
+ movl %cr4, %eax
+ orl $X86_CR4_PAE, %eax
+ movl %eax, %cr4
+
+ xorl %ebx,%ebx /* %ebx is kept at zero */
+
+ movl $pa(pg0), %edi
+ movl $pa(swapper_pg_pmd), %edx
+ movl $PTE_ATTR, %eax
+10:
+ leal PDE_ATTR(%edi),%ecx /* Create PMD entry */
+ movl %ecx,(%edx) /* Store PMD entry */
+ /* Upper half already zero */
+ addl $8,%edx
+ movl $512,%ecx
+11:
+ stosl
+ xchgl %eax,%ebx
+ stosl
+ xchgl %eax,%ebx
+ addl $0x1000,%eax
+ loop 11b
+
+ /*
+ * End condition: we must map up to and including INIT_MAP_BEYOND_END
+ * bytes beyond the end of our own page tables.
+ */
+ leal (INIT_MAP_BEYOND_END+PTE_ATTR)(%edi),%ebp
+ cmpl %ebp,%eax
+ jb 10b
+ movl %edi,pa(init_pg_tables_end)
+
+ /* Set up the PGD */
+ movl $pa(swapper_pg_pmd)+PGD_ATTR, %eax
+ movl %eax, pa(swapper_pg_dir) /* Identity map */
+ movl %eax, pa(swapper_pg_dir+page_pde_offset) /* Kernel map */
+
+ /* Do early initialization of the fixmap area */
+ movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax
+ movl %eax,pa(swapper_pg_pmd+0xff8)
+#else /* Not PAE */
+
+page_pde_offset = (__PAGE_OFFSET >> 20);
+
+ movl $pa(pg0), %edi
+ movl $pa(swapper_pg_dir), %edx
+ movl $PTE_ATTR, %eax
10:
- leal 0x007(%edi),%ecx /* Create PDE entry */
+ leal PDE_ATTR(%edi),%ecx /* Create PDE entry */
movl %ecx,(%edx) /* Store identity PDE entry */
movl %ecx,page_pde_offset(%edx) /* Store kernel PDE entry */
addl $4,%edx
@@ -186,19 +244,20 @@ default_entry:
stosl
addl $0x1000,%eax
loop 11b
- /* End condition: we must map up to and including INIT_MAP_BEYOND_END */
- /* bytes beyond the end of our own page tables; the +0x007 is the attribute bits */
- leal (INIT_MAP_BEYOND_END+0x007)(%edi),%ebp
+ /*
+ * End condition: we must map up to and including INIT_MAP_BEYOND_END
+ * bytes beyond the end of our own page tables; the +0x007 is
+ * the attribute bits
+ */
+ leal (INIT_MAP_BEYOND_END+PTE_ATTR)(%edi),%ebp
cmpl %ebp,%eax
jb 10b
- movl %edi,(init_pg_tables_end - __PAGE_OFFSET)
-
- /* Do an early initialization of the fixmap area */
- movl $(swapper_pg_dir - __PAGE_OFFSET), %edx
- movl $(swapper_pg_pmd - __PAGE_OFFSET), %eax
- addl $0x67, %eax /* 0x67 == _PAGE_TABLE */
- movl %eax, 4092(%edx)
+ movl %edi,pa(init_pg_tables_end)
+ /* Do early initialization of the fixmap area */
+ movl $pa(swapper_pg_fixmap)+PDE_ADDR,%eax
+ movl %eax,pa(swapper_pg_dir+0xffc)
+#endif
xorl %ebx,%ebx /* This is the boot CPU (BSP) */
jmp 3f
/*
@@ -237,7 +296,7 @@ ENTRY(startup_32_smp)
* NOTE! We have to correct for the fact that we're
* not yet offset PAGE_OFFSET..
*/
-#define cr4_bits mmu_cr4_features-__PAGE_OFFSET
+#define cr4_bits pa(mmu_cr4_features)
movl cr4_bits,%edx
andl %edx,%edx
jz 6f
@@ -278,7 +337,7 @@ ENTRY(startup_32_smp)
/*
* Enable paging
*/
- movl $swapper_pg_dir-__PAGE_OFFSET,%eax
+ movl $pa(swapper_pg_dir),%eax
movl %eax,%cr3 /* set the page table pointer.. */
movl %cr0,%eax
orl $0x80000000,%eax
@@ -556,8 +615,12 @@ ENTRY(_stext)
.align PAGE_SIZE_asm
ENTRY(swapper_pg_dir)
.fill 1024,4,0
+#ifdef CONFIG_X86_PAE
ENTRY(swapper_pg_pmd)
.fill 1024,4,0
+#endif
+ENTRY(swapper_pg_fixmap)
+ .fill 1024,4,0
ENTRY(empty_zero_page)
.fill 4096,1,0
next prev parent reply other threads:[~2008-01-22 2:17 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-19 16:08 [PATCH] x86/voyager: Switch voyager memory detection to early_ioremap Ian Campbell
2008-01-19 16:08 ` [PATCH] x86: Construct 32 bit boot time page tables in native format Ian Campbell
2008-01-19 23:07 ` Andi Kleen
2008-01-19 23:50 ` H. Peter Anvin
2008-01-20 16:44 ` Ian Campbell
2008-01-20 17:39 ` Andi Kleen
2008-01-20 18:48 ` H. Peter Anvin
2008-01-20 18:55 ` Andi Kleen
2008-01-20 18:54 ` H. Peter Anvin
2008-01-22 10:05 ` Ingo Molnar
2008-01-22 16:23 ` H. Peter Anvin
2008-01-20 18:30 ` Mika Penttilä
2008-01-21 21:23 ` Ian Campbell
2008-01-21 21:38 ` H. Peter Anvin
2008-01-21 21:46 ` Ian Campbell
2008-01-22 2:16 ` H. Peter Anvin [this message]
2008-01-22 17:36 ` Ian Campbell
2008-01-22 18:23 ` H. Peter Anvin
2008-01-22 19:48 ` Ian Campbell
2008-01-22 20:00 ` H. Peter Anvin
2008-01-22 20:36 ` Ingo Molnar
2008-01-22 20:43 ` H. Peter Anvin
2008-01-22 20:45 ` Ingo Molnar
2008-01-22 20:52 ` Ian Campbell
2008-01-22 21:00 ` H. Peter Anvin
2008-01-22 22:21 ` Ian Campbell
2008-01-22 21:00 ` [PATCH] x86: make nx_enabled conditional on CONFIG_X86_PAE Harvey Harrison
2008-01-22 21:04 ` Ingo Molnar
2008-01-22 21:35 ` Harvey Harrison
2008-01-22 21:07 ` Harvey Harrison
[not found] ` <p73odbdlyiu.fsf@crumb.suse.de>
2008-01-23 11:21 ` Harvey Harrison
2008-01-23 20:52 ` [PATCH] x86: Construct 32 bit boot time page tables in native format Ian Campbell
2008-01-24 1:06 ` Jeremy Fitzhardinge
2008-01-24 9:39 ` Ian Campbell
2008-01-24 22:06 ` H. Peter Anvin
2008-01-24 22:35 ` Jeremy Fitzhardinge
2008-01-24 22:39 ` H. Peter Anvin
2008-01-24 22:58 ` Jeremy Fitzhardinge
2008-01-24 23:08 ` H. Peter Anvin
2008-01-24 23:40 ` Jeremy Fitzhardinge
2008-01-24 23:44 ` H. Peter Anvin
2008-01-24 23:51 ` Jeremy Fitzhardinge
2008-01-25 0:02 ` H. Peter Anvin
2008-01-25 0:11 ` Jeremy Fitzhardinge
2008-01-25 0:15 ` H. Peter Anvin
2008-01-25 0:31 ` Jeremy Fitzhardinge
2008-01-25 0:37 ` H. Peter Anvin
2008-01-25 2:56 ` Eric W. Biederman
2008-01-25 4:41 ` Jeremy Fitzhardinge
2008-01-25 11:07 ` Eric W. Biederman
2008-01-24 23:51 ` H. Peter Anvin
2008-01-25 0:20 ` Pavel Machek
2008-01-25 0:27 ` H. Peter Anvin
2008-01-25 0:46 ` Rafael J. Wysocki
2008-01-25 1:08 ` H. Peter Anvin
2008-01-25 2:16 ` Eric W. Biederman
2008-01-25 2:25 ` H. Peter Anvin
2008-01-25 7:49 ` Pavel Machek
2008-01-25 22:02 ` Rafael J. Wysocki
2008-01-25 22:11 ` Pavel Machek
2008-01-28 15:00 ` Ingo Molnar
2008-01-28 15:25 ` Rafael J. Wysocki
2008-01-28 19:40 ` Pavel Machek
2008-01-28 19:51 ` H. Peter Anvin
2008-01-28 20:03 ` Jeremy Fitzhardinge
2008-01-28 20:06 ` H. Peter Anvin
2008-01-28 20:28 ` Rafael J. Wysocki
2008-01-28 20:26 ` Rafael J. Wysocki
2008-01-28 20:31 ` H. Peter Anvin
2008-01-28 20:59 ` Rafael J. Wysocki
2008-01-28 20:44 ` Jeremy Fitzhardinge
2008-01-28 20:50 ` Rafael J. Wysocki
2008-01-28 21:28 ` H. Peter Anvin
2008-01-28 22:02 ` Rafael J. Wysocki
2008-01-28 16:12 ` Ingo Molnar
2008-01-28 17:02 ` Rafael J. Wysocki
2008-02-01 13:51 ` Ingo Molnar
2008-02-01 14:28 ` Rafael J. Wysocki
2008-02-01 14:54 ` Ingo Molnar
2008-02-01 22:55 ` Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=479551FD.5040801@zytor.com \
--to=hpa@zytor.com \
--cc=ebiederm@xmission.com \
--cc=ijc@hellion.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.penttila@kolumbus.fi \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).