WARNING - OLD ARCHIVES

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/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] x86 shadow: Relax assertion in VRAM track

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] x86 shadow: Relax assertion in VRAM tracking code
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Sun, 22 Nov 2009 23:35:20 -0800
Delivery-date: Sun, 22 Nov 2009 23:35:43 -0800
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 Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1258958630 0
# Node ID 1bbc132675a29a030ba7b1ab4b5f6ade8087f94c
# Parent  5ea5cce3b9ada967029fcee19686c392fcf975fe
x86 shadow: Relax assertion in VRAM tracking code

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 <Tim.Deegan@xxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/multi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 5ea5cce3b9ad -r 1bbc132675a2 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Mon Nov 23 06:42:12 2009 +0000
+++ b/xen/arch/x86/mm/shadow/multi.c    Mon Nov 23 06:43:50 2009 +0000
@@ -1117,7 +1117,8 @@ static inline void shadow_vram_put_l1e(s
             }
             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;

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] x86 shadow: Relax assertion in VRAM tracking code, Xen patchbot-unstable <=