From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoffer Dall Subject: Re: [PATCH v4 16/21] KVM: arm64: Save/Restore guest DISR_EL1 Date: Tue, 31 Oct 2017 06:27:15 +0100 Message-ID: <20171031052715.GA129057@lvm> References: <20171019145807.23251-1-james.morse@arm.com> <20171019145807.23251-17-james.morse@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 71AD049D20 for ; Tue, 31 Oct 2017 01:25:51 -0400 (EDT) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z60O8TZCPchE for ; Tue, 31 Oct 2017 01:25:50 -0400 (EDT) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 1473249D13 for ; Tue, 31 Oct 2017 01:25:50 -0400 (EDT) Received: by mail-lf0-f67.google.com with SMTP id a16so17573713lfk.0 for ; Mon, 30 Oct 2017 22:27:25 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20171019145807.23251-17-james.morse@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: James Morse Cc: Jonathan.Zhang@cavium.com, Marc Zyngier , Catalin Marinas , Julien Thierry , Will Deacon , wangxiongfeng2@huawei.com, linux-arm-kernel@lists.infradead.org, Dongjiu Geng , kvmarm@lists.cs.columbia.edu List-Id: kvmarm@lists.cs.columbia.edu On Thu, Oct 19, 2017 at 03:58:02PM +0100, James Morse wrote: > If we deliver a virtual SError to the guest, the guest may defer it > with an ESB instruction. The guest reads the deferred value via DISR_EL1, > but the guests view of DISR_EL1 is re-mapped to VDISR_EL2 when HCR_EL2.AMO > is set. > > Add the KVM code to save/restore VDISR_EL2, and make it accessible to > userspace as DISR_EL1. > Reviewed-by: Christoffer Dall > Signed-off-by: James Morse > --- > arch/arm64/include/asm/kvm_host.h | 1 + > arch/arm64/include/asm/sysreg.h | 1 + > arch/arm64/kvm/hyp/sysreg-sr.c | 6 ++++++ > arch/arm64/kvm/sys_regs.c | 1 + > 4 files changed, 9 insertions(+) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 28a4de85edee..97438cc3a9ad 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -120,6 +120,7 @@ enum vcpu_sysreg { > PAR_EL1, /* Physical Address Register */ > MDSCR_EL1, /* Monitor Debug System Control Register */ > MDCCINT_EL1, /* Monitor Debug Comms Channel Interrupt Enable Reg */ > + DISR_EL1, /* Deferred Interrupt Status Register */ > > /* Performance Monitors Registers */ > PMCR_EL0, /* Control Register */ > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > index a493e93de296..1b8b9012234d 100644 > --- a/arch/arm64/include/asm/sysreg.h > +++ b/arch/arm64/include/asm/sysreg.h > @@ -256,6 +256,7 @@ > #define SYS_VSESR_EL2 sys_reg(3, 4, 5, 2, 3) > #define SYS_FPEXC32_EL2 sys_reg(3, 4, 5, 3, 0) > > +#define SYS_VDISR_EL2 sys_reg(3, 4, 12, 1, 1) > #define __SYS__AP0Rx_EL2(x) sys_reg(3, 4, 12, 8, x) > #define SYS_ICH_AP0R0_EL2 __SYS__AP0Rx_EL2(0) > #define SYS_ICH_AP0R1_EL2 __SYS__AP0Rx_EL2(1) > diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c > index 934137647837..f4d604803b29 100644 > --- a/arch/arm64/kvm/hyp/sysreg-sr.c > +++ b/arch/arm64/kvm/hyp/sysreg-sr.c > @@ -66,6 +66,9 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt) > ctxt->gp_regs.sp_el1 = read_sysreg(sp_el1); > ctxt->gp_regs.elr_el1 = read_sysreg_el1(elr); > ctxt->gp_regs.spsr[KVM_SPSR_EL1]= read_sysreg_el1(spsr); > + > + if (cpus_have_const_cap(ARM64_HAS_RAS_EXTN)) > + ctxt->sys_regs[DISR_EL1] = read_sysreg_s(SYS_VDISR_EL2); > } > > static hyp_alternate_select(__sysreg_call_save_host_state, > @@ -119,6 +122,9 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt) > write_sysreg(ctxt->gp_regs.sp_el1, sp_el1); > write_sysreg_el1(ctxt->gp_regs.elr_el1, elr); > write_sysreg_el1(ctxt->gp_regs.spsr[KVM_SPSR_EL1],spsr); > + > + if (cpus_have_const_cap(ARM64_HAS_RAS_EXTN)) > + write_sysreg_s(ctxt->sys_regs[DISR_EL1], SYS_VDISR_EL2); > } > > static hyp_alternate_select(__sysreg_call_restore_host_state, > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 2e070d3baf9f..713275b501ce 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -963,6 +963,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { > { SYS_DESC(SYS_AMAIR_EL1), access_vm_reg, reset_amair_el1, AMAIR_EL1 }, > > { SYS_DESC(SYS_VBAR_EL1), NULL, reset_val, VBAR_EL1, 0 }, > + { SYS_DESC(SYS_DISR_EL1), NULL, reset_val, DISR_EL1, 0 }, > > { SYS_DESC(SYS_ICC_IAR0_EL1), write_to_read_only }, > { SYS_DESC(SYS_ICC_EOIR0_EL1), read_from_write_only }, > -- > 2.13.3 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: cdall@linaro.org (Christoffer Dall) Date: Tue, 31 Oct 2017 06:27:15 +0100 Subject: [PATCH v4 16/21] KVM: arm64: Save/Restore guest DISR_EL1 In-Reply-To: <20171019145807.23251-17-james.morse@arm.com> References: <20171019145807.23251-1-james.morse@arm.com> <20171019145807.23251-17-james.morse@arm.com> Message-ID: <20171031052715.GA129057@lvm> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Oct 19, 2017 at 03:58:02PM +0100, James Morse wrote: > If we deliver a virtual SError to the guest, the guest may defer it > with an ESB instruction. The guest reads the deferred value via DISR_EL1, > but the guests view of DISR_EL1 is re-mapped to VDISR_EL2 when HCR_EL2.AMO > is set. > > Add the KVM code to save/restore VDISR_EL2, and make it accessible to > userspace as DISR_EL1. > Reviewed-by: Christoffer Dall > Signed-off-by: James Morse > --- > arch/arm64/include/asm/kvm_host.h | 1 + > arch/arm64/include/asm/sysreg.h | 1 + > arch/arm64/kvm/hyp/sysreg-sr.c | 6 ++++++ > arch/arm64/kvm/sys_regs.c | 1 + > 4 files changed, 9 insertions(+) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 28a4de85edee..97438cc3a9ad 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -120,6 +120,7 @@ enum vcpu_sysreg { > PAR_EL1, /* Physical Address Register */ > MDSCR_EL1, /* Monitor Debug System Control Register */ > MDCCINT_EL1, /* Monitor Debug Comms Channel Interrupt Enable Reg */ > + DISR_EL1, /* Deferred Interrupt Status Register */ > > /* Performance Monitors Registers */ > PMCR_EL0, /* Control Register */ > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > index a493e93de296..1b8b9012234d 100644 > --- a/arch/arm64/include/asm/sysreg.h > +++ b/arch/arm64/include/asm/sysreg.h > @@ -256,6 +256,7 @@ > #define SYS_VSESR_EL2 sys_reg(3, 4, 5, 2, 3) > #define SYS_FPEXC32_EL2 sys_reg(3, 4, 5, 3, 0) > > +#define SYS_VDISR_EL2 sys_reg(3, 4, 12, 1, 1) > #define __SYS__AP0Rx_EL2(x) sys_reg(3, 4, 12, 8, x) > #define SYS_ICH_AP0R0_EL2 __SYS__AP0Rx_EL2(0) > #define SYS_ICH_AP0R1_EL2 __SYS__AP0Rx_EL2(1) > diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c > index 934137647837..f4d604803b29 100644 > --- a/arch/arm64/kvm/hyp/sysreg-sr.c > +++ b/arch/arm64/kvm/hyp/sysreg-sr.c > @@ -66,6 +66,9 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt) > ctxt->gp_regs.sp_el1 = read_sysreg(sp_el1); > ctxt->gp_regs.elr_el1 = read_sysreg_el1(elr); > ctxt->gp_regs.spsr[KVM_SPSR_EL1]= read_sysreg_el1(spsr); > + > + if (cpus_have_const_cap(ARM64_HAS_RAS_EXTN)) > + ctxt->sys_regs[DISR_EL1] = read_sysreg_s(SYS_VDISR_EL2); > } > > static hyp_alternate_select(__sysreg_call_save_host_state, > @@ -119,6 +122,9 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt) > write_sysreg(ctxt->gp_regs.sp_el1, sp_el1); > write_sysreg_el1(ctxt->gp_regs.elr_el1, elr); > write_sysreg_el1(ctxt->gp_regs.spsr[KVM_SPSR_EL1],spsr); > + > + if (cpus_have_const_cap(ARM64_HAS_RAS_EXTN)) > + write_sysreg_s(ctxt->sys_regs[DISR_EL1], SYS_VDISR_EL2); > } > > static hyp_alternate_select(__sysreg_call_restore_host_state, > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 2e070d3baf9f..713275b501ce 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -963,6 +963,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { > { SYS_DESC(SYS_AMAIR_EL1), access_vm_reg, reset_amair_el1, AMAIR_EL1 }, > > { SYS_DESC(SYS_VBAR_EL1), NULL, reset_val, VBAR_EL1, 0 }, > + { SYS_DESC(SYS_DISR_EL1), NULL, reset_val, DISR_EL1, 0 }, > > { SYS_DESC(SYS_ICC_IAR0_EL1), write_to_read_only }, > { SYS_DESC(SYS_ICC_EOIR0_EL1), read_from_write_only }, > -- > 2.13.3 >