From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Juergen Gross <jgross@suse.com>,
Andrew Morton <akpm@linux-foundation.org>,
Andy Lutomirski <luto@amacapital.net>,
Borislav Petkov <bp@suse.de>,
Cyrill Gorcunov <gorcunov@openvz.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
linux-mm@kvack.org, Ingo Molnar <mingo@kernel.org>
Subject: [PATCH 4.14 025/159] x86/xen: Provide pre-built page tables only for CONFIG_XEN_PV=y and CONFIG_XEN_PVH=y
Date: Fri, 22 Dec 2017 09:45:10 +0100 [thread overview]
Message-ID: <20171222084625.126160115@linuxfoundation.org> (raw)
In-Reply-To: <20171222084623.668990192@linuxfoundation.org>
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
commit 4375c29985f155d7eb2346615d84e62d1b673682 upstream.
Looks like we only need pre-built page tables in the CONFIG_XEN_PV=y and
CONFIG_XEN_PVH=y cases.
Let's not provide them for other configurations.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@suse.de>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20170929140821.37654-5-kirill.shutemov@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/x86/kernel/head_64.S | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -38,11 +38,12 @@
*
*/
-#define p4d_index(x) (((x) >> P4D_SHIFT) & (PTRS_PER_P4D-1))
#define pud_index(x) (((x) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
+#if defined(CONFIG_XEN_PV) || defined(CONFIG_XEN_PVH)
PGD_PAGE_OFFSET = pgd_index(__PAGE_OFFSET_BASE)
PGD_START_KERNEL = pgd_index(__START_KERNEL_map)
+#endif
L3_START_KERNEL = pud_index(__START_KERNEL_map)
.text
@@ -365,10 +366,7 @@ NEXT_PAGE(early_dynamic_pgts)
.data
-#ifndef CONFIG_XEN
-NEXT_PAGE(init_top_pgt)
- .fill 512,8,0
-#else
+#if defined(CONFIG_XEN_PV) || defined(CONFIG_XEN_PVH)
NEXT_PAGE(init_top_pgt)
.quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE_NOENC
.org init_top_pgt + PGD_PAGE_OFFSET*8, 0
@@ -385,6 +383,9 @@ NEXT_PAGE(level2_ident_pgt)
* Don't set NX because code runs from these pages.
*/
PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
+#else
+NEXT_PAGE(init_top_pgt)
+ .fill 512,8,0
#endif
#ifdef CONFIG_X86_5LEVEL
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-12-22 8:59 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20171222084623.668990192@linuxfoundation.org>
2017-12-22 8:45 ` [PATCH 4.14 023/159] mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y Greg Kroah-Hartman
2017-12-22 14:18 ` Dan Rue
2017-12-22 14:52 ` Naresh Kamboju
2017-12-22 15:12 ` Greg Kroah-Hartman
2017-12-22 15:03 ` Greg Kroah-Hartman
2018-01-07 5:14 ` Mike Galbraith
2018-01-07 9:11 ` Greg Kroah-Hartman
2018-01-07 9:21 ` Mike Galbraith
2018-01-07 10:18 ` Michal Hocko
2018-01-07 10:42 ` Greg Kroah-Hartman
2018-01-07 12:44 ` Mike Galbraith
2018-01-07 13:23 ` Michal Hocko
2018-01-08 7:53 ` Greg Kroah-Hartman
2018-01-08 8:15 ` Mike Galbraith
2018-01-08 8:33 ` Greg Kroah-Hartman
2018-01-08 9:45 ` Mike Galbraith
2018-01-08 8:47 ` Michal Hocko
2018-01-08 9:10 ` Greg Kroah-Hartman
2018-01-08 9:27 ` Greg Kroah-Hartman
2018-01-08 16:04 ` Ingo Molnar
2018-01-08 17:46 ` Kirill A. Shutemov
2018-01-09 0:13 ` Kirill A. Shutemov
2018-01-09 1:09 ` Dave Young
2018-01-09 5:41 ` Baoquan He
2018-01-09 7:24 ` Dave Young
2018-01-09 9:05 ` Kirill A. Shutemov
2018-01-10 3:08 ` Dave Young
2018-01-10 11:16 ` Kirill A. Shutemov
2018-01-11 1:06 ` Baoquan He
2018-01-12 0:55 ` Dave Young
2018-01-15 5:57 ` Omar Sandoval
2018-01-16 8:36 ` Atsushi Kumagai
2018-01-09 3:44 ` Mike Galbraith
2018-02-07 9:25 ` Dou Liyang
2018-02-07 10:41 ` Kirill A. Shutemov
2018-02-07 10:45 ` Mike Galbraith
2018-02-07 12:00 ` Dou Liyang
2018-02-07 12:08 ` Baoquan He
2018-02-07 12:17 ` Dou Liyang
2018-02-07 12:27 ` Baoquan He
2018-02-07 12:34 ` Dou Liyang
2018-02-07 12:45 ` Baoquan He
2018-02-08 1:14 ` Dou Liyang
2018-02-08 1:23 ` Baoquan He
2018-02-08 1:44 ` Dou Liyang
2018-02-07 11:28 ` Baoquan He
2018-01-17 5:24 ` Baoquan He
2018-01-25 15:50 ` Kirill A. Shutemov
2018-01-26 2:48 ` Baoquan He
2017-12-22 8:45 ` [PATCH 4.14 024/159] x86/kasan: Use the same shadow offset for 4- and 5-level paging Greg Kroah-Hartman
2017-12-22 8:45 ` Greg Kroah-Hartman [this message]
2017-12-22 8:45 ` [PATCH 4.14 026/159] x86/xen: Drop 5-level paging support code from the XEN_PV code Greg Kroah-Hartman
2017-12-22 8:45 ` [PATCH 4.14 033/159] x86/boot: Relocate definition of the initial state of CR0 Greg Kroah-Hartman
2017-12-22 8:46 ` [PATCH 4.14 097/159] x86/paravirt: Dont patch flush_tlb_single Greg Kroah-Hartman
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=20171222084625.126160115@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=bp@suse.de \
--cc=gorcunov@openvz.org \
--cc=jgross@suse.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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).