From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSU3X-0000FP-FH for qemu-devel@nongnu.org; Mon, 02 Mar 2015 12:23:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSU3O-0008RS-FR for qemu-devel@nongnu.org; Mon, 02 Mar 2015 12:22:59 -0500 Received: from mail-qc0-f180.google.com ([209.85.216.180]:45820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSU3O-0008R6-9q for qemu-devel@nongnu.org; Mon, 02 Mar 2015 12:22:50 -0500 Received: by qcvp6 with SMTP id p6so25724639qcv.12 for ; Mon, 02 Mar 2015 09:22:49 -0800 (PST) Date: Mon, 2 Mar 2015 09:22:12 -0800 From: Christoffer Dall Message-ID: <20150302172212.GB10137@lvm> References: <1424880159-29348-1-git-send-email-alex.bennee@linaro.org> <1424880159-29348-7-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1424880159-29348-7-git-send-email-alex.bennee@linaro.org> Subject: Re: [Qemu-devel] [PATCH 5/6] target-arm/kvm64: fix save/restore of SPSR regs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: Peter Maydell , kvm@vger.kernel.org, marc.zyngier@arm.com, qemu-devel@nongnu.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Hi Alex, Seems like you accidentally sent out two copies of this patch, hopefully I'm reviewing the right one... On Wed, Feb 25, 2015 at 04:02:38PM +0000, Alex Bennée wrote: > From: Christoffer Dall > > The current code was negatively indexing the cpu state array and not > synchronizing banked spsr register state with the current mode's spsr > state, causing occasional failures with migration. > > Some munging is done to take care of the aarch64 mapping and also to > ensure the most current value of the spsr is updated to the banked > registers (relevant for KVM<->TCG migration). > > Signed-off-by: Christoffer Dall > Signed-off-by: Alex Bennée > > --- > v2 (ajb) > - minor tweaks and clarifications > > diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c > index c60e989..1e36b0a 100644 > --- a/target-arm/kvm64.c > +++ b/target-arm/kvm64.c > @@ -140,6 +140,7 @@ int kvm_arch_put_registers(CPUState *cs, int level) > uint64_t val; > int i; > int ret; > + unsigned int el; > > ARMCPU *cpu = ARM_CPU(cs); > CPUARMState *env = &cpu->env; > @@ -206,9 +207,25 @@ int kvm_arch_put_registers(CPUState *cs, int level) > return ret; > } > > + /* Saved Program State Registers > + * > + * Before we restore from the banked_spsr[] array we need to > + * ensure that any modifications to env->spsr are correctly > + * reflected and map aarch64 exception levels if required. > + */ > + el = arm_current_el(env); > + if (is_a64(env) && el > 0) { > + g_assert(el == 1); > + /* KVM maps KVM_SPSR_SVC to KVM_SPSR_EL1 for aarch64 */ > + env->banked_spsr[1] = env->banked_spsr[0]; > + env->banked_spsr[aarch64_banked_spsr_index(el)] = env->spsr; > + } else { > + env->banked_spsr[el] = env->spsr; is this valid if (is_a64(env) && el == 0)) ? I thought that if you're in el == 0, then env->banked_spsr[x] is the most up-to-date one, not env->spsr ? for !is_a64(env) this looks wrong, because of the same as above if el == 0, but also because I think you need bank_number(env->uncached_cpsr & CPSR_M) to index into the array. > + } > + > for (i = 0; i < KVM_NR_SPSR; i++) { > reg.id = AARCH64_CORE_REG(spsr[i]); > - reg.addr = (uintptr_t) &env->banked_spsr[i - 1]; > + reg.addr = (uintptr_t) &env->banked_spsr[i+1]; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret) { > return ret; > @@ -253,6 +270,7 @@ int kvm_arch_get_registers(CPUState *cs) > struct kvm_one_reg reg; > uint64_t val; > uint32_t fpr; > + unsigned int el; > int i; > int ret; > > @@ -325,15 +343,32 @@ int kvm_arch_get_registers(CPUState *cs) > return ret; > } > > + /* Fetch the SPSR registers > + * > + * KVM has an array of state indexed for all the possible aarch32 > + * privilage levels. Although not all are valid at all points > + * there are some transitions possible which can access old state > + * so it is worth keeping them all. > + */ > for (i = 0; i < KVM_NR_SPSR; i++) { > reg.id = AARCH64_CORE_REG(spsr[i]); > - reg.addr = (uintptr_t) &env->banked_spsr[i - 1]; > + reg.addr = (uintptr_t) &env->banked_spsr[i+1]; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret) { > return ret; > } > } > > + el = arm_current_el(env); > + if (is_a64(env) && el > 0) { > + g_assert(el == 1); > + /* KVM maps KVM_SPSR_SVC to KVM_SPSR_EL1 for aarch64 */ > + env->banked_spsr[0] = env->banked_spsr[1]; > + env->spsr = env->banked_spsr[aarch64_banked_spsr_index(el)]; > + } else { > + env->spsr = env->banked_spsr[el]; same concern with bank_number as above. > + } > + > /* Advanced SIMD and FP registers */ > for (i = 0; i < 32; i++) { > reg.id = AARCH64_SIMD_CORE_REG(fp_regs.vregs[i]); > -- > 2.3.0 > Thanks, -Christoffer