Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Juergen Gross]

Xen patchbot-unstable wrote:
> # HG changeset patch
> # User Keir Fraser <keir.fraser@citrix.com>
> # Date 1254897996 -3600
> # Node ID 95ea2052b41b209fa913d6861143915140be4171
> # Parent  7d4f05a65d5a840eca5fdf1319c696d5583f100d
> Introduce a grant_entry_v2 structure.
> 
> Signed-off-by: Steven Smith <steven.smith@citrix.com>

This patch breaks my build:

make[3]: Entering directory `/home/gross/xen-unstable.hg/tools/libxc'
gcc  -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -m64 -g
-fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wno-unused-value
-Wdeclaration-after-statement  -D__XEN_TOOLS__ -MMD -MF .xc_core.o.d
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
-I../../xen/common/libelf -Werror -Wmissing-prototypes  -I. -I../xenstore
-I../include -c -o xc_core.o xc_core.c
In file included from xg_private.h:14,
                 from xc_core.c:52:
xenctrl.h:948: error: ‘grant_entry_v2’ defined as wrong kind of tag
make[3]: *** [xc_core.o] Error 1
make[3]: Leaving directory `/home/gross/xen-unstable.hg/tools/libxc'
make[2]: *** [build] Error 2
make[2]: Leaving directory `/home/gross/xen-unstable.hg/tools/libxc'
make[1]: *** [subdir-all-libxc] Error 2
make[1]: Leaving directory `/home/gross/xen-unstable.hg/tools'
make: *** [subdirs-all] Error 2


Juergen

-- 
Juergen Gross                 Principal Developer Operating Systems
TSP ES&S SWE OS6                       Telephone: +49 (0) 89 636 47950
Fujitsu Technolgy Solutions               e-mail: juergen.gross@ts.fujitsu.com
Otto-Hahn-Ring 6                        Internet: ts.fujitsu.com
D-81739 Muenchen                 Company details: ts.fujitsu.com/imprint.html

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Keir Fraser]

On 07/10/2009 10:01, "Juergen Gross" <juergen.gross@ts.fujitsu.com> wrote:

>> Introduce a grant_entry_v2 structure.
>> 
>> Signed-off-by: Steven Smith <steven.smith@citrix.com>
> 
> This patch breaks my build:

Should be fixed by c/s 20288.

 Thanks,
 K.

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Juergen Gross]

Keir Fraser wrote:
> On 07/10/2009 10:01, "Juergen Gross" <juergen.gross@ts.fujitsu.com> wrote:
> 
>>> Introduce a grant_entry_v2 structure.
>>>
>>> Signed-off-by: Steven Smith <steven.smith@citrix.com>
>> This patch breaks my build:
> 
> Should be fixed by c/s 20288.

Build still not okay:

cc1: warnings being treated as errors
xc_minios.c:417: error: no previous prototype for ‘xc_gnttab_map_table’
make[4]: *** [xc_minios.o] Error 1
make[4]: Leaving directory `/home/gross/xen-unstable.hg/stubdom/libxc-x86_64'
make[3]: *** [build] Error 2
make[3]: Leaving directory `/home/gross/xen-unstable.hg/stubdom/libxc-x86_64'
make[2]: *** [libxc-x86_64/libxenctrl.a] Error 2
make[2]: Leaving directory `/home/gross/xen-unstable.hg/stubdom'
make[1]: *** [install-stubdom] Error 2
make[1]: Leaving directory `/home/gross/xen-unstable.hg'
make: *** [world] Error 2


Juergen

-- 
Juergen Gross                 Principal Developer Operating Systems
TSP ES&S SWE OS6                       Telephone: +49 (0) 89 636 47950
Fujitsu Technolgy Solutions               e-mail: juergen.gross@ts.fujitsu.com
Otto-Hahn-Ring 6                        Internet: ts.fujitsu.com
D-81739 Muenchen                 Company details: ts.fujitsu.com/imprint.html

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Keir Fraser]

On 07/10/2009 12:26, "Juergen Gross" <juergen.gross@ts.fujitsu.com> wrote:

> Keir Fraser wrote:
>> On 07/10/2009 10:01, "Juergen Gross" <juergen.gross@ts.fujitsu.com> wrote:
>> 
>>>> Introduce a grant_entry_v2 structure.
>>>> 
>>>> Signed-off-by: Steven Smith <steven.smith@citrix.com>
>>> This patch breaks my build:
>> 
>> Should be fixed by c/s 20288.
> 
> Build still not okay:

Fixed by c/s 20291.

 -- Keir

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Steven Smith]

[-- Attachment #1.1: Type: text/plain, Size: 340 bytes --]

> >>>> Introduce a grant_entry_v2 structure.
> >>>> 
> >>>> Signed-off-by: Steven Smith <steven.smith@citrix.com>
> >>> This patch breaks my build:
> >> 
> >> Should be fixed by c/s 20288.
> > 
> > Build still not okay:
> Fixed by c/s 20291.
Oops; sorry about that.  I completely forgot about the non-Linux dom0
OSes.

Steven.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

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

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Keir Fraser]

On 07/10/2009 18:55, "Steven Smith" <Steven.Smith@eu.citrix.com> wrote:

>>>>>> Introduce a grant_entry_v2 structure.
>>>>>> 
>>>>>> Signed-off-by: Steven Smith <steven.smith@citrix.com>
>>>>> This patch breaks my build:
>>>> 
>>>> Should be fixed by c/s 20288.
>>> 
>>> Build still not okay:
>> Fixed by c/s 20291.
> Oops; sorry about that.  I completely forgot about the non-Linux dom0
> OSes.

Could you have a stab at fixing the IA64 gnttab hooks? Either that or
solicit help from the ia64 devs (cc'ing Isaku).

 K.

grant_table.c: In function 'gnttab_populate_status_frames':
grant_table.c:1026: warning: implicit declaration of function
'gnttab_create_status_page'
grant_table.c: In function 'gnttab_grow_table':
grant_table.c:1088: error: 'struct grant_table' has no member named 'shared'
grant_table.c:1088: error: 'struct grant_table' has no member named 'shared'
grant_table.c: In function '__acquire_grant_for_copy':
grant_table.c:1757: error: 'INVALID_GFN' undeclared (first use in this
function)
grant_table.c:1757: error: (Each undeclared identifier is reported only once
grant_table.c:1757: error: for each function it appears in.)
grant_table.c: In function 'gnttab_get_status_frames':
grant_table.c:2083: warning: implicit declaration of function
'gnttab_status_gmfn'
grant_table.c: In function 'grant_table_create':
grant_table.c:2326: error: 'struct grant_table' has no member named 'shared'
grant_table.c:2326: error: 'struct grant_table' has no member named 'shared'

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Steven Smith]

[-- Attachment #1.1: Type: text/plain, Size: 644 bytes --]

> >>>>>> Introduce a grant_entry_v2 structure.
> >>>>>> 
> >>>>>> Signed-off-by: Steven Smith <steven.smith@citrix.com>
> >>>>> This patch breaks my build:
> >>>> 
> >>>> Should be fixed by c/s 20288.
> >>> 
> >>> Build still not okay:
> >> Fixed by c/s 20291.
> > Oops; sorry about that.  I completely forgot about the non-Linux dom0
> > OSes.
> Could you have a stab at fixing the IA64 gnttab hooks? Either that or
> solicit help from the ia64 devs (cc'ing Isaku).
I don't have an IA64 build environment set up right now.  Do you know
if there are any Citrix (or other) ones which I could borrow for a
bit, please?

Steven.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

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

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Keir Fraser]

On 08/10/2009 13:01, "Steven Smith" <Steven.Smith@eu.citrix.com> wrote:

>>> Oops; sorry about that.  I completely forgot about the non-Linux dom0
>>> OSes.
>> Could you have a stab at fixing the IA64 gnttab hooks? Either that or
>> solicit help from the ia64 devs (cc'ing Isaku).
> I don't have an IA64 build environment set up right now.  Do you know
> if there are any Citrix (or other) ones which I could borrow for a
> bit, please?

We usually just take a stab and let the ia64 guys fix up if necessary. :-) I
suggest just run a draft patch by Isaku.

 -- Keir

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Isaku Yamahata]

I'll look into it tomorrow or next week.
thanks,

On Thu, Oct 08, 2009 at 11:58:18AM +0100, Keir Fraser wrote:
> On 07/10/2009 18:55, "Steven Smith" <Steven.Smith@eu.citrix.com> wrote:
> 
> >>>>>> Introduce a grant_entry_v2 structure.
> >>>>>> 
> >>>>>> Signed-off-by: Steven Smith <steven.smith@citrix.com>
> >>>>> This patch breaks my build:
> >>>> 
> >>>> Should be fixed by c/s 20288.
> >>> 
> >>> Build still not okay:
> >> Fixed by c/s 20291.
> > Oops; sorry about that.  I completely forgot about the non-Linux dom0
> > OSes.
> 
> Could you have a stab at fixing the IA64 gnttab hooks? Either that or
> solicit help from the ia64 devs (cc'ing Isaku).
> 
>  K.
> 
> grant_table.c: In function 'gnttab_populate_status_frames':
> grant_table.c:1026: warning: implicit declaration of function
> 'gnttab_create_status_page'
> grant_table.c: In function 'gnttab_grow_table':
> grant_table.c:1088: error: 'struct grant_table' has no member named 'shared'
> grant_table.c:1088: error: 'struct grant_table' has no member named 'shared'
> grant_table.c: In function '__acquire_grant_for_copy':
> grant_table.c:1757: error: 'INVALID_GFN' undeclared (first use in this
> function)
> grant_table.c:1757: error: (Each undeclared identifier is reported only once
> grant_table.c:1757: error: for each function it appears in.)
> grant_table.c: In function 'gnttab_get_status_frames':
> grant_table.c:2083: warning: implicit declaration of function
> 'gnttab_status_gmfn'
> grant_table.c: In function 'grant_table_create':
> grant_table.c:2326: error: 'struct grant_table' has no member named 'shared'
> grant_table.c:2326: error: 'struct grant_table' has no member named 'shared'
> 
> 

-- 
yamahata

Re: Re: [Xen-changelog] [xen-unstable] Introduce a grant_entry_v2 structure.

[Steven Smith]

[-- Attachment #1.1.1: Type: text/plain, Size: 1101 bytes --]

> > >>>>>> Introduce a grant_entry_v2 structure.
> > >>>>>> 
> > >>>>>> Signed-off-by: Steven Smith <steven.smith@citrix.com>
> > >>>>> This patch breaks my build:
> > >>>> 
> > >>>> Should be fixed by c/s 20288.
> > >>> 
> > >>> Build still not okay:
> > >> Fixed by c/s 20291.
> > > Oops; sorry about that.  I completely forgot about the non-Linux dom0
> > > OSes.
> > Could you have a stab at fixing the IA64 gnttab hooks? Either that or
> > solicit help from the ia64 devs (cc'ing Isaku).
> I don't have an IA64 build environment set up right now.  Do you know
> if there are any Citrix (or other) ones which I could borrow for a
> bit, please?
After some fiddling, I managed to get an IA64 cross toolchain set up,
and the attached patch fixes the IA64 build of the hypervisor.  I
don't have any IA64 test boxes, so I've no idea whether it actually
works, but it does build.

I've not looked at the changes to libxc, because my cross-compiler
doesn't seem to be able to cope with userspace stuff, but I'd guess
they'll probably be okay.

Sorry about the mess.

Steven.

[-- Attachment #1.1.2: fix-ia64-build.diff --]
[-- Type: text/x-diff, Size: 3973 bytes --]

Fix the IA64 build of the hypervisor.

This is completely untested, beyond confirming that it compiles.

Signed-off-by: Steven Smith <steven.smith@citrix.com>

diff -r 1d7221667204 xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c	Thu Oct 08 09:24:32 2009 +0100
+++ b/xen/arch/ia64/xen/mm.c	Thu Oct 08 18:55:38 2009 +0100
@@ -3335,7 +3335,7 @@
                 gnttab_grow_table(d, xatp.idx + 1);
 
             if (xatp.idx < nr_grant_frames(d->grant_table))
-                mfn = virt_to_mfn(d->grant_table->shared[xatp.idx]);
+                mfn = virt_to_mfn(d->grant_table->shared_raw[xatp.idx]);
 
             spin_unlock(&d->grant_table->lock);
             break;
diff -r 1d7221667204 xen/common/grant_table.c
--- a/xen/common/grant_table.c	Thu Oct 08 09:24:32 2009 +0100
+++ b/xen/common/grant_table.c	Thu Oct 08 18:55:38 2009 +0100
@@ -1754,7 +1754,7 @@
                blocks mappings of transitive grants. */
             is_sub_page = 1;
             *owning_domain = rrd;
-            act->gfn = INVALID_GFN;
+            act->gfn = -1ul;
         }
         else if ( sha1 )
         {
diff -r 1d7221667204 xen/include/asm-ia64/grant_table.h
--- a/xen/include/asm-ia64/grant_table.h	Thu Oct 08 09:24:32 2009 +0100
+++ b/xen/include/asm-ia64/grant_table.h	Thu Oct 08 18:55:38 2009 +0100
@@ -31,8 +31,12 @@
 /* Guest physical address of the grant table.  */
 #define IA64_GRANT_TABLE_PADDR  IA64_XMAPPEDREGS_PADDR(NR_CPUS)
 
-#define gnttab_shared_maddr(t, i)       (virt_to_maddr((t)->shared[(i)]))
-#define gnttab_shared_page(t, i)        (virt_to_page((t)->shared[(i)]))
+#define gnttab_shared_maddr(t, i)       (virt_to_maddr((t)->shared_raw[(i)]))
+#define gnttab_shared_page(t, i)        (virt_to_page((t)->shared_raw[(i)]))
+
+#define gnttab_status_maddr(t, i)       (virt_to_maddr((t)->status[(i)]))
+#define gnttab_status_mfn(t, i)       (virt_to_maddr((t)->status[(i)]) >> PAGE_SHIFT)
+#define gnttab_status_page(t, i)        (virt_to_page((t)->status[(i)]))
 
 #define ia64_gnttab_create_shared_page(d, t, i)                         \
     do {                                                                \
@@ -55,8 +59,26 @@
             ia64_gnttab_create_shared_page((d), (t), (i));      \
     } while (0)
 
+#define ia64_gnttab_create_status_page(d, t, i)                         \
+    do {                                                                \
+        BUG_ON((d)->arch.mm.pgd == NULL);                               \
+        assign_domain_page((d),                                         \
+                           IA64_GRANT_TABLE_PADDR + ((i) << PAGE_SHIFT), \
+                           gnttab_status_maddr((t), (i)));              \
+    } while (0)
+
+#define gnttab_create_status_page(d, t, i)                      \
+    do {                                                        \
+        share_xen_page_with_guest(gnttab_status_page((t), (i)), \
+                                  (d), XENSHARE_writable);      \
+        if ((d)->arch.mm.pgd)                                   \
+            ia64_gnttab_create_status_page((d), (t), (i));      \
+    } while (0)
+
 #define gnttab_shared_gmfn(d, t, i)                 \
     ((IA64_GRANT_TABLE_PADDR >> PAGE_SHIFT) + (i))
+#define gnttab_status_gmfn(d, t, i)                     \
+    (mfn_to_gmfn(d, gnttab_status_mfn(t, i)))
 
 #define gnttab_mark_dirty(d, f) ((void)f)
 
diff -r 1d7221667204 xen/include/asm-x86/grant_table.h
--- a/xen/include/asm-x86/grant_table.h	Thu Oct 08 09:24:32 2009 +0100
+++ b/xen/include/asm-x86/grant_table.h	Thu Oct 08 18:55:38 2009 +0100
@@ -44,7 +44,7 @@
     ((virt_to_maddr((t)->status[i]) >> PAGE_SHIFT))
 
 #define gnttab_status_gmfn(d, t, i)                     \
-    (mfn_to_gmfn(d, gnttab_status_mfn(d, t, i)))
+    (mfn_to_gmfn(d, gnttab_status_mfn(t, i)))
 
 #define gnttab_mark_dirty(d, f) paging_mark_dirty((d), (f))
 

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

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