From patchwork Tue Dec 6 11:43:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Mackerras X-Patchwork-Id: 129634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C7CA51007F7 for ; Tue, 6 Dec 2011 22:45:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933231Ab1LFLo7 (ORCPT ); Tue, 6 Dec 2011 06:44:59 -0500 Received: from ozlabs.org ([203.10.76.45]:52043 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933396Ab1LFLo5 (ORCPT ); Tue, 6 Dec 2011 06:44:57 -0500 Received: by ozlabs.org (Postfix, from userid 1003) id CA69C1007D5; Tue, 6 Dec 2011 22:44:56 +1100 (EST) Date: Tue, 6 Dec 2011 22:43:47 +1100 From: Paul Mackerras To: Alexander Graf , Scott Wood Cc: kvm-ppc@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: Re: "KVM: PPC: booke: Improve timer register emulation" breaks Book3s HV Message-ID: <20111206114347.GA14832@bloggs.ozlabs.ibm.com> References: <20111206040300.GA12018@drongo> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20111206040300.GA12018@drongo> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org On Tue, Dec 06, 2011 at 03:03:00PM +1100, Paul Mackerras wrote: > I'm not sure why yet, but commit 8a97c432 ("KVM: PPC: booke: Improve > timer register emulation") in Alex's kvm-ppc-next branch is breaking > Book3S HV KVM on POWER7. Guest cpus fail to spin up, and even with > just one cpu, the guest stalls every so often. If I stop the guest > and inspect the state with qemu, PC is at 0x900. Reverting 8a97c432 > makes it work properly again. This fixes it: Alex, do you want to roll that in with Scott's patch, or do you want me to send a separate patch on top? Paul. --- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 534cbe1..83bcb44 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -560,7 +560,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) void kvm_vcpu_kick(struct kvm_vcpu *vcpu) { - if (waitqueue_active(&vcpu->wq)) { + if (waitqueue_active(vcpu->arch.wqp)) { wake_up_interruptible(vcpu->arch.wqp); vcpu->stat.halt_wakeup++; } else if (vcpu->cpu != -1) {