[Xen-changelog] [xen-3.4-testing] x86 shadow: fix the check for having killed the guest in the fault handler.

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1255679496 -3600
# Node ID bd411fb0b54ae6c9347f90be00f93ecd78143bb0
# Parent  3eb0e91ae80458b2c80167e40a3022ae2c3f1804
x86 shadow: fix the check for having killed the guest in the fault handler.

We care only about when we have called domain_crash() (and therefore
shadow invariants may not hold) and shouldn't spuriously inject
pagefaults into guests that are shutting down for other reasons.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
xen-unstable changeset:   20289:e1cac8e4bdeb
xen-unstable date:        Wed Oct 07 15:56:05 2009 +0100

x86 shadow: Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   20292:729567f615c1
xen-unstable date:        Wed Oct 07 16:29:03 2009 +0100
---
 xen/arch/x86/mm/shadow/multi.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r 3eb0e91ae804 -r bd411fb0b54a xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Fri Oct 16 08:50:22 2009 +0100
+++ b/xen/arch/x86/mm/shadow/multi.c    Fri Oct 16 08:51:36 2009 +0100
@@ -36,6 +36,7 @@
 #include <asm/hvm/cacheattr.h>
 #include <asm/mtrr.h>
 #include <asm/guest_pt.h>
+#include <public/sched.h>
 #include "private.h"
 #include "types.h"
 
@@ -3091,7 +3092,7 @@ static int sh_page_fault(struct vcpu *v,
      * already used for some special purpose (ioreq pages, or granted pages).
      * If that happens we'll have killed the guest already but it's still not 
      * safe to propagate entries out of the guest PT so get out now. */
-    if ( unlikely(d->is_shutting_down) )
+    if ( unlikely(d->is_shutting_down && d->shutdown_code == SHUTDOWN_crash) )
     {
         SHADOW_PRINTK("guest is shutting down\n");
         goto propagate;
@@ -3191,7 +3192,7 @@ static int sh_page_fault(struct vcpu *v,
          && ft == ft_demand_write )
         sh_unsync(v, gmfn);
 
-    if ( unlikely(d->is_shutting_down) )
+    if ( unlikely(d->is_shutting_down && d->shutdown_code == SHUTDOWN_crash) )
     {
         /* We might end up with a crashed domain here if
          * sh_remove_shadows() in a previous sh_resync() call has

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