Re: [Xen-devel] Some fixes for xen-3.4-testing/xen-unstable

[Daniel Kiper <dkiper@xxxxxxxxxxxx>]

Hi,

On Tue, Feb 23, 2010 at 03:49:33PM +0100, Daniel Kiper wrote:
> Hi,
>
> On Tue, Feb 23, 2010 at 01:27:40PM +0900, Kouya Shimura wrote:
> > Hi,
> >
> > I already fixed it in c/s 20720. It is not applied to xen-3.4 yet.
> > (And the comment of c/s 20720 is reverted by Tim in c/s 20751.)
> > Does the warning still be seen in xen-unstable?
>
> Currently I could not check that in xen-unstable. I think that
> your idea is better. I am going to check it in xen-3.4-testing.
> I will prepare apriopriate patches for xen-3.4-testing/xen-unstable soon.

Below are new versions of patches. Thank you for your help.

# HG changeset patch
# User dkiper@xxxxxxxxxxxx
# Date 1267443789 -3600
# Node ID 822734301da78e53e3f205da23202506afb4c387
# Parent  fa6ee088d915e53c075fb5c6e225f5200e1a0a99
New release of C/S 19894 "Disable memory mapping warnings when stub domain is 
used."

This is backport from xen-unstable.

Signed-off-by: Daniel Kiper <dkiper@xxxxxxxxxxxx>

diff -r fa6ee088d915 -r 822734301da7 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Fri Feb 26 17:10:48 2010 +0000
+++ b/xen/arch/x86/mm.c Mon Mar 01 12:43:09 2010 +0100
@@ -3932,6 +3932,9 @@ long arch_memory_op(int op, XEN_GUEST_HA
 
         domain_lock(d);
 
+        if ( page )
+            put_page(page);
+
         /* Remove previously mapped page if it was present. */
         prev_mfn = gmfn_to_mfn(d, xatp.gpfn);
         if ( mfn_valid(prev_mfn) )
@@ -3953,9 +3956,6 @@ long arch_memory_op(int op, XEN_GUEST_HA
         rc = guest_physmap_add_page(d, xatp.gpfn, mfn, 0);
 
         domain_unlock(d);
-
-        if ( page )
-            put_page(page);
 
         rcu_unlock_domain(d);
 
diff -r fa6ee088d915 -r 822734301da7 xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Fri Feb 26 17:10:48 2010 +0000
+++ b/xen/arch/x86/mm/shadow/common.c   Mon Mar 01 12:43:09 2010 +0100
@@ -2584,11 +2584,9 @@ int sh_remove_all_mappings(struct vcpu *
     {
         /* Don't complain if we're in HVM and there are some extra mappings: 
          * The qemu helper process has an untyped mapping of this dom's RAM 
-         * and the HVM restore program takes another. Additionally, if stub
-         * domain is active then it also has an untyped mapping of original
-         * domain's RAM. */
+         * and the HVM restore program takes another. */
         if ( !(shadow_mode_external(v->domain)
-               && (page->count_info & PGC_count_mask) <= 4
+               && (page->count_info & PGC_count_mask) <= 3
                && (page->u.inuse.type_info & PGT_count_mask) == 0) )
         {
             SHADOW_ERROR("can't find all mappings of mfn %lx: "

# HG changeset patch
# User dkiper@xxxxxxxxxxxx
# Date 1267443140 -3600
# Node ID 32d996d0c3f1acc6da8b0e9d742ca9e9a3bc2915
# Parent  c4301c2c727dc996ada3656c9105caeab92d9bdb
Revert C/S 20966 "Disable memory mapping warnings when stub domain is used."

It was ealier resolved by C/S 20720 and C/S 20751.
This fix was backported to xen-3.4-testing.

Signed-off-by: Daniel Kiper <dkiper@xxxxxxxxxxxx>

diff -r c4301c2c727d -r 32d996d0c3f1 xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Fri Feb 26 17:09:50 2010 +0000
+++ b/xen/arch/x86/mm/shadow/common.c   Mon Mar 01 12:32:20 2010 +0100
@@ -2607,11 +2607,9 @@ int sh_remove_all_mappings(struct vcpu *
     {
         /* Don't complain if we're in HVM and there are some extra mappings: 
          * The qemu helper process has an untyped mapping of this dom's RAM 
-         * and the HVM restore program takes another. Additionally, if stub
-         * domain is active then it also has an untyped mapping of original
-         * domain's RAM. */
+         * and the HVM restore program takes another. */
         if ( !(shadow_mode_external(v->domain)
-               && (page->count_info & PGC_count_mask) <= 4
+               && (page->count_info & PGC_count_mask) <= 3
                && (page->u.inuse.type_info & PGT_count_mask) == 0) )
         {
             SHADOW_ERROR("can't find all mappings of mfn %lx: "

Daniel

Attachment: xen-3.4-testing-stub-domain-disable-memory-mapping-warnings_20100301.patch
Description: Text document

Attachment: xen-unstable-stub-domain-disable-memory-mapping-warnings_20100301.patch
Description: Text document

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