From: Tim Deegan Subject: [PATCH] Relax assertion in VRAM tracking code Date: Mon, 16 Nov 2009 17:00:40 +0000 Message-ID: <20091116170040.GC14284@whitby.uk.xensource.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="vGgW1X5XWziG23Ko" Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-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 --vGgW1X5XWziG23Ko Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline The original assertion is too strict, as it includes the A/D bits of the PTE, which (by design) can change under our feet. Signed-off-by: Tim Deegan --vGgW1X5XWziG23Ko Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: attachment; filename="vram-assertion" diff -r 42e9682e4b61 xen/arch/x86/mm/shadow/multi.c --- a/xen/arch/x86/mm/shadow/multi.c Mon Oct 26 13:33:38 2009 +0000 +++ b/xen/arch/x86/mm/shadow/multi.c Mon Nov 16 16:58:27 2009 +0000 @@ -1117,7 +1117,8 @@ } else { - ASSERT(dirty_vram->sl1ma[i] == sl1ma); + ASSERT((dirty_vram->sl1ma[i] & PAGE_MASK) + == (sl1ma & PAGE_MASK)); dirty_vram->sl1ma[i] = INVALID_PADDR; if ( flags & _PAGE_DIRTY ) dirty = 1; --vGgW1X5XWziG23Ko Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --vGgW1X5XWziG23Ko--