From: Juergen Gross <jgross@suse.com> To: xen-devel@lists.xensource.com, konrad.wilk@oracle.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Juergen Gross <jgross@suse.com> Subject: [RESEND Patch V3 09/15] xen: check for kernel memory conflicting with memory layout Date: Mon, 4 May 2015 10:23:09 +0200 [thread overview] Message-ID: <1430727795-25133-10-git-send-email-jgross@suse.com> (raw) In-Reply-To: <1430727795-25133-1-git-send-email-jgross@suse.com> Checks whether the pre-allocated memory of the loaded kernel is in conflict with the target memory map. If this is the case, just panic instead of run into problems later, as there is nothing we can do to repair this situation. Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: David Vrabel <david.vrabel@citrix.com> --- arch/x86/xen/setup.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 973d294..9bd3f35 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -27,6 +27,7 @@ #include <xen/interface/memory.h> #include <xen/interface/physdev.h> #include <xen/features.h> +#include <xen/hvc-console.h> #include "xen-ops.h" #include "vdso.h" #include "p2m.h" @@ -790,6 +791,17 @@ char * __init xen_memory_setup(void) sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); + /* + * Check whether the kernel itself conflicts with the target E820 map. + * Failing now is better than running into weird problems later due + * to relocating (and even reusing) pages with kernel text or data. + */ + if (xen_is_e820_reserved(__pa_symbol(_text), + __pa_symbol(__bss_stop) - __pa_symbol(_text))) { + xen_raw_console_write("Xen hypervisor allocated kernel memory conflicts with E820 map\n"); + BUG(); + } + xen_reserve_xen_mfnlist(); /* -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Juergen Gross <jgross@suse.com> To: xen-devel@lists.xensource.com, konrad.wilk@oracle.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Juergen Gross <jgross@suse.com> Subject: [RESEND Patch V3 09/15] xen: check for kernel memory conflicting with memory layout Date: Mon, 4 May 2015 10:23:09 +0200 [thread overview] Message-ID: <1430727795-25133-10-git-send-email-jgross@suse.com> (raw) In-Reply-To: <1430727795-25133-1-git-send-email-jgross@suse.com> Checks whether the pre-allocated memory of the loaded kernel is in conflict with the target memory map. If this is the case, just panic instead of run into problems later, as there is nothing we can do to repair this situation. Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: David Vrabel <david.vrabel@citrix.com> --- arch/x86/xen/setup.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 973d294..9bd3f35 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -27,6 +27,7 @@ #include <xen/interface/memory.h> #include <xen/interface/physdev.h> #include <xen/features.h> +#include <xen/hvc-console.h> #include "xen-ops.h" #include "vdso.h" #include "p2m.h" @@ -790,6 +791,17 @@ char * __init xen_memory_setup(void) sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); + /* + * Check whether the kernel itself conflicts with the target E820 map. + * Failing now is better than running into weird problems later due + * to relocating (and even reusing) pages with kernel text or data. + */ + if (xen_is_e820_reserved(__pa_symbol(_text), + __pa_symbol(__bss_stop) - __pa_symbol(_text))) { + xen_raw_console_write("Xen hypervisor allocated kernel memory conflicts with E820 map\n"); + BUG(); + } + xen_reserve_xen_mfnlist(); /* -- 2.1.4 -- 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:[~2015-05-04 8:24 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-04 8:23 [RESEND Patch V3 00/15] xen: support pv-domains larger than 512GB Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 01/15] xen: sync with xen headers Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 02/15] xen: save linear p2m list address in shared info structure Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 03/15] xen: don't build mfn tree if tools don't need it Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 04/15] xen: eliminate scalability issues from initial mapping setup Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 05/15] xen: move static e820 map to global scope Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 06/15] xen: split counting of extra memory pages from remapping Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 07/15] xen: check memory area against e820 map Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 08/15] xen: find unused contiguous memory area Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` Juergen Gross [this message] 2015-05-04 8:23 ` [RESEND Patch V3 09/15] xen: check for kernel memory conflicting with memory layout Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 10/15] xen: check pre-allocated page tables for conflict with memory map Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 11/15] xen: check for initrd conflicting with e820 map Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 12/15] mm: provide early_memremap_ro to establish read-only mapping Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 13/15] xen: move p2m list if conflicting with e820 map Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 14/15] xen: allow more than 512 GB of RAM for 64 bit pv-domains Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-04 8:23 ` [RESEND Patch V3 15/15] xen: remove no longer needed p2m.h Juergen Gross 2015-05-04 8:23 ` Juergen Gross 2015-05-15 12:17 ` [RESEND Patch V3 00/15] xen: support pv-domains larger than 512GB Juergen Gross 2015-05-15 12:17 ` Juergen Gross -- strict thread matches above, loose matches on Subject: below -- 2015-05-04 6:18 Juergen Gross 2015-05-04 6:19 ` [RESEND Patch V3 09/15] xen: check for kernel memory conflicting with memory layout Juergen Gross
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=1430727795-25133-10-git-send-email-jgross@suse.com \ --to=jgross@suse.com \ --cc=boris.ostrovsky@oracle.com \ --cc=david.vrabel@citrix.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=xen-devel@lists.xensource.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.