From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gerd Knorr <kraxel@suse.de>
Subject: [patch] pae >4gb fix #1
Date: Fri, 5 Aug 2005 16:13:07 +0200
Message-ID: <20050805141307.GA17032@bytesex>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

  Hi,

mpt size calculation is wrong, we don't allocate enougth 2MB
pages and pagefault in the memset which clears the mpt.

  Gerd

--- xen/arch/x86/x86_32/mm.c.pae	2005-08-05 15:39:23.000000000 +0200
+++ xen/arch/x86/x86_32/mm.c	2005-08-05 16:05:39.115794436 +0200
@@ -98,7 +98,9 @@
      * installed, but at least 4MB to cover 4GB address space.  This is needed 
      * to make PCI I/O memory address lookups work in guests.
      */
-    if ( (mpt_size = max_page * 4) < (4*1024*1024) )
+#define L2_MASK ((1<<L2_PAGETABLE_SHIFT)-1)
+    mpt_size = (max_page * 4 + L2_MASK) & ~L2_MASK;
+    if (mpt_size < 4*1024*1024)
         mpt_size = 4*1024*1024;
     for ( i = 0; i < (mpt_size >> L2_PAGETABLE_SHIFT); i++ )
     {