linux-next: tip tree build failure

linux-next: tip tree build failure

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (s390x defconfig) failed like this:

kernel/panic.c:134: error: 'CALLER_ADDR0' undeclared (first use in this function)

Caused by commit eba3fe4416f3cc2ce043fb304b6c35a69dca3bdb ("kernel: Use
CALLER_ADDR0 macro").

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

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

Re: linux-next: tip tree build failure

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next build (s390x defconfig) failed like this:
> 
> kernel/panic.c:134: error: 'CALLER_ADDR0' undeclared (first use in this function)
> 
> Caused by commit eba3fe4416f3cc2ce043fb304b6c35a69dca3bdb ("kernel: Use
> CALLER_ADDR0 macro").

Thanks - apparently CALLER_ADDR0 isnt generally available. I've reverted this 
patch for now.

	Ingo

Re: linux-next: tip tree build failure

[Stephen Rothwell]

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

Hi Ingo,

On Mon, 4 Jan 2010 17:32:00 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> 
> Thanks - apparently CALLER_ADDR0 isnt generally available. I've reverted this 
> patch for now.

Thanks.

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

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

Re: linux-next: tip tree build failure

[Pekka Enberg]

On Mon, Jan 4, 2010 at 6:32 PM, Ingo Molnar <mingo@elte.hu> wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi all,
>>
>> Today's linux-next build (s390x defconfig) failed like this:
>>
>> kernel/panic.c:134: error: 'CALLER_ADDR0' undeclared (first use in this function)
>>
>> Caused by commit eba3fe4416f3cc2ce043fb304b6c35a69dca3bdb ("kernel: Use
>> CALLER_ADDR0 macro").
>
> Thanks - apparently CALLER_ADDR0 isnt generally available. I've reverted this
> patch for now.

Btw, we have _RET_IP_ which is pretty much the same thing and it is
available everywhere (SLUB uses it).

linux-next: tip tree build failure

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (powerpc allyesconfig) failed like this:

lib/swiotlb.c: In function 'setup_io_tlb_npages':
lib/swiotlb.c:114: error: 'swiotlb' undeclared (first use in this function)

Caused by commit 75f1cdf1dda92cae037ec848ae63690d91913eac ("x86: Handle
HW IOMMU initialization failure gracefully") from the tip tree.  It looks
like the "swiotlb" variable only exists in x86 and ia64.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: tip tree build failure

[FUJITA Tomonori]

On Wed, 11 Nov 2009 20:13:02 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> lib/swiotlb.c: In function 'setup_io_tlb_npages':
> lib/swiotlb.c:114: error: 'swiotlb' undeclared (first use in this function)
> 
> Caused by commit 75f1cdf1dda92cae037ec848ae63690d91913eac ("x86: Handle
> HW IOMMU initialization failure gracefully") from the tip tree.  It looks
> like the "swiotlb" variable only exists in x86 and ia64.
> 
> I have reverted that commit for today.

Duh, sorry about it. I should have complied that patchset for POWERPC
too. POWERPC has swiotlb but it doesn't expect it to be used (POWERPC
can remove it).

I think that the following patch works. I'll do more cleanup related
with x86 IOMMU initialization soon (I'm at JFK to go back to Japan).

=
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Subject: [PATCH] swiotlb: remove the swiotlb variable usage

POWERPC doesn't expect it to be used.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 arch/x86/include/asm/swiotlb.h |    5 +++--
 arch/x86/kernel/pci-dma.c      |    5 +----
 arch/x86/kernel/pci-swiotlb.c  |   13 ++++++++++++-
 lib/swiotlb.c                  |    5 ++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/arch/x86/include/asm/swiotlb.h b/arch/x86/include/asm/swiotlb.h
index b9e4e20..940f13a 100644
--- a/arch/x86/include/asm/swiotlb.h
+++ b/arch/x86/include/asm/swiotlb.h
@@ -9,11 +9,12 @@ extern int swiotlb_force;
 
 #ifdef CONFIG_SWIOTLB
 extern int swiotlb;
-extern void pci_swiotlb_init(void);
+extern int pci_swiotlb_init(void);
 #else
 #define swiotlb 0
-static inline void pci_swiotlb_init(void)
+static inline int pci_swiotlb_init(void)
 {
+	return 0;
 }
 #endif
 
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index f79870e..0b11bf1 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -125,16 +125,13 @@ static void __init dma32_free_bootmem(void)
 
 void __init pci_iommu_alloc(void)
 {
-	/* swiotlb is forced by the boot option */
-	int use_swiotlb = swiotlb;
 #ifdef CONFIG_X86_64
 	/* free the range so iommu could get some range less than 4G */
 	dma32_free_bootmem();
 #else
 	dma_ops = &nommu_dma_ops;
 #endif
-	pci_swiotlb_init();
-	if (use_swiotlb)
+	if (pci_swiotlb_init())
 		return;
 
 	gart_iommu_hole_init();
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 17ce422..a6e5d0f 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -42,16 +42,27 @@ static struct dma_map_ops swiotlb_dma_ops = {
 	.dma_supported = NULL,
 };
 
-void __init pci_swiotlb_init(void)
+/*
+ * pci_swiotlb_init - initialize swiotlb if necessary
+ *
+ * This returns non-zero if we are forced to use swiotlb (by the boot
+ * option).
+ */
+int __init pci_swiotlb_init(void)
 {
 	/* don't initialize swiotlb if iommu=off (no_iommu=1) */
 #ifdef CONFIG_X86_64
 	if (!no_iommu && max_pfn > MAX_DMA32_PFN)
 		swiotlb = 1;
 #endif
+	if (swiotlb_force)
+		swiotlb = 1;
+
 	if (swiotlb) {
 		swiotlb_init(0);
 		dma_ops = &swiotlb_dma_ops;
 	} else
 		dma_ops = &nommu_dma_ops;
+
+	return swiotlb_force;
 }
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index e6755a0..795472d 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -109,10 +109,9 @@ setup_io_tlb_npages(char *str)
 	}
 	if (*str == ',')
 		++str;
-	if (!strcmp(str, "force")) {
+	if (!strcmp(str, "force"))
 		swiotlb_force = 1;
-		swiotlb = 1;
-	}
+
 	return 1;
 }
 __setup("swiotlb=", setup_io_tlb_npages);
-- 
1.5.6.5

Re: linux-next: tip tree build failure

[Stephen Rothwell]

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

Hi,

On Thu, 12 Nov 2009 00:03:28 +0900 FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> wrote:
>
> Duh, sorry about it. I should have complied that patchset for POWERPC
> too. POWERPC has swiotlb but it doesn't expect it to be used (POWERPC
> can remove it).
> 
> I think that the following patch works. I'll do more cleanup related
> with x86 IOMMU initialization soon (I'm at JFK to go back to Japan).

Great, thanks for the fix.

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

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

linux-next: tip tree build failure

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

arch/powerpc/kernel/perf_callchain.c: In function 'perf_callchain_kernel':
arch/powerpc/kernel/perf_callchain.c:73: error: implicit declaration of function 'perf_paranoid_anon_ip'

Caused by commit 512cec5d6f2a71e04464bf4fd76a50571bd0dea1 ("perf_counter:
powerpc: Support the anonimized kernel callchain bits") which I have
reverted for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: tip tree build failure

[Peter Zijlstra]

On Mon, 2009-08-24 at 16:54 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> arch/powerpc/kernel/perf_callchain.c: In function 'perf_callchain_kernel':
> arch/powerpc/kernel/perf_callchain.c:73: error: implicit declaration of function 'perf_paranoid_anon_ip'
> 
> Caused by commit 512cec5d6f2a71e04464bf4fd76a50571bd0dea1 ("perf_counter:
> powerpc: Support the anonimized kernel callchain bits") which I have
> reverted for today.

Yes, that needs to be gone, it relied on another change which never went
in. Ingo could you make that commit disappear?

Re: linux-next: tip tree build failure

[Ingo Molnar]

* Peter Zijlstra <peterz@infradead.org> wrote:

> On Mon, 2009-08-24 at 16:54 +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > arch/powerpc/kernel/perf_callchain.c: In function 'perf_callchain_kernel':
> > arch/powerpc/kernel/perf_callchain.c:73: error: implicit declaration of function 'perf_paranoid_anon_ip'
> > 
> > Caused by commit 512cec5d6f2a71e04464bf4fd76a50571bd0dea1 ("perf_counter:
> > powerpc: Support the anonimized kernel callchain bits") which I have
> > reverted for today.
> 
> Yes, that needs to be gone, it relied on another change which 
> never went in. Ingo could you make that commit disappear?

Correct - it's still near the tail of the tree so i zapped it.

	Ingo

linux-next: tip tree build failure

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (x86_64 allmodconfig) failed like this:

arch/x86/kernel/irqinit.c: In function 'apic_intr_init':
arch/x86/kernel/irqinit.c:191: error: 'MCE_SELF_VECTOR' undeclared (first use in this function)
arch/x86/kernel/irqinit.c:191: error: 'mce_self_interrupt' undeclared (first use in this function)

This code was introduced in a merge
(940010c5a314a7bd9b498593bc6ba1718ac5aec5) in the perfcounters tree that
is now in Linus' tree.  The CONFIG variable that allows it to be enabled
was introduced in commit 4efc0670baf4b14bc95502e54a83ccf639146125 ("x86,
mce: use 64bit machine check code on 32bit") in the tip/x86 tree.

The necessary define and function are introduced in commit
ccc3c3192ae78dd56dcdf5353fd1a9ef5f9a3e2b ("x86, mce: implement
bootstrapping for machine check wakeups") in the tip/x86/mce3 (mce4)
branch which is not included in Linus' tree or tip/auto-latest.

I just commented the code out for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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