iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xen/setup: Don't relocate p2m over existing one

Browse Source 
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>
This commit is contained in:
Ross Lagerwall
2016-12-12 14:35:13 +00:00
committed by Juergen Gross
parent 709613ad2b
commit 7ecec8503a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/xen/setup.c
View File

@@ -713,10 +713,9 @@ static void __init xen_reserve_xen_mfnlist(void)
size = PFN_PHYS(xen_start_info->nr_p2m_frames); 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; return;
}
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
/* /*
@@ -727,6 +726,7 @@ static void __init xen_reserve_xen_mfnlist(void)
BUG(); BUG();
#else #else
xen_relocate_p2m(); xen_relocate_p2m();
memblock_free(start, size);
#endif #endif
} }