Patchwork Current kernel fails to compile with KVM on PowerPC

login
register
mail settings
Submitter Jörg Sommer
Date Feb. 25, 2012, 2:51 p.m.
Message ID <20120225145115.GB22460@alea.gnuu.de>
Download mbox | patch
Permalink /patch/143063/
State New
Headers show

Comments

Jörg Sommer - Feb. 25, 2012, 2:51 p.m.
Jörg Sommer hat am Tue 21. Feb, 09:32 (+0100) geschrieben:
> Alexander Graf hat am Mon 20. Feb, 22:27 (+0100) geschrieben:
> > On 20.02.2012, at 18:38, Jörg Sommer wrote:
> > > Alexander Graf hat am Tue 22. Nov, 22:29 (+0100) geschrieben:
> > >> On 22.11.2011, at 21:04, Jörg Sommer wrote:
> > >>> [1] »kernel BUG at include/linux/kvm_host.h:603!«
> > >>> http://www.mail-archive.com/kvm@vger.kernel.org/msg61433.html
> > >> 
> > >> This is unfortunately still there. It's because of preemption being
> > >> enabled. Please just use CONFIG_PREEMPT_NONE for the time being
> > > 
> > > This doesn't help. I've build with CONFIG_PREEMPT_NONE, but I'm getting
> > > this Oops, when I start qemu.
> > 
> > Could you please try git://git.kernel.org/pub/scm/virt/kvm/kvm.git? I
> > fixed a bunch of things with preemption since then and it definitely
> > worked for me. If it still fails in that tree, I can try again to
> > reproduce it :).
> 
> This kernel (e9badff4b38a3f8b2c20aa8a30db210caf85a497) fails to build:
> 
>   CC [M]  arch/powerpc/kvm/book3s_pr.o
> arch/powerpc/kvm/book3s_pr.c: In function ‘kvm_vcpu_ioctl_get_one_reg’:
> arch/powerpc/kvm/book3s_pr.c:883:45: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:883:80: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:883:284: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:883:327: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:883:459: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:883:748: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:883:1112: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:883:1476: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:883:1867: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c: In function ‘kvm_vcpu_ioctl_set_one_reg’:
> arch/powerpc/kvm/book3s_pr.c:898:79: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:898:114: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:898:319: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:898:364: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:898:502: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:898:591: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> arch/powerpc/kvm/book3s_pr.c:898:2061: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
> cc1: all warnings being treated as errors
> make[3]: *** [arch/powerpc/kvm/book3s_pr.o] Fehler 1
> make[2]: *** [arch/powerpc/kvm] Fehler 2
> make[2]: *** Warte auf noch nicht beendete Prozesse...

The culprit is this patch:

commit 784f1782e3c9cab310d6c513df966c547c3f17aa
Author: Alexander Graf <agraf@suse.de>
Date:   Wed Sep 14 21:45:23 2011 +0200

    KVM: PPC: Add support for explicit HIOR setting
    
    Until now, we always set HIOR based on the PVR, but this is just wrong.
    Instead, we should be setting HIOR explicitly, so user space can decide
    what the initial HIOR value is - just like on real hardware.
    
    We keep the old PVR based way around for backwards compatibility, but
    once user space uses the SET_ONE_REG based method, we drop the PVR logic.
    
    Signed-off-by: Alexander Graf <agraf@suse.de>


Later, this code was moved to arch/powerpc/kvm/book3s_pr.c by

commit c6afb78d175ae6cf99f4191fbb258e54478b0371
Author: Paul Mackerras <paulus@samba.org>
Date:   Mon Dec 12 12:26:50 2011 +0000

    KVM: PPC: Move kvm_vcpu_ioctl_[gs]et_one_reg down to platform-specific code

Regards, Jörg.

Patch

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 089c61b..5985209 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -212,6 +212,7 @@  int kvm_dev_ioctl_check_extension(long ext)
        case KVM_CAP_PPC_BOOKE_SREGS:
 #else
        case KVM_CAP_PPC_SEGSTATE:
+       case KVM_CAP_PPC_HIOR:
        case KVM_CAP_PPC_PAPR:
 #endif
        case KVM_CAP_PPC_UNSET_IRQ:
@@ -652,6 +653,11 @@  static int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu,
        int r = -EINVAL;
 
        switch (reg->id) {
+#ifdef CONFIG_PPC_BOOK3S
+       case KVM_REG_PPC_HIOR:
+               r = put_user(to_book3s(vcpu)->hior, (u64 __user *)reg->addr);
+               break;
+#endif
        default:
                break;
        }
@@ -665,6 +671,13 @@  static int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu,
        int r = -EINVAL;
 
        switch (reg->id) {
+#ifdef CONFIG_PPC_BOOK3S
+       case KVM_ONE_REG_PPC_HIOR:
+               r = get_user(to_book3s(vcpu)->hior, (u64 __user *)reg->addr);
+               if (!r)
+                       to_book3s(vcpu)->hior_explicit = true;
+               break;
+#endif
        default:
                break;
        }