linux-next: build failure after merge of the xen tree

linux-next: build failure after merge of the xen tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 827 bytes --]

Hi all,

After merging the xen tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

arch/x86/xen/time.c: In function 'xen_set_wallclock':
arch/x86/xen/time.c:204:25: error: storage size of 'op' isn't known
arch/x86/xen/time.c:211:11: error: 'XENPF_settime' undeclared (first use in this function)
arch/x86/xen/time.c:211:11: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/xen/time.c:216:2: error: implicit declaration of function 'HYPERVISOR_dom0_op'
arch/x86/xen/time.c:204:25: warning: unused variable 'op'

Caused by commit 7b11a83f592a ("xen/dom0: set wallclock time in Xen").

I have used teh xen tree from next-20110914 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the xen tree

[Jeremy Fitzhardinge]

On 09/14/2011 10:27 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the xen tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> arch/x86/xen/time.c: In function 'xen_set_wallclock':
> arch/x86/xen/time.c:204:25: error: storage size of 'op' isn't known
> arch/x86/xen/time.c:211:11: error: 'XENPF_settime' undeclared (first
use in this function)
> arch/x86/xen/time.c:211:11: note: each undeclared identifier is
reported only once for each function it appears in
> arch/x86/xen/time.c:216:2: error: implicit declaration of function
'HYPERVISOR_dom0_op'
> arch/x86/xen/time.c:204:25: warning: unused variable 'op'
>
> Caused by commit 7b11a83f592a ("xen/dom0: set wallclock time in Xen").
>
> I have used teh xen tree from next-20110914 for today.

Thanks, I'll drop that for now.

    J

linux-next: build failure after merge of the xen tree

[Stephen Rothwell]

Hi all,

After merging the xen tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

arch/x86/xen/setup.c: In function 'xen_add_extra_mem':
arch/x86/xen/setup.c:65: error: implicit declaration of function 'reserve_early'

Caused by commit 42ee1471e9b879479a15debac752314a596c738e ("xen:
implement "extra" memory to reserve space for pages not present at boot")
interacting with commit a9ce6bc15100023b411f8117e53a016d61889800 ("x86,
memblock: Replace e820_/_early string with memblock_").  This latter
commit was in the xen tree yesterday (via a merge of tip/core/memblock)
but has been removed today (but it is in Linus' tree).

Linus will need this fixup patch when he merges the xen tree.  I have
applied it to linux-next today and can carry it as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Oct 2010 12:57:06 +1100
Subject: [PATCH] xen: merge fixup for reserve_early name change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/xen/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 1163bc5..105db25 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -62,7 +62,7 @@ static __init void xen_add_extra_mem(unsigned long pages)
 	e820_add_region(extra_start, size, E820_RAM);
 	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
 
-	reserve_early(extra_start, extra_start + size, "XEN EXTRA");
+	memblock_x86_reserve_range(extra_start, extra_start + size, "XEN EXTRA");
 
 	xen_extra_mem_size += size;
 
-- 
1.7.2.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: build failure after merge of the xen tree

[Jeremy Fitzhardinge]

 On 10/25/2010 01:38 AM, Ian Campbell wrote:
> On Mon, 2010-10-25 at 03:30 +0100, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the xen tree, today's linux-next build (s86_64 allmodconfig)
>> failed like this:
>>
>> arch/x86/xen/setup.c: In function 'xen_memory_setup':
>> arch/x86/xen/setup.c:161: error: implicit declaration of function 'xen_initial_domain'
>>
>> Caused by commit 9e9a5fcb04e3af077d1be32710298b852210d93f ("xen: use host
>> E820 map for dom0").  See Rule 1 from Documentation/SubmitChecklist.
>>
>> I have used the xen tree from next-20101021 for today (due to the complex
>> conflict in Friday's tree).
> Sorry about that, there was a missing #include which was hidden for me
> by a change in the swiotlb-xen tree (d8e0420603cf "xen: define
> BIOVEC_PHYS_MERGEABLE()", FWIW). We shouldn't be relying on indirect
> includes in that way so:

Thanks, fixed.

    J

> 8<-----
>
> Subject: xen: include xen/xen.h for definition of xen_initial_domain()
>
>           CC      arch/x86/xen/setup.o
>         arch/x86/xen/setup.c: In function 'xen_memory_setup':
>         arch/x86/xen/setup.c:161: error: implicit declaration of function 'xen_initial_domain'
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
>
> --- arch/x86/xen/setup.c.orig	2010-10-25 09:31:42.000000000 +0100
> +++ arch/x86/xen/setup.c	2010-10-25 09:31:49.000000000 +0100
> @@ -18,6 +18,7 @@
>  #include <asm/xen/hypervisor.h>
>  #include <asm/xen/hypercall.h>
>  
> +#include <xen/xen.h>
>  #include <xen/page.h>
>  #include <xen/interface/callback.h>
>  #include <xen/interface/memory.h>
>
>

Re: linux-next: build failure after merge of the xen tree

[Ian Campbell]

On Mon, 2010-10-25 at 03:30 +0100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the xen tree, today's linux-next build (s86_64 allmodconfig)
> failed like this:
> 
> arch/x86/xen/setup.c: In function 'xen_memory_setup':
> arch/x86/xen/setup.c:161: error: implicit declaration of function 'xen_initial_domain'
> 
> Caused by commit 9e9a5fcb04e3af077d1be32710298b852210d93f ("xen: use host
> E820 map for dom0").  See Rule 1 from Documentation/SubmitChecklist.
> 
> I have used the xen tree from next-20101021 for today (due to the complex
> conflict in Friday's tree).

Sorry about that, there was a missing #include which was hidden for me
by a change in the swiotlb-xen tree (d8e0420603cf "xen: define
BIOVEC_PHYS_MERGEABLE()", FWIW). We shouldn't be relying on indirect
includes in that way so:

8<-----

Subject: xen: include xen/xen.h for definition of xen_initial_domain()

          CC      arch/x86/xen/setup.o
        arch/x86/xen/setup.c: In function 'xen_memory_setup':
        arch/x86/xen/setup.c:161: error: implicit declaration of function 'xen_initial_domain'

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

--- arch/x86/xen/setup.c.orig	2010-10-25 09:31:42.000000000 +0100
+++ arch/x86/xen/setup.c	2010-10-25 09:31:49.000000000 +0100
@@ -18,6 +18,7 @@
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>
 
+#include <xen/xen.h>
 #include <xen/page.h>
 #include <xen/interface/callback.h>
 #include <xen/interface/memory.h>

linux-next: build failure after merge of the xen tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 613 bytes --]

Hi all,

After merging the xen tree, today's linux-next build (s86_64 allmodconfig)
failed like this:

arch/x86/xen/setup.c: In function 'xen_memory_setup':
arch/x86/xen/setup.c:161: error: implicit declaration of function 'xen_initial_domain'

Caused by commit 9e9a5fcb04e3af077d1be32710298b852210d93f ("xen: use host
E820 map for dom0").  See Rule 1 from Documentation/SubmitChecklist.

I have used the xen tree from next-20101021 for today (due to the complex
conflict in Friday's tree).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: build failure after merge of the xen tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 972 bytes --]

Hi all,

After merging the xen tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

arch/x86/xen/enlighten.c:71: error: __pcpu_scope_xen_vcpu causes a section type conflict
arch/x86/xen/enlighten.c:72: error: __pcpu_scope_xen_vcpu_info causes a section type conflict
arch/x86/xen/enlighten.c:71: error: __pcpu_unique_xen_vcpu causes a section type conflict
arch/x86/xen/enlighten.c:72: error: __pcpu_unique_xen_vcpu_info causes a section type conflict
arch/x86/xen/enlighten.c:565: error: __pcpu_unique_idt_desc causes a section type conflict
arch/x86/xen/enlighten.c:767: error: __pcpu_unique_xen_cr0_value causes a section type conflict

Presumably because commit "support multiple .discard.* sections to avoid
section type conflicts" was dropped from the xen tree today.

I have used the xen tree from next-20100727 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the xen tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

Hi Jeremy,

On Thu, 22 Jul 2010 23:05:10 -0700 Jeremy Fitzhardinge <jeremy@goop.org> wrote:
>
> I've updated upstream/xen with the patch I just posted to fix this problem.

Thanks.  I will pick it up on Monday.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the xen tree

[Jeremy Fitzhardinge]

On 07/22/2010 09:01 PM, Stephen Rothwell wrote:
> arch/x86/xen/enlighten.c:71: error: __pcpu_scope_xen_vcpu causes a section type conflict
> arch/x86/xen/enlighten.c:72: error: __pcpu_scope_xen_vcpu_info causes a section type conflict
> arch/x86/xen/enlighten.c:71: error: __pcpu_unique_xen_vcpu causes a section type conflict
> arch/x86/xen/enlighten.c:72: error: __pcpu_unique_xen_vcpu_info causes a section type conflict
> arch/x86/xen/enlighten.c:558: error: __pcpu_unique_idt_desc causes a section type conflict
> arch/x86/xen/enlighten.c:760: error: __pcpu_unique_xen_cr0_value causes a section type conflict
>
> Not sure what has caused this.  I have dropped the xen tree for today.
>
> gcc version 4.4.4 binutils version 2.20.1.
>   

I've updated upstream/xen with the patch I just posted to fix this problem.

Thanks,
    J

Re: linux-next: build failure after merge of the xen tree

[Jeremy Fitzhardinge]

On 07/22/2010 09:01 PM, Stephen Rothwell wrote:
> After merging the xen tree, today's linux-next build (86_64 allmodconfig)
> failed like this:
>
> arch/x86/xen/enlighten.c:71: error: __pcpu_scope_xen_vcpu causes a section type conflict
> arch/x86/xen/enlighten.c:72: error: __pcpu_scope_xen_vcpu_info causes a section type conflict
> arch/x86/xen/enlighten.c:71: error: __pcpu_unique_xen_vcpu causes a section type conflict
> arch/x86/xen/enlighten.c:72: error: __pcpu_unique_xen_vcpu_info causes a section type conflict
> arch/x86/xen/enlighten.c:558: error: __pcpu_unique_idt_desc causes a section type conflict
> arch/x86/xen/enlighten.c:760: error: __pcpu_unique_xen_cr0_value causes a section type conflict
>
> Not sure what has caused this.  I have dropped the xen tree for today.
>
> gcc version 4.4.4 binutils version 2.20.1.
>   

I can reproduce this.

I bisected it down to change bee6ab53e652a414af20392899879b58cd80d033.

Ah!   That change uses RESERVE_BRK(), which creates a dummy function and
puts it into the .discard section.  Presumably that makes gcc think that
.discard is for code, and so when the percpu stuff starts putting data
into .discard, gcc (now) complains.  If we add more .discard.* sections
then everyone is happy:

diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 86b1506..ef292c7 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -82,7 +82,7 @@ void *extend_brk(size_t size, size_t align);
  * executable.)
  */
 #define RESERVE_BRK(name,sz)						\
-	static void __section(.discard) __used				\
+	static void __section(.discard.text) __used			\
 	__brk_reservation_fn_##name##__(void) {				\
 		asm volatile (						\
 			".pushsection .brk_reservation,\"aw\",@nobits;" \
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 48c5299..ae6b88e 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -643,6 +643,7 @@
 	EXIT_DATA							\
 	EXIT_CALL							\
 	*(.discard)							\
+	*(.discard.*)							\
 	}
 
 /**

I'll write up a proper patch.


Thanks,
    J

Re: linux-next: build failure after merge of the xen tree

[Jeremy Fitzhardinge]

On 07/22/2010 09:01 PM, Stephen Rothwell wrote:
> Hi Jeremy,
>
> After merging the xen tree, today's linux-next build (86_64 allmodconfig)
> failed like this:
>
> arch/x86/xen/enlighten.c:71: error: __pcpu_scope_xen_vcpu causes a section type conflict
> arch/x86/xen/enlighten.c:72: error: __pcpu_scope_xen_vcpu_info causes a section type conflict
> arch/x86/xen/enlighten.c:71: error: __pcpu_unique_xen_vcpu causes a section type conflict
> arch/x86/xen/enlighten.c:72: error: __pcpu_unique_xen_vcpu_info causes a section type conflict
> arch/x86/xen/enlighten.c:558: error: __pcpu_unique_idt_desc causes a section type conflict
> arch/x86/xen/enlighten.c:760: error: __pcpu_unique_xen_cr0_value causes a section type conflict
>
> Not sure what has caused this.  I have dropped the xen tree for today.
> gcc version 4.4.4 binutils version 2.20.1.
>   


How mysterious.  I couldn't reproduce it with an allmodconfig with gcc
4.4.3  binutils 2.19.51 (Fedora 12).  I'm re-trying with Fedora 13's
toolchain, which has matching version numbers to yours.

Thanks,
    J

linux-next: build failure after merge of the xen tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 898 bytes --]

Hi Jeremy,

After merging the xen tree, today's linux-next build (86_64 allmodconfig)
failed like this:

arch/x86/xen/enlighten.c:71: error: __pcpu_scope_xen_vcpu causes a section type conflict
arch/x86/xen/enlighten.c:72: error: __pcpu_scope_xen_vcpu_info causes a section type conflict
arch/x86/xen/enlighten.c:71: error: __pcpu_unique_xen_vcpu causes a section type conflict
arch/x86/xen/enlighten.c:72: error: __pcpu_unique_xen_vcpu_info causes a section type conflict
arch/x86/xen/enlighten.c:558: error: __pcpu_unique_idt_desc causes a section type conflict
arch/x86/xen/enlighten.c:760: error: __pcpu_unique_xen_cr0_value causes a section type conflict

Not sure what has caused this.  I have dropped the xen tree for today.

gcc version 4.4.4 binutils version 2.20.1.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]