linux-next: build failure after merge of the kvm-ppc tree

linux-next: build failure after merge of the kvm-ppc tree

[Stephen Rothwell]

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

Hi Alex,

After merging the kvm-ppc tree, today's linux-next build
(powerpc_ppc64_defconfig) failed like this:

arch/powerpc/kvm/built-in.o: In function `.kvm_spapr_tce_release':
book3s_64_vio.c:(.text+0x374c): undefined reference to `.kvm_put_kvm'
arch/powerpc/kvm/built-in.o: In function `.kvm_vm_ioctl_create_spapr_tce':
(.text+0x3ae8): undefined reference to `.kvm_get_kvm'

Presumably caused by commit 969f70395d6d ("kvm/book3s: Make kernel
emulated H_PUT_TCE available for "PR" KVM").

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

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

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

[Benjamin Herrenschmidt]

On Tue, 2012-05-01 at 13:55 +1000, Stephen Rothwell wrote:
> After merging the kvm-ppc tree, today's linux-next build
> (powerpc_ppc64_defconfig) failed like this:
> 
> arch/powerpc/kvm/built-in.o: In function `.kvm_spapr_tce_release':
> book3s_64_vio.c:(.text+0x374c): undefined reference to `.kvm_put_kvm'
> arch/powerpc/kvm/built-in.o: In function
> `.kvm_vm_ioctl_create_spapr_tce':
> (.text+0x3ae8): undefined reference to `.kvm_get_kvm'
> 
> Presumably caused by commit 969f70395d6d ("kvm/book3s: Make kernel
> emulated H_PUT_TCE available for "PR" KVM").
> 
> I have used the kvm-ppc tree from next-20120430 for today. 

Hrm, I wrote that patch :-) It used to work... Alex, probably just a
missing #include no ?

Cheers,
Ben.

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

[Alexander Graf]

On 01.05.2012, at 06:55, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:

> On Tue, 2012-05-01 at 13:55 +1000, Stephen Rothwell wrote:
>> After merging the kvm-ppc tree, today's linux-next build
>> (powerpc_ppc64_defconfig) failed like this:
>> 
>> arch/powerpc/kvm/built-in.o: In function `.kvm_spapr_tce_release':
>> book3s_64_vio.c:(.text+0x374c): undefined reference to `.kvm_put_kvm'
>> arch/powerpc/kvm/built-in.o: In function
>> `.kvm_vm_ioctl_create_spapr_tce':
>> (.text+0x3ae8): undefined reference to `.kvm_get_kvm'
>> 
>> Presumably caused by commit 969f70395d6d ("kvm/book3s: Make kernel
>> emulated H_PUT_TCE available for "PR" KVM").
>> 
>> I have used the kvm-ppc tree from next-20120430 for today. 
> 
> Hrm, I wrote that patch :-) It used to work... Alex, probably just a
> missing #include no ?

Well, in fact it even compiled just fine for me with my config.

Ben, I'm out today (labor day). Could you please try make defconfog and check why it fails?

Alex

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

[Alexander Graf]

On 05/01/2012 05:55 AM, Stephen Rothwell wrote:
> Hi Alex,
>
> After merging the kvm-ppc tree, today's linux-next build
> (powerpc_ppc64_defconfig) failed like this:

Hmm - do you have that .config available somewhere? :)


Alex

linux-next: build failure after merge of the kvm-ppc tree

[Stephen Rothwell]

Hi Paul,

After merging the kvm-ppc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/kvm/book3s_xive.c: In function 'xive_debugfs_init':
arch/powerpc/kvm/book3s_xive.c:1852:52: error: 'powerpc_debugfs_root' undeclared (first use in this function)
  xive->dentry = debugfs_create_file(name, S_IRUGO, powerpc_debugfs_root,
                                                    ^

Caused by commit

  5af50993850a ("KVM: PPC: Book3S HV: Native usage of the XIVE interrupt controller")

interacting with commit

  7644d5819cf8 ("powerpc: Create asm/debugfs.h and move powerpc_debugfs_root there")

from the powerpc tree.

I have added the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Apr 2017 14:28:17 +1000
Subject: [PATCH] powerpc: merge fix for powerpc_debugfs_root move.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kvm/book3s_xive.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
index 7807ee17af4b..ffe1da95033a 100644
--- a/arch/powerpc/kvm/book3s_xive.c
+++ b/arch/powerpc/kvm/book3s_xive.c
@@ -24,6 +24,7 @@
 #include <asm/xive.h>
 #include <asm/xive-regs.h>
 #include <asm/debug.h>
+#include <asm/debugfs.h>
 #include <asm/time.h>
 #include <asm/opal.h>
 
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the kvm-ppc tree

[Stephen Rothwell]

Hi Paul,

After merging the kvm-ppc tree, today's linux-next build (powerpc
allyesconfig) failed like this:

arch/powerpc/kvm/fpu.o:(.opd+0x0): multiple definition of `fps_fres'
arch/powerpc/kvm/fpu.o:(.opd+0x0): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fres':
(.text+0x0): multiple definition of `.fps_fres'
arch/powerpc/kvm/fpu.o:(.text+0x0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x18): multiple definition of `fps_frsqrte'
arch/powerpc/kvm/fpu.o:(.opd+0x18): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_frsqrte':
(.text+0x20): multiple definition of `.fps_frsqrte'
arch/powerpc/kvm/fpu.o:(.text+0x20): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x30): multiple definition of `fps_fsqrts'
arch/powerpc/kvm/fpu.o:(.opd+0x30): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fsqrts':
(.text+0x40): multiple definition of `.fps_fsqrts'
arch/powerpc/kvm/fpu.o:(.text+0x40): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x48): multiple definition of `fps_fadds'
arch/powerpc/kvm/fpu.o:(.opd+0x48): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fadds':
(.text+0x60): multiple definition of `.fps_fadds'
arch/powerpc/kvm/fpu.o:(.text+0x60): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x60): multiple definition of `fps_fdivs'
arch/powerpc/kvm/fpu.o:(.opd+0x60): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fdivs':
(.text+0x84): multiple definition of `.fps_fdivs'
arch/powerpc/kvm/fpu.o:(.text+0x84): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x78): multiple definition of `fps_fmuls'
arch/powerpc/kvm/fpu.o:(.opd+0x78): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fmuls':
(.text+0xa8): multiple definition of `.fps_fmuls'
arch/powerpc/kvm/fpu.o:(.text+0xa8): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x90): multiple definition of `fps_fsubs'
arch/powerpc/kvm/fpu.o:(.opd+0x90): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fsubs':
(.text+0xcc): multiple definition of `.fps_fsubs'
arch/powerpc/kvm/fpu.o:(.text+0xcc): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0xa8): multiple definition of `fps_fmadds'
arch/powerpc/kvm/fpu.o:(.opd+0xa8): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fmadds':
(.text+0xf0): multiple definition of `.fps_fmadds'
arch/powerpc/kvm/fpu.o:(.text+0xf0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0xc0): multiple definition of `fps_fmsubs'
arch/powerpc/kvm/fpu.o:(.opd+0xc0): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fmsubs':
(.text+0x118): multiple definition of `.fps_fmsubs'
arch/powerpc/kvm/fpu.o:(.text+0x118): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0xd8): multiple definition of `fps_fnmadds'
arch/powerpc/kvm/fpu.o:(.opd+0xd8): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fnmadds':
(.text+0x140): multiple definition of `.fps_fnmadds'
arch/powerpc/kvm/fpu.o:(.text+0x140): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0xf0): multiple definition of `fps_fnmsubs'
arch/powerpc/kvm/fpu.o:(.opd+0xf0): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fnmsubs':
(.text+0x168): multiple definition of `.fps_fnmsubs'
arch/powerpc/kvm/fpu.o:(.text+0x168): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x108): multiple definition of `fps_fsel'
arch/powerpc/kvm/fpu.o:(.opd+0x108): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fsel':
(.text+0x190): multiple definition of `.fps_fsel'
arch/powerpc/kvm/fpu.o:(.text+0x190): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x120): multiple definition of `fpd_fsqrts'
arch/powerpc/kvm/fpu.o:(.opd+0x120): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsqrts':
(.text+0x1f0): multiple definition of `.fpd_fsqrts'
arch/powerpc/kvm/fpu.o:(.text+0x1f0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x138): multiple definition of `fpd_frsqrtes'
arch/powerpc/kvm/fpu.o:(.opd+0x138): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_frsqrtes':
(.text+0x204): multiple definition of `.fpd_frsqrtes'
arch/powerpc/kvm/fpu.o:(.text+0x204): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x150): multiple definition of `fpd_fres'
arch/powerpc/kvm/fpu.o:(.opd+0x150): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fres':
(.text+0x218): multiple definition of `.fpd_fres'
arch/powerpc/kvm/fpu.o:(.text+0x218): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x168): multiple definition of `fpd_frsp'
arch/powerpc/kvm/fpu.o:(.opd+0x168): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_frsp':
(.text+0x22c): multiple definition of `.fpd_frsp'
arch/powerpc/kvm/fpu.o:(.text+0x22c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x180): multiple definition of `fpd_fctiw'
arch/powerpc/kvm/fpu.o:(.opd+0x180): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fctiw':
(.text+0x240): multiple definition of `.fpd_fctiw'
arch/powerpc/kvm/fpu.o:(.text+0x240): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x198): multiple definition of `fpd_fctiwz'
arch/powerpc/kvm/fpu.o:(.opd+0x198): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fctiwz':
(.text+0x254): multiple definition of `.fpd_fctiwz'
arch/powerpc/kvm/fpu.o:(.text+0x254): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x1b0): multiple definition of `fpd_fsqrt'
arch/powerpc/kvm/fpu.o:(.opd+0x1b0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsqrt':
(.text+0x268): multiple definition of `.fpd_fsqrt'
arch/powerpc/kvm/fpu.o:(.text+0x268): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x1c8): multiple definition of `fpd_fre'
arch/powerpc/kvm/fpu.o:(.opd+0x1c8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fre':
(.text+0x27c): multiple definition of `.fpd_fre'
arch/powerpc/kvm/fpu.o:(.text+0x27c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x1e0): multiple definition of `fpd_frsqrte'
arch/powerpc/kvm/fpu.o:(.opd+0x1e0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_frsqrte':
(.text+0x290): multiple definition of `.fpd_frsqrte'
arch/powerpc/kvm/fpu.o:(.text+0x290): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x1f8): multiple definition of `fpd_fneg'
arch/powerpc/kvm/fpu.o:(.opd+0x1f8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fneg':
(.text+0x2a4): multiple definition of `.fpd_fneg'
arch/powerpc/kvm/fpu.o:(.text+0x2a4): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x210): multiple definition of `fpd_fabs'
arch/powerpc/kvm/fpu.o:(.opd+0x210): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fabs':
(.text+0x2b8): multiple definition of `.fpd_fabs'
arch/powerpc/kvm/fpu.o:(.text+0x2b8): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x228): multiple definition of `fpd_fadds'
arch/powerpc/kvm/fpu.o:(.opd+0x228): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fadds':
(.text+0x2cc): multiple definition of `.fpd_fadds'
arch/powerpc/kvm/fpu.o:(.text+0x2cc): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x240): multiple definition of `fpd_fsubs'
arch/powerpc/kvm/fpu.o:(.opd+0x240): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsubs':
(.text+0x2e0): multiple definition of `.fpd_fsubs'
arch/powerpc/kvm/fpu.o:(.text+0x2e0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x258): multiple definition of `fpd_fdivs'
arch/powerpc/kvm/fpu.o:(.opd+0x258): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fdivs':
(.text+0x2f4): multiple definition of `.fpd_fdivs'
arch/powerpc/kvm/fpu.o:(.text+0x2f4): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x270): multiple definition of `fpd_fmuls'
arch/powerpc/kvm/fpu.o:(.opd+0x270): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmuls':
(.text+0x308): multiple definition of `.fpd_fmuls'
arch/powerpc/kvm/fpu.o:(.text+0x308): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x288): multiple definition of `fpd_fcmpu'
arch/powerpc/kvm/fpu.o:(.opd+0x288): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fcmpu':
(.text+0x31c): multiple definition of `.fpd_fcmpu'
arch/powerpc/kvm/fpu.o:(.text+0x31c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x2a0): multiple definition of `fpd_fcpsgn'
arch/powerpc/kvm/fpu.o:(.opd+0x2a0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fcpsgn':
(.text+0x34c): multiple definition of `.fpd_fcpsgn'
arch/powerpc/kvm/fpu.o:(.text+0x34c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x2b8): multiple definition of `fpd_fdiv'
arch/powerpc/kvm/fpu.o:(.opd+0x2b8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fdiv':
(.text+0x360): multiple definition of `.fpd_fdiv'
arch/powerpc/kvm/fpu.o:(.text+0x360): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x2d0): multiple definition of `fpd_fadd'
arch/powerpc/kvm/fpu.o:(.opd+0x2d0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fadd':
(.text+0x374): multiple definition of `.fpd_fadd'
arch/powerpc/kvm/fpu.o:(.text+0x374): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x2e8): multiple definition of `fpd_fmul'
arch/powerpc/kvm/fpu.o:(.opd+0x2e8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmul':
(.text+0x388): multiple definition of `.fpd_fmul'
arch/powerpc/kvm/fpu.o:(.text+0x388): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x300): multiple definition of `fpd_fcmpo'
arch/powerpc/kvm/fpu.o:(.opd+0x300): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fcmpo':
(.text+0x39c): multiple definition of `.fpd_fcmpo'
arch/powerpc/kvm/fpu.o:(.text+0x39c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x318): multiple definition of `fpd_fsub'
arch/powerpc/kvm/fpu.o:(.opd+0x318): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsub':
(.text+0x3cc): multiple definition of `.fpd_fsub'
arch/powerpc/kvm/fpu.o:(.text+0x3cc): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x330): multiple definition of `fpd_fmsubs'
arch/powerpc/kvm/fpu.o:(.opd+0x330): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmsubs':
(.text+0x3e0): multiple definition of `.fpd_fmsubs'
arch/powerpc/kvm/fpu.o:(.text+0x3e0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x348): multiple definition of `fpd_fmadds'
arch/powerpc/kvm/fpu.o:(.opd+0x348): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmadds':
(.text+0x3f4): multiple definition of `.fpd_fmadds'
arch/powerpc/kvm/fpu.o:(.text+0x3f4): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x360): multiple definition of `fpd_fnmsubs'
arch/powerpc/kvm/fpu.o:(.opd+0x360): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fnmsubs':
(.text+0x408): multiple definition of `.fpd_fnmsubs'
arch/powerpc/kvm/fpu.o:(.text+0x408): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x378): multiple definition of `fpd_fnmadds'
arch/powerpc/kvm/fpu.o:(.opd+0x378): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fnmadds':
(.text+0x41c): multiple definition of `.fpd_fnmadds'
arch/powerpc/kvm/fpu.o:(.text+0x41c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x390): multiple definition of `fpd_fsel'
arch/powerpc/kvm/fpu.o:(.opd+0x390): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsel':
(.text+0x430): multiple definition of `.fpd_fsel'
arch/powerpc/kvm/fpu.o:(.text+0x430): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x3a8): multiple definition of `fpd_fmsub'
arch/powerpc/kvm/fpu.o:(.opd+0x3a8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmsub':
(.text+0x444): multiple definition of `.fpd_fmsub'
arch/powerpc/kvm/fpu.o:(.text+0x444): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x3c0): multiple definition of `fpd_fmadd'
arch/powerpc/kvm/fpu.o:(.opd+0x3c0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmadd':
(.text+0x458): multiple definition of `.fpd_fmadd'
arch/powerpc/kvm/fpu.o:(.text+0x458): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x3d8): multiple definition of `fpd_fnmsub'
arch/powerpc/kvm/fpu.o:(.opd+0x3d8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fnmsub':
(.text+0x46c): multiple definition of `.fpd_fnmsub'
arch/powerpc/kvm/fpu.o:(.text+0x46c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x3f0): multiple definition of `fpd_fnmadd'
arch/powerpc/kvm/fpu.o:(.opd+0x3f0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fnmadd':
(.text+0x480): multiple definition of `.fpd_fnmadd'
arch/powerpc/kvm/fpu.o:(.text+0x480): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x408): multiple definition of `kvm_cvt_fd'
arch/powerpc/kvm/fpu.o:(.opd+0x408): first defined here
arch/powerpc/kvm/fpu.o: In function `kvm_cvt_fd':
(.text+0x494): multiple definition of `.kvm_cvt_fd'
arch/powerpc/kvm/fpu.o:(.text+0x494): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x420): multiple definition of `kvm_cvt_df'
arch/powerpc/kvm/fpu.o:(.opd+0x420): first defined here
arch/powerpc/kvm/fpu.o: In function `kvm_cvt_df':
(.text+0x4a0): multiple definition of `.kvm_cvt_df'
arch/powerpc/kvm/fpu.o:(.text+0x4a0): first defined here

Caused by commit

  f8513214ac9d ("KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions")

I have reverted that commit (and the following three commits) for today.

-- 
Cheers,
Stephen Rothwell

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

[Paolo Bonzini]

Il 04/08/2014 12:36, Stephen Rothwell ha scritto:
> Hi Alexander,
> 
> After merging the kvm-ppc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> arch/powerpc/kvm/kvm-pr.o:(__tracepoints+0xa8): multiple definition of `__tracepoint_kvm_ppc_instr'
> arch/powerpc/kvm/kvm.o:(__tracepoints+0x1c0): first defined here
> 
> Caused by commit 29577fc00ba4 ("KVM: PPC: HV: Remove generic
> instruction emulation").  I note that this commit has no Reviewed-by,
> Tested-by or Acked-by tags and only one Signed-off-by tag.
> 
> I have reverted that commit for today.

Thanks for the heads up.  I will apply this, and wait for tomorrow's
linux-next build before sending the result to Linus:

diff --git a/arch/powerpc/kvm/trace_pr.h b/arch/powerpc/kvm/trace_pr.h
index a674f090dfb8..e1357cd8dc1f 100644
--- a/arch/powerpc/kvm/trace_pr.h
+++ b/arch/powerpc/kvm/trace_pr.h
@@ -291,26 +291,6 @@ TRACE_EVENT(kvm_unmap_hva,
 	TP_printk("unmap hva 0x%lx\n", __entry->hva)
 );
 
-TRACE_EVENT(kvm_ppc_instr,
-	TP_PROTO(unsigned int inst, unsigned long _pc, unsigned int emulate),
-	TP_ARGS(inst, _pc, emulate),
-
-	TP_STRUCT__entry(
-		__field(	unsigned int,	inst		)
-		__field(	unsigned long,	pc		)
-		__field(	unsigned int,	emulate		)
-	),
-
-	TP_fast_assign(
-		__entry->inst		= inst;
-		__entry->pc		= _pc;
-		__entry->emulate	= emulate;
-	),
-
-	TP_printk("inst %u pc 0x%lx emulate %u\n",
-		  __entry->inst, __entry->pc, __entry->emulate)
-);
-
 #endif /* _TRACE_KVM_H */
 
 /* This part must be outside protection */


Paolo

linux-next: build failure after merge of the kvm-ppc tree

[Stephen Rothwell]

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

Hi Alexander,

After merging the kvm-ppc tree, today's linux-next build (powerpc
allyesconfig) failed like this:

arch/powerpc/kvm/kvm-pr.o:(__tracepoints+0xa8): multiple definition of `__tracepoint_kvm_ppc_instr'
arch/powerpc/kvm/kvm.o:(__tracepoints+0x1c0): first defined here

Caused by commit 29577fc00ba4 ("KVM: PPC: HV: Remove generic
instruction emulation").  I note that this commit has no Reviewed-by,
Tested-by or Acked-by tags and only one Signed-off-by tag.

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: build failure after merge of the kvm-ppc tree

[Stephen Rothwell]

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

Hi Alexander,

Take into account that I removed the top two WIP commits from the kvm-ppc
tree before the following ...

After merging the kvm-ppc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: ".kvm_irqfd" [arch/powerpc/kvm/kvm.ko] undefined!
ERROR: ".kvm_irqfd_release" [arch/powerpc/kvm/kvm.ko] undefined!
ERROR: ".kvm_eventfd_init" [arch/powerpc/kvm/kvm.ko] undefined!
ERROR: ".kvm_ioeventfd" [arch/powerpc/kvm/kvm.ko] undefined!

I have used the kvm-ppc tree from next-20121012 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

RE: linux-next: build failure after merge of the kvm-ppc tree

[Yoder Stuart-B08248]

> -----Original Message-----
> From: Alexander Graf [mailto:agraf@suse.de]
> Sent: Thursday, July 05, 2012 1:03 AM
> To: Stephen Rothwell
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Yoder Stuart-B08248; ppc-dev
> Subject: Re: linux-next: build failure after merge of the kvm-ppc tree
> 
> 
> On 05.07.2012, at 07:49, Stephen Rothwell wrote:
> 
> > Hi Alexander,
> >
> > After merging the kvm-ppc tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
> > arch/powerpc/kernel/exceptions-64s.S:479: Error: wrong number of operands
> > arch/powerpc/kernel/exceptions-64s.S:486: Error: wrong number of operands
> > arch/powerpc/kernel/exceptions-64s.S:486: Error: wrong number of operands
> > arch/powerpc/kernel/exceptions-64s.S:487: Error: wrong number of operands
> > arch/powerpc/kernel/exceptions-64s.S:487: Error: wrong number of operands
> > arch/powerpc/kernel/exceptions-64s.S:494: Error: wrong number of operands
> > arch/powerpc/kernel/exceptions-64s.S:494: Error: wrong number of operands
> >
> > Caused by commit bc8cc4993e19 ("PPC: use CURRENT_THREAD_INFO instead of
> > open coded assembly").  The fact that this patch has problems was already
> > pointed out on the linuxppc-dev mailing list and it clearly hasn't been
> > build tested.
> >
> > I have used the version of the kvm-ppc tree from next-20120703 for today.
> 
> Ah, yes, thanks. I kept the old, broken version in my tree to make sure I have the dependencies for (and
> don't forget) the (hopefully good) patches that follow on top, but was planning to replace it once we
> have a new version of the CURRENT_THREAD_INFO one.
> 
> Stuart, could you please send a new version of the CURRENT_THREAD_INFO patch?

Yes, will send that shortly.

Stuart

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

[Alexander Graf]

On 05.07.2012, at 07:49, Stephen Rothwell wrote:

> Hi Alexander,
> 
> After merging the kvm-ppc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
> arch/powerpc/kernel/exceptions-64s.S:479: Error: wrong number of operands
> arch/powerpc/kernel/exceptions-64s.S:486: Error: wrong number of operands
> arch/powerpc/kernel/exceptions-64s.S:486: Error: wrong number of operands
> arch/powerpc/kernel/exceptions-64s.S:487: Error: wrong number of operands
> arch/powerpc/kernel/exceptions-64s.S:487: Error: wrong number of operands
> arch/powerpc/kernel/exceptions-64s.S:494: Error: wrong number of operands
> arch/powerpc/kernel/exceptions-64s.S:494: Error: wrong number of operands
> 
> Caused by commit bc8cc4993e19 ("PPC: use CURRENT_THREAD_INFO instead of
> open coded assembly").  The fact that this patch has problems was already
> pointed out on the linuxppc-dev mailing list and it clearly hasn't been
> build tested.
> 
> I have used the version of the kvm-ppc tree from next-20120703 for today.

Ah, yes, thanks. I kept the old, broken version in my tree to make sure I have the dependencies for (and don't forget) the (hopefully good) patches that follow on top, but was planning to replace it once we have a new version of the CURRENT_THREAD_INFO one.

Stuart, could you please send a new version of the CURRENT_THREAD_INFO patch?


Alex

linux-next: build failure after merge of the kvm-ppc tree

[Stephen Rothwell]

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

Hi Alexander,

After merging the kvm-ppc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/kernel/exceptions-64s.S: Assembler messages:
arch/powerpc/kernel/exceptions-64s.S:479: Error: wrong number of operands
arch/powerpc/kernel/exceptions-64s.S:486: Error: wrong number of operands
arch/powerpc/kernel/exceptions-64s.S:486: Error: wrong number of operands
arch/powerpc/kernel/exceptions-64s.S:487: Error: wrong number of operands
arch/powerpc/kernel/exceptions-64s.S:487: Error: wrong number of operands
arch/powerpc/kernel/exceptions-64s.S:494: Error: wrong number of operands
arch/powerpc/kernel/exceptions-64s.S:494: Error: wrong number of operands

Caused by commit bc8cc4993e19 ("PPC: use CURRENT_THREAD_INFO instead of
open coded assembly").  The fact that this patch has problems was already
pointed out on the linuxppc-dev mailing list and it clearly hasn't been
build tested.

I have used the version of the kvm-ppc tree from next-20120703 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

[Alexander Graf]

On 05/16/2012 11:15 AM, Paul Mackerras wrote:
> On Wed, May 16, 2012 at 05:24:16PM +1000, Stephen Rothwell wrote:
>> Hi Alexander,
>>
>> After merging the kvm-ppc tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> ERROR: "kvm_hpt_order" [arch/powerpc/kvm/kvm.ko] undefined!
>>
>> Caused by commit ec26346431bb ("KVM: PPC: Book3S HV: Make the guest hash
>> table size configurable").
> Oops, my fault, kvm_hpt_order needs to be exported for when KVM is
> a module.  Patch coming.

Fixed in kvm-ppc-next. Sorry for the noise.


Alex

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

[Paul Mackerras]

On Wed, May 16, 2012 at 05:24:16PM +1000, Stephen Rothwell wrote:
> Hi Alexander,
> 
> After merging the kvm-ppc tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: "kvm_hpt_order" [arch/powerpc/kvm/kvm.ko] undefined!
> 
> Caused by commit ec26346431bb ("KVM: PPC: Book3S HV: Make the guest hash
> table size configurable").

Oops, my fault, kvm_hpt_order needs to be exported for when KVM is
a module.  Patch coming.

Paul.

linux-next: build failure after merge of the kvm-ppc tree

[Stephen Rothwell]

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

Hi Alexander,

After merging the kvm-ppc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: "kvm_hpt_order" [arch/powerpc/kvm/kvm.ko] undefined!

Caused by commit ec26346431bb ("KVM: PPC: Book3S HV: Make the guest hash
table size configurable").

I have used the kvm-ppc tree from next-20120514 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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