diff options
| author | Ross Lagerwall <ross.lagerwall@citrix.com> | 2016-12-12 14:35:13 +0000 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2016-12-22 10:04:02 +0100 |
| commit | 7ecec8503af37de6be4f96b53828d640a968705f (patch) | |
| tree | c6609057a9250b302a2cc0fc07c0e45ebb7ecf08 /arch/x86 | |
| parent | 709613ad2b3c9eaeb2a3e24284b7c8feffc17326 (diff) | |
| download | linux-7ecec8503af37de6be4f96b53828d640a968705f.tar.gz linux-7ecec8503af37de6be4f96b53828d640a968705f.tar.bz2 linux-7ecec8503af37de6be4f96b53828d640a968705f.zip | |
xen/setup: Don't relocate p2m over existing one
When relocating the p2m, take special care not to relocate it so
that is overlaps with the current location of the p2m/initrd. This is
needed since the full extent of the current location is not marked as a
reserved region in the e820.
This was seen to happen to a dom0 with a large initial p2m and a small
reserved region in the middle of the initial p2m.
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 8c394e30e5fe..f3f7b41116f7 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -713,10 +713,9 @@ static void __init xen_reserve_xen_mfnlist(void) size = PFN_PHYS(xen_start_info->nr_p2m_frames); } - if (!xen_is_e820_reserved(start, size)) { - memblock_reserve(start, size); + memblock_reserve(start, size); + if (!xen_is_e820_reserved(start, size)) return; - } #ifdef CONFIG_X86_32 /* @@ -727,6 +726,7 @@ static void __init xen_reserve_xen_mfnlist(void) BUG(); #else xen_relocate_p2m(); + memblock_free(start, size); #endif } |