From patchwork Wed Feb 27 02:55:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 223470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A41192C0087 for ; Wed, 27 Feb 2013 13:55:48 +1100 (EST) Received: from localhost ([::1]:54316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAXBK-0003FI-V6 for incoming@patchwork.ozlabs.org; Tue, 26 Feb 2013 21:55:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:37917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAXB7-0003Ex-TT for qemu-devel@nongnu.org; Tue, 26 Feb 2013 21:55:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAXAz-0001yD-KB for qemu-devel@nongnu.org; Tue, 26 Feb 2013 21:55:33 -0500 Received: from ozlabs.org ([2402:b800:7003:1:1::1]:46049) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAXAy-0001xl-Nj; Tue, 26 Feb 2013 21:55:25 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 7DDD22C008C; Wed, 27 Feb 2013 13:55:22 +1100 (EST) Date: Wed, 27 Feb 2013 13:55:20 +1100 From: David Gibson To: Alexander Graf Message-ID: <20130227025520.GK30946@truffula.fritz.box> References: <1361414512-11147-1-git-send-email-david@gibson.dropbear.id.au> <1361414512-11147-4-git-send-email-david@gibson.dropbear.id.au> <7B0BD260-A3CC-4069-A6D9-34D6A5DACF74@suse.de> <20130226020140.GB30946@truffula.fritz.box> <113A2CE9-B5BB-4343-B7ED-6C8377221DF6@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <113A2CE9-B5BB-4343-B7ED-6C8377221DF6@suse.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2402:b800:7003:1:1::1 Cc: "qemu-ppc@nongnu.org" , "qemu-devel@nongnu.org" Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 3/3] target-ppc: Synchronize VPA state with KVM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Tue, Feb 26, 2013 at 09:42:43AM +0100, Alexander Graf wrote: > > > Am 26.02.2013 um 03:01 schrieb David Gibson : > > > On Mon, Feb 25, 2013 at 01:19:48PM +0100, Alexander Graf wrote: [snip] > >> This makes newer QEMU on older host kernels unusable, right? It > >> would spill that warning all over the place on every register > >> synchronization. Are you sure this is what you want? > > > > Um.. I'm not sure why you single out this patch. The SPR and FPU sync > > patches introcued similar warnings, > > No, they use dprintf :). You can also switch VPA to dprintf and thus > get rid of the problem. Oh, yeah, I forgot I made that change. Although the SPR functions still have the plain fprintf()s. Revised vpa patch with dprintf below: From 097a1a358eb2bf58275d11a6b6b241e1a9bad22c Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 27 Feb 2013 13:14:27 +1100 Subject: [PATCH] target-ppc: Synchronize VPA state with KVM For PAPR guests, KVM tracks the various areas registered with the H_REGISTER_VPA hypercall. For full emulation, of course, these are tracked within qemu. At present these values are not synchronized. This is a problem for reset (qemu's reset of the VPA address is not pushed to KVM) and will also be a problem for savevm / migration. The kernel now supports accessing the VPA state via the ONE_REG interface, this patch adds code to qemu to use that interface to keep the qemu and KVM ideas of the VPA state synchronized. Signed-off-by: David Gibson --- target-ppc/kvm.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index cac90e4..f8456bd 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -62,6 +62,7 @@ static int cap_ppc_rma; static int cap_spapr_tce; static int cap_hior; static int cap_one_reg; +static int cap_papr; /* XXX We have a race condition where we actually have a level triggered * interrupt, but the infrastructure can't expose that yet, so the guest @@ -92,6 +93,8 @@ int kvm_arch_init(KVMState *s) cap_spapr_tce = kvm_check_extension(s, KVM_CAP_SPAPR_TCE); cap_one_reg = kvm_check_extension(s, KVM_CAP_ONE_REG); cap_hior = kvm_check_extension(s, KVM_CAP_PPC_HIOR); + /* Note: we don't set cap_papr here, because this capability is + * only activated after this by kvmppc_set_papr() */ if (!cap_interrupt_level) { fprintf(stderr, "KVM: Couldn't find level irq capability. Expect the " @@ -647,6 +650,103 @@ static int kvm_get_fp(CPUState *cs) return 0; } +#if defined(TARGET_PPC64) +static int kvm_get_vpa(CPUState *cs) +{ + PowerPCCPU *cpu = POWERPC_CPU(cs); + CPUPPCState *env = &cpu->env; + struct kvm_one_reg reg; + int ret; + + reg.id = KVM_REG_PPC_VPA_ADDR; + reg.addr = (uintptr_t)&env->vpa_addr; + ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); + if (ret < 0) { + dprintf("Unable to get VPA address from KVM: %s\n", strerror(errno)); + return ret; + } + + assert((uintptr_t)&env->slb_shadow_size + == ((uintptr_t)&env->slb_shadow_addr + 8)); + reg.id = KVM_REG_PPC_VPA_SLB; + reg.addr = (uintptr_t)&env->slb_shadow_addr; + ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); + if (ret < 0) { + dprintf("Unable to get SLB shadow state from KVM: %s\n", + strerror(errno)); + return ret; + } + + assert((uintptr_t)&env->dtl_size == ((uintptr_t)&env->dtl_addr + 8)); + reg.id = KVM_REG_PPC_VPA_DTL; + reg.addr = (uintptr_t)&env->dtl_addr; + ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); + if (ret < 0) { + dprintf("Unable to get dispatch trace log state from KVM: %s\n", + strerror(errno)); + return ret; + } + + return 0; +} + +static int kvm_put_vpa(CPUState *cs) +{ + PowerPCCPU *cpu = POWERPC_CPU(cs); + CPUPPCState *env = &cpu->env; + struct kvm_one_reg reg; + int ret; + + /* SLB shadow or DTL can't be registered unless a master VPA is + * registered. That means when restoring state, if a VPA *is* + * registered, we need to set that up first. If not, we need to + * deregister the others before deregistering the master VPA */ + assert(env->vpa_addr || !(env->slb_shadow_addr || env->dtl_addr)); + + if (env->vpa_addr) { + reg.id = KVM_REG_PPC_VPA_ADDR; + reg.addr = (uintptr_t)&env->vpa_addr; + ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); + if (ret < 0) { + dprintf("Unable to set VPA address to KVM: %s\n", strerror(errno)); + return ret; + } + } + + assert((uintptr_t)&env->slb_shadow_size + == ((uintptr_t)&env->slb_shadow_addr + 8)); + reg.id = KVM_REG_PPC_VPA_SLB; + reg.addr = (uintptr_t)&env->slb_shadow_addr; + ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); + if (ret < 0) { + dprintf("Unable to set SLB shadow state to KVM: %s\n", strerror(errno)); + return ret; + } + + assert((uintptr_t)&env->dtl_size == ((uintptr_t)&env->dtl_addr + 8)); + reg.id = KVM_REG_PPC_VPA_DTL; + reg.addr = (uintptr_t)&env->dtl_addr; + ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); + if (ret < 0) { + dprintf("Unable to set dispatch trace log state to KVM: %s\n", + strerror(errno)); + return ret; + } + + if (!env->vpa_addr) { + reg.id = KVM_REG_PPC_VPA_ADDR; + reg.addr = (uintptr_t)&env->vpa_addr; + ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); + if (ret < 0) { + dprintf("Unable to set VPA address to KVM: %s\n", strerror(errno)); + return ret; + } + } + + return 0; +} +#endif /* TARGET_PPC64 */ + int kvm_arch_put_registers(CPUState *cs, int level) { PowerPCCPU *cpu = POWERPC_CPU(cs); @@ -747,6 +847,14 @@ int kvm_arch_put_registers(CPUState *cs, int level) kvm_put_one_spr(cs, id, i); } } + +#ifdef TARGET_PPC64 + if (cap_papr) { + if (kvm_put_vpa(cs) < 0) { + dprintf("Warning: Unable to set VPA information to KVM\n"); + } + } +#endif /* TARGET_PPC64 */ } return ret; @@ -948,6 +1056,15 @@ int kvm_arch_get_registers(CPUState *cs) kvm_get_one_spr(cs, id, i); } } + +#ifdef TARGET_PPC64 + if (cap_papr) { + if (kvm_get_vpa(cs) < 0) { + fprintf(stderr, + "Warning: Unable to get VPA information from KVM\n"); + } + } +#endif } return 0; @@ -1294,6 +1411,10 @@ void kvmppc_set_papr(PowerPCCPU *cpu) if (ret) { cpu_abort(env, "This KVM version does not support PAPR\n"); } + + /* Update the capability flag so we sync the right information + * with kvm */ + cap_papr = 1; } void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy)