From: Yinghai Lu <yinghai@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>,
"Eric W. Biederman" <ebiederm@xmission.com>
Subject: [PATCH 4/9] x86, 64bit: add support for loading kernel above 512G
Date: Fri, 16 Nov 2012 00:53:04 -0800 [thread overview]
Message-ID: <1353055989-31939-5-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1353055989-31939-1-git-send-email-yinghai@kernel.org>
Current kernel is not allowed to be loaded above 512g, it thinks
that address is too big.
We only need to add one extra one spare page for needed level3 to
point another 512g range.
Need to check _text range and set level4 pg to point to that spare
level3 page, and set level3 to point to level2 page to cover
[_text, _end] with extra mapping.
We need this to put relocatable bzImage high above 512g.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
---
arch/x86/kernel/head_64.S | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index efc0c08..32fa9d0 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -78,12 +78,6 @@ startup_64:
testl %eax, %eax
jnz bad_address
- /* Is the address too large? */
- leaq _text(%rip), %rdx
- movq $PGDIR_SIZE, %rax
- cmpq %rax, %rdx
- jae bad_address
-
/* Fixup the physical addresses in the page table
*/
addq %rbp, init_level4_pgt + 0(%rip)
@@ -102,12 +96,35 @@ startup_64:
andq $PMD_PAGE_MASK, %rdi
movq %rdi, %rax
+ shrq $PGDIR_SHIFT, %rax
+ andq $(PTRS_PER_PGD - 1), %rax
+ jz skip_level3_spare
+
+ /* Set level3 at first */
+ leaq (level3_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
+ leaq init_level4_pgt(%rip), %rbx
+ movq %rdx, 0(%rbx, %rax, 8)
+ addq $L4_PAGE_OFFSET, %rax
+ movq %rdx, 0(%rbx, %rax, 8)
+
+ /* always need to set level2 */
+ movq %rdi, %rax
+ shrq $PUD_SHIFT, %rax
+ andq $(PTRS_PER_PUD - 1), %rax
+ leaq level3_spare_pgt(%rip), %rbx
+ jmp set_level2_spare
+
+skip_level3_spare:
+ movq %rdi, %rax
shrq $PUD_SHIFT, %rax
andq $(PTRS_PER_PUD - 1), %rax
jz ident_complete
- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
+ /* only set level2 with out level3 spare */
leaq level3_ident_pgt(%rip), %rbx
+
+set_level2_spare:
+ leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
movq %rdx, 0(%rbx, %rax, 8)
movq %rdi, %rax
@@ -435,6 +452,9 @@ NEXT_PAGE(level2_kernel_pgt)
PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
KERNEL_IMAGE_SIZE/PMD_SIZE)
+NEXT_PAGE(level3_spare_pgt)
+ .fill 512, 8, 0
+
NEXT_PAGE(level2_spare_pgt)
.fill 512, 8, 0
--
1.7.7
next prev parent reply other threads:[~2012-11-16 8:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-16 8:53 [PATCH 0/9] x86, boot, 64bit: Add support for loading ramdisk and bzImage high Yinghai Lu
2012-11-16 8:53 ` [PATCH 1/9] x86, boot: Move lldt/ltr out of 64bit only path Yinghai Lu
2012-11-16 15:55 ` H. Peter Anvin
2012-11-16 18:15 ` Yinghai Lu
2012-11-16 8:53 ` [PATCH 2/9] x86: Add macro for 64bit entry for bzImage Yinghai Lu
2012-11-16 15:56 ` H. Peter Anvin
2012-11-16 8:53 ` [PATCH 3/9] x86, 64bit: set extra ident page table for whole kernel range Yinghai Lu
2012-11-16 8:53 ` Yinghai Lu [this message]
2012-11-16 8:53 ` [PATCH 5/9] x86: Merge early_reserve_initrd for 32bit and 64bit Yinghai Lu
2012-11-16 8:53 ` [PATCH 6/9] x86: add get_ramdisk_image/size Yinghai Lu
2012-11-16 8:53 ` [PATCH 7/9] x86, boot: add field to support load bzImage and ramdisk high Yinghai Lu
2012-11-16 8:53 ` [PATCH 8/9] x86: ramdisk info print with high bits Yinghai Lu
2012-11-16 16:05 ` H. Peter Anvin
2012-11-16 19:21 ` Yinghai Lu
2012-11-16 19:32 ` Yinghai Lu
2012-11-16 19:39 ` H. Peter Anvin
2012-11-20 1:38 ` Valdis.Kletnieks
2012-11-16 19:39 ` H. Peter Anvin
2012-11-16 19:59 ` Yinghai Lu
2012-11-16 20:08 ` H. Peter Anvin
2012-11-16 20:12 ` Yinghai Lu
2012-11-16 20:25 ` H. Peter Anvin
2012-11-16 20:40 ` Yinghai Lu
2012-11-16 8:53 ` [PATCH 9/9] x86: remove 1024g limitation for kexec buffer on 64bit Yinghai Lu
2012-11-16 16:17 ` [PATCH 0/9] x86, boot, 64bit: Add support for loading ramdisk and bzImage high H. Peter Anvin
2012-11-17 0:40 ` Yinghai Lu
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=1353055989-31939-5-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--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