Patch "xen/setup: Don't relocate p2m over existing one" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xen-setup-don-t-relocate-p2m-over-existing-one.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Ross Lagerwall <[email protected]>
Date: Mon, 12 Dec 2016 14:35:13 +0000
Subject: xen/setup: Don't relocate p2m over existing one

From: Ross Lagerwall <[email protected]>

commit 7ecec8503af37de6be4f96b53828d640a968705f upstream.

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.

---
 arch/x86/xen/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

@@ -713,10 +713,9 @@ static void __init xen_reserve_xen_mfnli
 		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_mfnli
 	BUG();
 #else
 	xen_relocate_p2m();
+	memblock_free(start, size);
 #endif
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/xen-setup-don-t-relocate-p2m-over-existing-one.patch