Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752661AbbFDKBw (ORCPT ); Thu, 4 Jun 2015 06:01:52 -0400 Received: from foss.arm.com ([217.140.101.70]:41695 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751340AbbFDKBo (ORCPT ); Thu, 4 Jun 2015 06:01:44 -0400 Message-ID: <55702205.7000908@arm.com> Date: Thu, 04 Jun 2015 11:01:41 +0100 From: Marc Zyngier Organization: ARM Ltd User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.4.0 MIME-Version: 1.0 To: Christoffer Dall , =?windows-1252?Q?Alex?= =?windows-1252?Q?_Benn=E9e?= CC: "kvm@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.cs.columbia.edu" , Gleb Natapov , Paolo Bonzini , Catalin Marinas , Will Deacon , open list Subject: Re: [PATCH] KVM: arm64: fix misleading comments in save/restore References: <1432806186-27993-1-git-send-email-alex.bennee@linaro.org> <20150604093436.GC7657@cbox> In-Reply-To: <20150604093436.GC7657@cbox> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2698 Lines: 82 On 04/06/15 10:34, Christoffer Dall wrote: > On Thu, May 28, 2015 at 10:43:06AM +0100, Alex Benn?e wrote: >> The elr_el2 and spsr_el2 registers in fact contain the processor state >> before entry into the hypervisor code. > > be careful with your use of the hypervisor, in the KVM design the > hypervisor is split across EL1 and EL2. > >> In the case of guest state it >> could be in either el0 or el1. > > true > >> >> Signed-off-by: Alex Benn?e >> --- >> arch/arm64/kvm/hyp.S | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S >> index d755922..1940a4c 100644 >> --- a/arch/arm64/kvm/hyp.S >> +++ b/arch/arm64/kvm/hyp.S >> @@ -50,8 +50,8 @@ >> stp x29, lr, [x3, #80] >> >> mrs x19, sp_el0 >> - mrs x20, elr_el2 // EL1 PC >> - mrs x21, spsr_el2 // EL1 pstate >> + mrs x20, elr_el2 // PC before hyp entry >> + mrs x21, spsr_el2 // pstate before hyp entry >> >> stp x19, x20, [x3, #96] >> str x21, [x3, #112] >> @@ -82,8 +82,8 @@ >> ldr x21, [x3, #16] >> >> msr sp_el0, x19 >> - msr elr_el2, x20 // EL1 PC >> - msr spsr_el2, x21 // EL1 pstate >> + msr elr_el2, x20 // PC to restore >> + msr spsr_el2, x21 // pstate to restore > > I don't feel like 'to restore' is much more meaningful here. > > I would actually vote for removin the comments all together, since one > should really understand the code as opposed to the comments when > reading this kind of stuff. > > Meh, I'm not sure. Your patch is definitely better than doing nothing. > > Marc? While I definitely agree that people should pay more attention to the code rather than blindly trusting comments, I still think there is some value in disambiguating the exception entry/return, because this bit of code assumes some intimate knowledge of the ARMv8 exception model. As for the comments themselves, I'd rather have some wording that clearly indicate that we're dealing with guest information, i.e: mrs x20, elr_el2 // Guest PC mrs x21, spsr_el2 // Guest pstate (and the same for the exception return). The "before hyp entry" and "to restore" are not really useful (all the registers we are saving/restoring fall into these categories). What I wanted to convey here was that despite using an EL2 register, we are dealing with guest registers. Would this address your concerns? Thanks, M. -- Jazz is not dead. It just smells funny... -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/