diff options
| author | Juergen Gross | 2015-07-17 06:51:31 +0200 |
|---|---|---|
| committer | David Vrabel | 2015-08-20 13:24:21 +0200 |
| commit | 04414baab5ba862b10bde837c4773ffdbb78f0e0 (patch) | |
| tree | a64d6d48e06caf60c2d676d769ec82c55f224201 /arch/x86/xen/setup.c | |
| parent | xen: check for kernel memory conflicting with memory layout (diff) | |
| download | kernel-qcow2-linux-04414baab5ba862b10bde837c4773ffdbb78f0e0.tar.gz kernel-qcow2-linux-04414baab5ba862b10bde837c4773ffdbb78f0e0.tar.xz kernel-qcow2-linux-04414baab5ba862b10bde837c4773ffdbb78f0e0.zip | |
xen: check pre-allocated page tables for conflict with memory map
Check whether the page tables built by the domain builder are at
memory addresses which are in conflict with the target memory map.
If this is the case just panic instead of running into problems
later.
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Konrad Rzeszutek Wilk <Konrad.wilk@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'arch/x86/xen/setup.c')
| -rw-r--r-- | arch/x86/xen/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 9bd3f358f3d9..3fca9c114828 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -802,6 +802,12 @@ char * __init xen_memory_setup(void) BUG(); } + /* + * Check for a conflict of the hypervisor supplied page tables with + * the target E820 map. + */ + xen_pt_check_e820(); + xen_reserve_xen_mfnlist(); /* |