This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-changelog] [xen-unstable] pv-grub: Fix for incorrect dom->p2m_host[

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] pv-grub: Fix for incorrect dom->p2m_host[] list initialization
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Thu, 28 Apr 2011 03:55:10 +0100
Delivery-date: Wed, 27 Apr 2011 19:55:55 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Daniel Kiper <dkiper@xxxxxxxxxxxx>
# Date 1303907354 -3600
# Node ID 83fe79c0225f0bf521594a40237c8ef0c40237d5
# Parent  16aac67e948ce8be325a31e5dce43a3c8acd7691
pv-grub: Fix for incorrect dom->p2m_host[] list initialization

Introduction of Linux Kernel git commit
ceefccc93932b920a8ec6f35f596db05202a12fe (x86: default
deeply hidden bug in pv-grub. During kernel load stage dom->p2m_host[]
list has been incorrectly initialized.

At the beginning of kernel load stage dom->p2m_host[] list is
populated with current PFN->MFN layout. Later during memory allocation
(memory is allocated page by page in kexec_allocate()) page order is
changed to establish linear layout in new domain. It is done by
exchanging subsequent MFNs with newly allocated MFNs. dom->p2m_host[]
list is indexed by currently requested PFN (it is incremented from 0)
and PFN of newly allocated paged. If PFN of newly allocated page is
less than currently requested PFN then earlier allocated MFN is
overwritten which leads to domain crash later. This patch corrects
that issue. If PFN of newly allocated page is less then currently
requested PFN then relevant PFN/MFN pair is properly calculated and
usual exchange occurs later.

Signed-off-by: Daniel Kiper <dkiper@xxxxxxxxxxxx>
Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>

diff -r 16aac67e948c -r 83fe79c0225f stubdom/grub/kexec.c
--- a/stubdom/grub/kexec.c      Mon Apr 25 15:27:56 2011 +0100
+++ b/stubdom/grub/kexec.c      Wed Apr 27 13:29:14 2011 +0100
@@ -48,6 +48,7 @@
 static unsigned long *pages;
 static unsigned long *pages_mfns;
+static xen_pfn_t *pages_moved2pfns;
 static unsigned long allocated;
 int pin_table(xc_interface *xc_handle, unsigned int type, unsigned long mfn,
@@ -80,6 +81,7 @@
     pages = realloc(pages, new_allocated * sizeof(*pages));
     pages_mfns = realloc(pages_mfns, new_allocated * sizeof(*pages_mfns));
+    pages_moved2pfns = realloc(pages_moved2pfns, new_allocated * 
     for (i = allocated; i < new_allocated; i++) {
         /* Exchange old page of PFN i with a newly allocated page.  */
         xen_pfn_t old_mfn = dom->p2m_host[i];
@@ -91,6 +93,18 @@
         new_pfn = PHYS_PFN(to_phys(pages[i]));
         pages_mfns[i] = new_mfn = pfn_to_mfn(new_pfn);
+       /*
+        * If PFN of newly allocated page (new_pfn) is less then currently
+        * requested PFN (i) then look for relevant PFN/MFN pair. In this
+        * situation dom->p2m_host[new_pfn] no longer contains proper MFN
+        * because original page with new_pfn was moved earlier
+        * to different location.
+        */
+       for (; new_pfn < i; new_pfn = pages_moved2pfns[new_pfn]);
+       /* Store destination PFN of currently requested page. */
+       pages_moved2pfns[i] = new_pfn;
         /* Put old page at new PFN */
         dom->p2m_host[new_pfn] = old_mfn;

Xen-changelog mailing list

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] pv-grub: Fix for incorrect dom->p2m_host[] list initialization, Xen patchbot-unstable <=