From: Christoffer Dall <christoffer.dall@linaro.org> To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>, Shih-Wei Li <shihwei@cs.columbia.edu>, Andrew Jones <drjones@redhat.com>, Christoffer Dall <christoffer.dall@linaro.org> Subject: [PATCH v2 29/36] KVM: arm64: Configure c15, PMU, and debug register traps on cpu load/put for VHE Date: Thu, 7 Dec 2017 18:06:23 +0100 [thread overview] Message-ID: <20171207170630.592-30-christoffer.dall@linaro.org> (raw) In-Reply-To: <20171207170630.592-1-christoffer.dall@linaro.org> We do not have to change the c15 trap setting on each switch to/from the guest on VHE systems, because this setting only affects EL0. The PMU and debug trap configuration can also be done on vcpu load/put instead, because they don't affect how the host kernel can access the debug registers while executing KVM kernel code and KVM doesn't use floating point itself. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/hyp/switch.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 44aae69a7fec..f039aad86c27 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -43,8 +43,6 @@ static void __hyp_text __activate_traps_fpsimd32(struct kvm_vcpu *vcpu) static void __hyp_text __activate_traps_common(struct kvm_vcpu *vcpu) { - write_sysreg(vcpu->arch.hcr_el2, hcr_el2); - /* Trap on AArch32 cp15 c15 (impdef sysregs) accesses (EL1 or EL0) */ write_sysreg(1 << 15, hstr_el2); /* @@ -64,12 +62,15 @@ static void __hyp_text __deactivate_traps_common(void) write_sysreg(0, pmuserenr_el0); } +/* Activate the traps we can during vcpu_load with VHE */ void activate_traps_vhe_load(struct kvm_vcpu *vcpu) { u64 val; + /* Make sure 32-bit guests trap VFP */ __activate_traps_fpsimd32(vcpu); + /* Trap VFP accesses on a VHE system */ val = read_sysreg(cpacr_el1); val |= CPACR_EL1_TTA; val &= ~CPACR_EL1_ZEN; @@ -78,11 +79,28 @@ void activate_traps_vhe_load(struct kvm_vcpu *vcpu) else val &= ~CPACR_EL1_FPEN; write_sysreg(val, cpacr_el1); + + /* Activate traps on impdef sysregs, PMU, and debug */ + __activate_traps_common(vcpu); } +/* Deactivate the traps we can during vcpu_put with VHE */ void deactivate_traps_vhe_put(void) { + u64 mdcr_el2; + + /* Re-enable host VFP and SVE access */ write_sysreg(CPACR_EL1_DEFAULT, cpacr_el1); + + /* Re-enable host access to impdef sysregs and the PMU */ + __deactivate_traps_common(); + + /* Re-enable host access to the debug regs */ + mdcr_el2 = read_sysreg(mdcr_el2); + mdcr_el2 &= MDCR_EL2_HPMN_MASK | + MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT | + MDCR_EL2_TPMS; + write_sysreg(mdcr_el2, mdcr_el2); } static void __hyp_text __activate_traps_vhe(struct kvm_vcpu *vcpu) @@ -94,8 +112,13 @@ static void __hyp_text __activate_traps_nvhe(struct kvm_vcpu *vcpu) { u64 val; + /* Activate traps on impdef sysregs, PMU, and debug */ + __activate_traps_common(vcpu); + + /* Make sure 32-bit guests trap VFP */ __activate_traps_fpsimd32(vcpu); + /* Trap VFP accesses on a non-VHE system */ val = CPTR_EL2_DEFAULT; val |= CPTR_EL2_TTA | CPTR_EL2_TZ; if (vcpu->arch.guest_vfp_loaded) @@ -111,20 +134,14 @@ static hyp_alternate_select(__activate_traps_arch, static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu) { - __activate_traps_common(vcpu); __activate_traps_arch()(vcpu); + write_sysreg(vcpu->arch.hcr_el2, hcr_el2); } static void __hyp_text __deactivate_traps_vhe(void) { extern char vectors[]; /* kernel exception vectors */ - u64 mdcr_el2 = read_sysreg(mdcr_el2); - mdcr_el2 &= MDCR_EL2_HPMN_MASK | - MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT | - MDCR_EL2_TPMS; - - write_sysreg(mdcr_el2, mdcr_el2); write_sysreg(HCR_HOST_VHE_FLAGS, hcr_el2); write_sysreg(vectors, vbar_el1); } -- 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 29/36] KVM: arm64: Configure c15, PMU, and debug register traps on cpu load/put for VHE Date: Thu, 7 Dec 2017 18:06:23 +0100 [thread overview] Message-ID: <20171207170630.592-30-christoffer.dall@linaro.org> (raw) In-Reply-To: <20171207170630.592-1-christoffer.dall@linaro.org> We do not have to change the c15 trap setting on each switch to/from the guest on VHE systems, because this setting only affects EL0. The PMU and debug trap configuration can also be done on vcpu load/put instead, because they don't affect how the host kernel can access the debug registers while executing KVM kernel code and KVM doesn't use floating point itself. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/kvm/hyp/switch.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 44aae69a7fec..f039aad86c27 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -43,8 +43,6 @@ static void __hyp_text __activate_traps_fpsimd32(struct kvm_vcpu *vcpu) static void __hyp_text __activate_traps_common(struct kvm_vcpu *vcpu) { - write_sysreg(vcpu->arch.hcr_el2, hcr_el2); - /* Trap on AArch32 cp15 c15 (impdef sysregs) accesses (EL1 or EL0) */ write_sysreg(1 << 15, hstr_el2); /* @@ -64,12 +62,15 @@ static void __hyp_text __deactivate_traps_common(void) write_sysreg(0, pmuserenr_el0); } +/* Activate the traps we can during vcpu_load with VHE */ void activate_traps_vhe_load(struct kvm_vcpu *vcpu) { u64 val; + /* Make sure 32-bit guests trap VFP */ __activate_traps_fpsimd32(vcpu); + /* Trap VFP accesses on a VHE system */ val = read_sysreg(cpacr_el1); val |= CPACR_EL1_TTA; val &= ~CPACR_EL1_ZEN; @@ -78,11 +79,28 @@ void activate_traps_vhe_load(struct kvm_vcpu *vcpu) else val &= ~CPACR_EL1_FPEN; write_sysreg(val, cpacr_el1); + + /* Activate traps on impdef sysregs, PMU, and debug */ + __activate_traps_common(vcpu); } +/* Deactivate the traps we can during vcpu_put with VHE */ void deactivate_traps_vhe_put(void) { + u64 mdcr_el2; + + /* Re-enable host VFP and SVE access */ write_sysreg(CPACR_EL1_DEFAULT, cpacr_el1); + + /* Re-enable host access to impdef sysregs and the PMU */ + __deactivate_traps_common(); + + /* Re-enable host access to the debug regs */ + mdcr_el2 = read_sysreg(mdcr_el2); + mdcr_el2 &= MDCR_EL2_HPMN_MASK | + MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT | + MDCR_EL2_TPMS; + write_sysreg(mdcr_el2, mdcr_el2); } static void __hyp_text __activate_traps_vhe(struct kvm_vcpu *vcpu) @@ -94,8 +112,13 @@ static void __hyp_text __activate_traps_nvhe(struct kvm_vcpu *vcpu) { u64 val; + /* Activate traps on impdef sysregs, PMU, and debug */ + __activate_traps_common(vcpu); + + /* Make sure 32-bit guests trap VFP */ __activate_traps_fpsimd32(vcpu); + /* Trap VFP accesses on a non-VHE system */ val = CPTR_EL2_DEFAULT; val |= CPTR_EL2_TTA | CPTR_EL2_TZ; if (vcpu->arch.guest_vfp_loaded) @@ -111,20 +134,14 @@ static hyp_alternate_select(__activate_traps_arch, static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu) { - __activate_traps_common(vcpu); __activate_traps_arch()(vcpu); + write_sysreg(vcpu->arch.hcr_el2, hcr_el2); } static void __hyp_text __deactivate_traps_vhe(void) { extern char vectors[]; /* kernel exception vectors */ - u64 mdcr_el2 = read_sysreg(mdcr_el2); - mdcr_el2 &= MDCR_EL2_HPMN_MASK | - MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT | - MDCR_EL2_TPMS; - - write_sysreg(mdcr_el2, mdcr_el2); write_sysreg(HCR_HOST_VHE_FLAGS, hcr_el2); write_sysreg(vectors, vbar_el1); } -- 2.14.2
next prev parent reply other threads:[~2017-12-07 17:07 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 ` [PATCH v2 20/36] KVM: arm64: Don't save the host ELR_EL2 and SPSR_EL2 on VHE systems Christoffer Dall 2017-12-07 17:06 ` 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 ` Christoffer Dall [this message] 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 ` [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-30-christoffer.dall@linaro.org \ --to=christoffer.dall@linaro.org \ --cc=drjones@redhat.com \ --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.