From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Ingo Molnar <mingo@redhat.com>,
x86@kernel.org, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andy Lutomirski <luto@amacapital.net>,
Borislav Petkov <bp@suse.de>, Andi Kleen <ak@linux.intel.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH 5/9] x86/mm: Initialize vmemmap_base at boot-time
Date: Wed, 14 Feb 2018 21:25:38 +0300 [thread overview]
Message-ID: <20180214182542.69302-6-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20180214182542.69302-1-kirill.shutemov@linux.intel.com>
vmemmap area has different placement depending on paging mode.
Let's adjust it during early boot accodring to machine capability.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
arch/x86/include/asm/pgtable_64_types.h | 9 +++------
arch/x86/kernel/head64.c | 3 ++-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index 686329994ade..68909a68e5b9 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -108,11 +108,8 @@ extern unsigned int ptrs_per_p4d;
#define VMALLOC_SIZE_TB_L4 32UL
#define VMALLOC_SIZE_TB_L5 12800UL
-#ifdef CONFIG_X86_5LEVEL
-# define __VMEMMAP_BASE _AC(0xffd4000000000000, UL)
-#else
-# define __VMEMMAP_BASE _AC(0xffffea0000000000, UL)
-#endif
+#define __VMEMMAP_BASE_L4 0xffffea0000000000
+#define __VMEMMAP_BASE_L5 0xffd4000000000000
#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT
# define VMALLOC_START vmalloc_base
@@ -121,7 +118,7 @@ extern unsigned int ptrs_per_p4d;
#else
# define VMALLOC_START __VMALLOC_BASE_L4
# define VMALLOC_SIZE_TB VMALLOC_SIZE_TB_L4
-# define VMEMMAP_START __VMEMMAP_BASE
+# define VMEMMAP_START __VMEMMAP_BASE_L4
#endif /* CONFIG_DYNAMIC_MEMORY_LAYOUT */
#define VMALLOC_END (VMALLOC_START + (VMALLOC_SIZE_TB << 40) - 1)
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 22bf2015254c..795e762f3c66 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -53,7 +53,7 @@ unsigned long page_offset_base __ro_after_init = __PAGE_OFFSET_BASE_L4;
EXPORT_SYMBOL(page_offset_base);
unsigned long vmalloc_base __ro_after_init = __VMALLOC_BASE_L4;
EXPORT_SYMBOL(vmalloc_base);
-unsigned long vmemmap_base __ro_after_init = __VMEMMAP_BASE;
+unsigned long vmemmap_base __ro_after_init = __VMEMMAP_BASE_L4;
EXPORT_SYMBOL(vmemmap_base);
#endif
@@ -88,6 +88,7 @@ static void __head check_la57_support(unsigned long physaddr)
*fixup_int(&ptrs_per_p4d, physaddr) = 512;
*fixup_long(&page_offset_base, physaddr) = __PAGE_OFFSET_BASE_L5;
*fixup_long(&vmalloc_base, physaddr) = __VMALLOC_BASE_L5;
+ *fixup_long(&vmemmap_base, physaddr) = __VMEMMAP_BASE_L5;
}
#else
static void __head check_la57_support(unsigned long physaddr) {}
--
2.15.1
next prev parent reply other threads:[~2018-02-14 18:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 18:25 [PATCH 0/9] x86: enable boot-time switching between paging modes Kirill A. Shutemov
2018-02-14 18:25 ` [PATCH 1/9] x86/mm: Initialize pgtable_l5_enabled at boot-time Kirill A. Shutemov
2018-02-16 10:51 ` [tip:x86/mm] x86/mm: Initialize 'pgtable_l5_enabled' " tip-bot for Kirill A. Shutemov
2018-02-14 18:25 ` [PATCH 2/9] x86/mm: Initialize pgdir_shift and ptrs_per_p4d " Kirill A. Shutemov
2018-02-16 10:52 ` [tip:x86/mm] x86/mm: Initialize 'pgdir_shift' and 'ptrs_per_p4d' " tip-bot for Kirill A. Shutemov
2018-02-14 18:25 ` [PATCH 3/9] x86/mm: Initialize page_offset_base " Kirill A. Shutemov
2018-02-16 10:53 ` [tip:x86/mm] x86/mm: Initialize 'page_offset_base' " tip-bot for Kirill A. Shutemov
2018-02-14 18:25 ` [PATCH 4/9] x86/mm: Adjust vmalloc base and size " Kirill A. Shutemov
2018-02-16 10:53 ` [tip:x86/mm] " tip-bot for Kirill A. Shutemov
2018-02-14 18:25 ` Kirill A. Shutemov [this message]
2018-02-16 10:54 ` [tip:x86/mm] x86/mm: Initialize vmemmap_base " tip-bot for Kirill A. Shutemov
2018-02-14 18:25 ` [PATCH 6/9] x86/mm: Make early boot code support boot-time switching of paging modes Kirill A. Shutemov
2018-02-16 10:54 ` [tip:x86/mm] x86/mm: Support boot-time switching of paging modes in the early boot code tip-bot for Kirill A. Shutemov
2018-02-14 18:25 ` [PATCH 7/9] x86/mm: Fold p4d page table layer at runtime Kirill A. Shutemov
2018-02-16 10:55 ` [tip:x86/mm] " tip-bot for Kirill A. Shutemov
2018-02-14 18:25 ` [PATCH 8/9] x86/mm: Replace compile-time checks for 5-level with runtime-time Kirill A. Shutemov
2018-02-16 10:55 ` [tip:x86/mm] x86/mm: Replace compile-time checks for 5-level paging with runtime-time checks tip-bot for Kirill A. Shutemov
2018-02-14 18:25 ` [PATCH 9/9] x86/mm: Allow to boot without la57 if CONFIG_X86_5LEVEL=y Kirill A. Shutemov
2018-02-16 10:55 ` [tip:x86/mm] x86/mm: Allow to boot without LA57 " tip-bot for Kirill A. Shutemov
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=20180214182542.69302-6-kirill.shutemov@linux.intel.com \
--to=kirill.shutemov@linux.intel.com \
--cc=ak@linux.intel.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/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).