[Xen-changelog] [xen-4.0-testing] x86-64: Fix memory hotplug epfn upper limit test for updating the

[Xen patchbot-4.0-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Malcolm Crossley <malcolm.crossley@xxxxxxxxxx>
# Date 1335878191 -3600
# Node ID b1a00a222eb948feeb81ccc2ebd822787316fb47
# Parent  4e446ac2c6de1df2586046b7d103b8867e8f591f
x86-64: Fix memory hotplug epfn upper limit test for updating the
compat M2P table

The epfn is being compared to (RDWR_COMPAT_MPT_VIRT_END -
RDWR_COMPAT_MPT_VIRT_START) without a 2 bit shift, resulting in the
epfn being compared to the size of the RDWR_COMPAT_MPT table in bytes
instead of the maximum page frame number that the RDWR_COMPAT_MPT
table can map.

Signed-off-by: Malcolm Crossley <malcolm.crossley@xxxxxxxxxx>
Committed-by: Jan Beulich <jbeulich@xxxxxxxx>
xen-unstable changeset:   25242:b7ce6a88bebb
xen-unstable date:        Wed Apr 25 12:35:56 2012 +0200
---


diff -r 4e446ac2c6de -r b1a00a222eb9 xen/arch/x86/x86_64/mm.c
--- a/xen/arch/x86/x86_64/mm.c  Tue Apr 17 08:37:47 2012 +0100
+++ b/xen/arch/x86/x86_64/mm.c  Tue May 01 14:16:31 2012 +0100
@@ -446,7 +446,7 @@ static int setup_compat_m2p_table(struct
     if   ((smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 
2)) )
         return 0;
 
-    if (epfn > (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START))
+    if ( epfn > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) 
)
         epfn = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2;
 
     emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) &

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog