From: Christoffer Dall <christoffer.dall@linaro.org> To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier <marc.zyngier@arm.com>, Shih-Wei Li <shihwei@cs.columbia.edu>, kvm@vger.kernel.org Subject: [PATCH v2 20/36] KVM: arm64: Don't save the host ELR_EL2 and SPSR_EL2 on VHE systems Date: Thu, 7 Dec 2017 18:06:14 +0100 [thread overview] Message-ID: <20171207170630.592-21-christoffer.dall@linaro.org> (raw) In-Reply-To: <20171207170630.592-1-christoffer.dall@linaro.org> On non-VHE systems we need to save the ELR_EL2 and SPSR_EL2 so that we can return to the host in EL1 in the same state and location where we issued a hypercall to EL2, but these registers don't contain anything important on VHE, because all of the host runs in EL2. Therefore, factor out these registers into separate save/restore functions, making it easy to exclude them from the VHE world-switch path later on. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/hyp/sysreg-sr.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c index a12112494f75..479de0f0dd07 100644 --- a/arch/arm64/kvm/hyp/sysreg-sr.c +++ b/arch/arm64/kvm/hyp/sysreg-sr.c @@ -71,6 +71,10 @@ static void __hyp_text __sysreg_save_el1_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); +} + +static void __hyp_text __sysreg_save_el2_return_state(struct kvm_cpu_context *ctxt) +{ ctxt->gp_regs.regs.pc = read_sysreg_el2(elr); ctxt->gp_regs.regs.pstate = read_sysreg_el2(spsr); } @@ -80,6 +84,7 @@ void __hyp_text __sysreg_save_state_nvhe(struct kvm_cpu_context *ctxt) __sysreg_save_el1_state(ctxt); __sysreg_save_common_state(ctxt); __sysreg_save_user_state(ctxt); + __sysreg_save_el2_return_state(ctxt); } void sysreg_save_host_state_vhe(struct kvm_cpu_context *ctxt) @@ -93,6 +98,7 @@ void sysreg_save_guest_state_vhe(struct kvm_cpu_context *ctxt) __sysreg_save_el1_state(ctxt); __sysreg_save_common_state(ctxt); __sysreg_save_user_state(ctxt); + __sysreg_save_el2_return_state(ctxt); } static void __hyp_text __sysreg_restore_common_state(struct kvm_cpu_context *ctxt) @@ -137,6 +143,11 @@ static void __hyp_text __sysreg_restore_el1_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); +} + +static void __hyp_text +__sysreg_restore_el2_return_state(struct kvm_cpu_context *ctxt) +{ write_sysreg_el2(ctxt->gp_regs.regs.pc, elr); write_sysreg_el2(ctxt->gp_regs.regs.pstate, spsr); } @@ -146,6 +157,7 @@ void __hyp_text __sysreg_restore_state_nvhe(struct kvm_cpu_context *ctxt) __sysreg_restore_el1_state(ctxt); __sysreg_restore_common_state(ctxt); __sysreg_restore_user_state(ctxt); + __sysreg_restore_el2_return_state(ctxt); } void sysreg_restore_host_state_vhe(struct kvm_cpu_context *ctxt) @@ -159,6 +171,7 @@ void sysreg_restore_guest_state_vhe(struct kvm_cpu_context *ctxt) __sysreg_restore_el1_state(ctxt); __sysreg_restore_common_state(ctxt); __sysreg_restore_user_state(ctxt); + __sysreg_restore_el2_return_state(ctxt); } static void __hyp_text __fpsimd32_save_state(struct kvm_cpu_context *ctxt) -- 2.14.2
WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 20/36] KVM: arm64: Don't save the host ELR_EL2 and SPSR_EL2 on VHE systems Date: Thu, 7 Dec 2017 18:06:14 +0100 [thread overview] Message-ID: <20171207170630.592-21-christoffer.dall@linaro.org> (raw) In-Reply-To: <20171207170630.592-1-christoffer.dall@linaro.org> On non-VHE systems we need to save the ELR_EL2 and SPSR_EL2 so that we can return to the host in EL1 in the same state and location where we issued a hypercall to EL2, but these registers don't contain anything important on VHE, because all of the host runs in EL2. Therefore, factor out these registers into separate save/restore functions, making it easy to exclude them from the VHE world-switch path later on. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/hyp/sysreg-sr.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c index a12112494f75..479de0f0dd07 100644 --- a/arch/arm64/kvm/hyp/sysreg-sr.c +++ b/arch/arm64/kvm/hyp/sysreg-sr.c @@ -71,6 +71,10 @@ static void __hyp_text __sysreg_save_el1_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); +} + +static void __hyp_text __sysreg_save_el2_return_state(struct kvm_cpu_context *ctxt) +{ ctxt->gp_regs.regs.pc = read_sysreg_el2(elr); ctxt->gp_regs.regs.pstate = read_sysreg_el2(spsr); } @@ -80,6 +84,7 @@ void __hyp_text __sysreg_save_state_nvhe(struct kvm_cpu_context *ctxt) __sysreg_save_el1_state(ctxt); __sysreg_save_common_state(ctxt); __sysreg_save_user_state(ctxt); + __sysreg_save_el2_return_state(ctxt); } void sysreg_save_host_state_vhe(struct kvm_cpu_context *ctxt) @@ -93,6 +98,7 @@ void sysreg_save_guest_state_vhe(struct kvm_cpu_context *ctxt) __sysreg_save_el1_state(ctxt); __sysreg_save_common_state(ctxt); __sysreg_save_user_state(ctxt); + __sysreg_save_el2_return_state(ctxt); } static void __hyp_text __sysreg_restore_common_state(struct kvm_cpu_context *ctxt) @@ -137,6 +143,11 @@ static void __hyp_text __sysreg_restore_el1_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); +} + +static void __hyp_text +__sysreg_restore_el2_return_state(struct kvm_cpu_context *ctxt) +{ write_sysreg_el2(ctxt->gp_regs.regs.pc, elr); write_sysreg_el2(ctxt->gp_regs.regs.pstate, spsr); } @@ -146,6 +157,7 @@ void __hyp_text __sysreg_restore_state_nvhe(struct kvm_cpu_context *ctxt) __sysreg_restore_el1_state(ctxt); __sysreg_restore_common_state(ctxt); __sysreg_restore_user_state(ctxt); + __sysreg_restore_el2_return_state(ctxt); } void sysreg_restore_host_state_vhe(struct kvm_cpu_context *ctxt) @@ -159,6 +171,7 @@ void sysreg_restore_guest_state_vhe(struct kvm_cpu_context *ctxt) __sysreg_restore_el1_state(ctxt); __sysreg_restore_common_state(ctxt); __sysreg_restore_user_state(ctxt); + __sysreg_restore_el2_return_state(ctxt); } static void __hyp_text __fpsimd32_save_state(struct kvm_cpu_context *ctxt) -- 2.14.2
next prev parent reply other threads:[~2017-12-07 17:06 UTC|newest] Thread overview: 158+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-12-07 17:05 [PATCH v2 00/36] Optimize KVM/ARM for VHE systems Christoffer Dall 2017-12-07 17:05 ` Christoffer Dall 2017-12-07 17:05 ` [PATCH v2 01/36] KVM: arm64: Avoid storing the vcpu pointer on the stack Christoffer Dall 2017-12-07 17:05 ` Christoffer Dall 2017-12-09 17:19 ` Marc Zyngier 2017-12-09 17:19 ` Marc Zyngier 2017-12-11 9:30 ` Christoffer Dall 2017-12-11 9:30 ` Christoffer Dall 2017-12-11 9:35 ` Marc Zyngier 2017-12-11 9:35 ` Marc Zyngier 2017-12-07 17:05 ` [PATCH v2 02/36] KVM: arm64: Rework hyp_panic for VHE and non-VHE Christoffer Dall 2017-12-07 17:05 ` Christoffer Dall 2017-12-09 17:24 ` Marc Zyngier 2017-12-09 17:24 ` Marc Zyngier 2017-12-07 17:05 ` [PATCH v2 03/36] KVM: arm64: Move HCR_INT_OVERRIDE to default HCR_EL2 guest flag Christoffer Dall 2017-12-07 17:05 ` Christoffer Dall 2017-12-07 17:05 ` [PATCH v2 04/36] KVM: arm/arm64: Get rid of vcpu->arch.irq_lines Christoffer Dall 2017-12-07 17:05 ` Christoffer Dall 2017-12-07 17:05 ` [PATCH v2 05/36] KVM: arm/arm64: Add kvm_vcpu_load_sysregs and kvm_vcpu_put_sysregs Christoffer Dall 2017-12-07 17:05 ` Christoffer Dall 2017-12-09 17:30 ` Marc Zyngier 2017-12-09 17:30 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 06/36] KVM: arm64: Defer restoring host VFP state to vcpu_put Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-09 17:37 ` Marc Zyngier 2017-12-09 17:37 ` Marc Zyngier 2017-12-11 9:31 ` Christoffer Dall 2017-12-11 9:31 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 07/36] KVM: arm64: Move debug dirty flag calculation out of world switch Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-09 19:20 ` Marc Zyngier 2017-12-09 19:20 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 08/36] KVM: arm64: Slightly improve debug save/restore functions Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-09 19:37 ` Marc Zyngier 2017-12-09 19:37 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 09/36] KVM: arm64: Improve debug register save/restore flow Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 9:40 ` Marc Zyngier 2017-12-11 9:40 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 10/36] KVM: arm64: Factor out fault info population and gic workarounds Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 9:45 ` Marc Zyngier 2017-12-11 9:45 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 11/36] KVM: arm64: Introduce VHE-specific kvm_vcpu_run Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 9:53 ` Marc Zyngier 2017-12-11 9:53 ` Marc Zyngier 2017-12-14 12:12 ` Christoffer Dall 2017-12-14 12:12 ` Christoffer Dall 2017-12-14 12:17 ` Marc Zyngier 2017-12-14 12:17 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 12/36] KVM: arm64: Remove kern_hyp_va() use in VHE switch function Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 9:54 ` Marc Zyngier 2017-12-11 9:54 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 13/36] KVM: arm64: Don't deactivate VM on VHE systems Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 9:58 ` Marc Zyngier 2017-12-11 9:58 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 14/36] KVM: arm64: Remove noop calls to timer save/restore from VHE switch Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 10:02 ` Marc Zyngier 2017-12-11 10:02 ` Marc Zyngier 2017-12-14 12:30 ` Christoffer Dall 2017-12-14 12:30 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 15/36] KVM: arm64: Move userspace system registers into separate function Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 10:14 ` Marc Zyngier 2017-12-11 10:14 ` Marc Zyngier 2017-12-14 12:53 ` Christoffer Dall 2017-12-14 12:53 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 16/36] KVM: arm64: Rewrite sysreg alternatives to static keys Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 10:15 ` Marc Zyngier 2017-12-11 10:15 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 17/36] KVM: arm64: Introduce separate VHE/non-VHE sysreg save/restore functions Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 10:22 ` Marc Zyngier 2017-12-11 10:22 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 18/36] KVM: arm/arm64: Remove leftover comment from kvm_vcpu_run_vhe Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 10:30 ` Marc Zyngier 2017-12-11 10:30 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 19/36] KVM: arm64: Unify non-VHE host/guest sysreg save and restore functions Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 10:40 ` Marc Zyngier 2017-12-11 10:40 ` Marc Zyngier 2017-12-07 17:06 ` Christoffer Dall [this message] 2017-12-07 17:06 ` [PATCH v2 20/36] KVM: arm64: Don't save the host ELR_EL2 and SPSR_EL2 on VHE systems Christoffer Dall 2017-12-11 10:44 ` Marc Zyngier 2017-12-11 10:44 ` Marc Zyngier 2017-12-14 13:46 ` Christoffer Dall 2017-12-14 13:46 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 21/36] KVM: arm64: Change 32-bit handling of VM system registers Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 10:57 ` Marc Zyngier 2017-12-11 10:57 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 22/36] KVM: arm64: Prepare to handle traps on deferred VM sysregs Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 11:10 ` Marc Zyngier 2017-12-11 11:10 ` Marc Zyngier 2017-12-11 11:24 ` Christoffer Dall 2017-12-11 11:24 ` Christoffer Dall 2017-12-11 11:46 ` Marc Zyngier 2017-12-11 11:46 ` Marc Zyngier 2017-12-12 13:08 ` Marc Zyngier 2017-12-12 13:08 ` Marc Zyngier 2017-12-12 15:46 ` Christoffer Dall 2017-12-12 15:46 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 23/36] KVM: arm64: Prepare to handle traps on deferred EL0 sysregs Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 24/36] KVM: arm64: Prepare to handle traps on remaining deferred EL1 sysregs Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 25/36] KVM: arm64: Prepare to handle traps on deferred AArch32 sysregs Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 26/36] KVM: arm64: Defer saving/restoring system registers to vcpu load/put on VHE Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 13:20 ` Marc Zyngier 2017-12-11 13:20 ` Marc Zyngier 2017-12-15 16:29 ` Christoffer Dall 2017-12-15 16:29 ` Christoffer Dall 2017-12-29 16:39 ` Christoffer Dall 2017-12-29 16:39 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 27/36] KVM: arm64: Move common VHE/non-VHE trap config in separate functions Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 13:53 ` Marc Zyngier 2017-12-11 13:53 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 28/36] KVM: arm64: Configure FPSIMD traps on vcpu load/put for VHE Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 14:18 ` Marc Zyngier 2017-12-11 14:18 ` Marc Zyngier 2017-12-07 17:06 ` [PATCH v2 29/36] KVM: arm64: Configure c15, PMU, and debug register traps on cpu " Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 30/36] KVM: arm64: Separate activate_traps and deactive_traps for VHE and non-VHE Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 31/36] KVM: arm/arm64: Get rid of vgic_elrsr Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 32/36] KVM: arm/arm64: Handle VGICv2 save/restore from the main VGIC code Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 33/36] KVM: arm/arm64: Move arm64-only vgic-v2-sr.c file to arm64 Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 34/36] KVM: arm/arm64: Handle VGICv3 save/restore from the main VGIC code on VHE Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 35/36] KVM: arm/arm64: Move VGIC APR save/restore to vgic put/load Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-07 17:06 ` [PATCH v2 36/36] KVM: arm/arm64: Avoid VGICv3 save/restore on VHE with no IRQs Christoffer Dall 2017-12-07 17:06 ` Christoffer Dall 2017-12-11 14:43 ` [PATCH v2 00/36] Optimize KVM/ARM for VHE systems Yury Norov 2017-12-11 14:43 ` Yury Norov 2017-12-11 14:56 ` Marc Zyngier 2017-12-11 14:56 ` Marc Zyngier 2017-12-11 15:14 ` Yury Norov 2017-12-11 15:14 ` Yury Norov 2017-12-11 15:34 ` Christoffer Dall 2017-12-11 15:34 ` Christoffer Dall 2017-12-11 16:30 ` Yury Norov 2017-12-11 16:30 ` Yury Norov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20171207170630.592-21-christoffer.dall@linaro.org \ --to=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=shihwei@cs.columbia.edu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.