Re: [Xen-devel] [xen-unstable test] 11825: regressions - FAIL

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

xen.org writes ("[xen-unstable test] 11825: regressions - FAIL"):
>  build-i386                    4 xen-build                 fail   like 11637

gcc -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing 
-std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement   
-fno-builtin -fno-common -Wredundant-decls -iwithprefix include -Werror 
-Wno-pointer-arith -pipe 
-I/home/osstest/build.11825.build-i386/xen-unstable/xen/include  
-I/home/osstest/build.11825.build-i386/xen-unstable/xen/include/asm-x86/mach-generic
 
-I/home/osstest/build.11825.build-i386/xen-unstable/xen/include/asm-x86/mach-default
 -msoft-float -fno-stack-protector -fno-exceptions -Wnested-externs 
-fno-optimize-sibling-calls -nostdinc -g -D__XEN__ -include 
/home/osstest/build.11825.build-i386/xen-unstable/xen/include/xen/config.h 
-DVERBOSE -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER -MMD -MF .memory.o.d 
-c memory.c -o memory.o
cc1: warnings being treated as errors
memory.c: In function 'guest_remove_page':
memory.c:192: error: implicit declaration of function 'mem_sharing_unshare_page'
memory.c:192: error: nested extern declaration of 'mem_sharing_unshare_page'
make[4]: *** [memory.o] Error 1
make[4]: Leaving directory 
`/home/osstest/build.11825.build-i386/xen-unstable/xen/common'
make[3]: *** 
[/home/osstest/build.11825.build-i386/xen-unstable/xen/common/built_in.o] Error 
2

I think this is due to the changeset below.

Ian.

# HG changeset patch
# User Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
# Date 1328185651 0
# Node ID e2e2df4224e221ff7bbb9a75083d3b21f70a47d2
# Parent  23fe4a60190f11efc750af51f55228183f7bb736
x86/mm: Fix balooning+sharing

Never mind that ballooning a shared page makes no sense. We still fix it
because it may be exercised.

Signed-off-by: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
Signed-off-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Tim Deegan <tim@xxxxxxx>

diff -r 23fe4a60190f -r e2e2df4224e2 xen/common/memory.c
--- a/xen/common/memory.c       Thu Feb 02 12:23:18 2012 +0000
+++ b/xen/common/memory.c       Thu Feb 02 12:27:31 2012 +0000
@@ -183,14 +183,14 @@ int guest_remove_page(struct domain *d, 
             
     page = mfn_to_page(mfn);
 #ifdef CONFIG_X86
-    /* If gmfn is shared, just drop the guest reference (which may or may not
-     * free the page) */
-    if(p2m_is_shared(p2mt))
+    if ( p2m_is_shared(p2mt) )
     {
-        put_page_and_type(page);
-        guest_physmap_remove_page(d, gmfn, mfn, 0);
-        put_gfn(d, gmfn);
-        return 1;
+        /* Unshare the page, bail out on error. We unshare because 
+         * we might be the only one using this shared page, and we
+         * need to trigger proper cleanup. Once done, this is 
+         * like any other page. */
+        if ( mem_sharing_unshare_page(d, gmfn, 0) )
+            return 0;
     }
 
 #endif /* CONFIG_X86 */

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