From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/21] arm64: KVM: Implement the core world switch
Date: Tue, 24 Nov 2015 17:40:26 +0000 [thread overview]
Message-ID: <20151124174026.0dfcc7ea@arm.com> (raw)
In-Reply-To: <87poyze26t.fsf@linaro.org>
On Tue, 24 Nov 2015 17:29:14 +0000
Alex Benn?e <alex.bennee@linaro.org> wrote:
>
> Marc Zyngier <marc.zyngier@arm.com> writes:
>
> > Implement the core of the world switch in C. Not everything is there
> > yet, and there is nothing to re-enter the world switch either.
> >
> > But this already outlines the code structure well enough.
> >
> > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> > ---
> > arch/arm64/kvm/hyp/Makefile | 1 +
> > arch/arm64/kvm/hyp/switch.c | 134 ++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 135 insertions(+)
> > create mode 100644 arch/arm64/kvm/hyp/switch.c
> >
> > diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
> > index 1e1ff06..9c11b0f 100644
> > --- a/arch/arm64/kvm/hyp/Makefile
> > +++ b/arch/arm64/kvm/hyp/Makefile
> > @@ -8,3 +8,4 @@ obj-$(CONFIG_KVM_ARM_HOST) += timer-sr.o
> > obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o
> > obj-$(CONFIG_KVM_ARM_HOST) += debug-sr.o
> > obj-$(CONFIG_KVM_ARM_HOST) += entry.o
> > +obj-$(CONFIG_KVM_ARM_HOST) += switch.o
> > diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
> > new file mode 100644
> > index 0000000..a3af81a
> > --- /dev/null
> > +++ b/arch/arm64/kvm/hyp/switch.c
> > @@ -0,0 +1,134 @@
> > +/*
> > + * Copyright (C) 2015 - ARM Ltd
> > + * Author: Marc Zyngier <marc.zyngier@arm.com>
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> > + */
> > +
> > +#include "hyp.h"
> > +
> > +static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)
> > +{
> > + u64 val;
> > +
> > + /*
> > + * We are about to set CPTR_EL2.TFP to trap all floating point
> > + * register accesses to EL2, however, the ARM ARM clearly states that
> > + * traps are only taken to EL2 if the operation would not otherwise
> > + * trap to EL1. Therefore, always make sure that for 32-bit guests,
> > + * we set FPEXC.EN to prevent traps to EL1, when setting the TFP bit.
> > + */
> > + val = vcpu->arch.hcr_el2;
> > + if (val & HCR_RW) {
> > + write_sysreg(1 << 30, fpexc32_el2);
> > + isb();
> > + }
> > + write_sysreg(val, hcr_el2);
> > + write_sysreg(1 << 15, hstr_el2);
> > + write_sysreg(CPTR_EL2_TTA | CPTR_EL2_TFP, cptr_el2);
> > + write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2);
> > +}
> > +
> > +static void __hyp_text __deactivate_traps(struct kvm_vcpu *vcpu)
> > +{
> > + write_sysreg(HCR_RW, hcr_el2);
> > + write_sysreg(0, hstr_el2);
> > + write_sysreg(read_sysreg(mdcr_el2) & MDCR_EL2_HPMN_MASK, mdcr_el2);
> > + write_sysreg(0, cptr_el2);
> > +}
> > +
> > +static void __hyp_text __activate_vm(struct kvm_vcpu *vcpu)
> > +{
> > + struct kvm *kvm = kern_hyp_va(vcpu->kvm);
> > + write_sysreg(kvm->arch.vttbr, vttbr_el2);
> > +}
> > +
> > +static void __hyp_text __deactivate_vm(struct kvm_vcpu *vcpu)
> > +{
> > + write_sysreg(0, vttbr_el2);
> > +}
> > +
> > +static hyp_alternate_select(__vgic_call_save_state,
> > + __vgic_v2_save_state, __vgic_v3_save_state,
> > + ARM64_HAS_SYSREG_GIC_CPUIF);
> > +
> > +static hyp_alternate_select(__vgic_call_restore_state,
> > + __vgic_v2_restore_state, __vgic_v3_restore_state,
> > + ARM64_HAS_SYSREG_GIC_CPUIF);
> > +
> > +static void __hyp_text __vgic_save_state(struct kvm_vcpu *vcpu)
> > +{
> > + __vgic_call_save_state()(vcpu);
> > + write_sysreg(read_sysreg(hcr_el2) & ~HCR_INT_OVERRIDE, hcr_el2);
> > +}
> > +
> > +static void __hyp_text __vgic_restore_state(struct kvm_vcpu *vcpu)
> > +{
> > + u64 val;
> > +
> > + val = read_sysreg(hcr_el2);
> > + val |= HCR_INT_OVERRIDE;
> > + val |= vcpu->arch.irq_lines;
> > + write_sysreg(val, hcr_el2);
> > +
> > + __vgic_call_restore_state()(vcpu);
> > +}
> > +
> > +int __hyp_text __guest_run(struct kvm_vcpu *vcpu)
> > +{
> > + struct kvm_cpu_context *host_ctxt;
> > + struct kvm_cpu_context *guest_ctxt;
> > + u64 exit_code;
> > +
> > + vcpu = kern_hyp_va(vcpu);
> > + write_sysreg(vcpu, tpidr_el2);
> > +
> > + host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context);
> > + guest_ctxt = &vcpu->arch.ctxt;
> > +
> > + __sysreg_save_state(host_ctxt);
> > + __debug_cond_save_state(vcpu, &vcpu->arch.host_debug_state, host_ctxt);
> > +
> > + __activate_traps(vcpu);
> > + __activate_vm(vcpu);
> > +
> > + __vgic_restore_state(vcpu);
> > + __timer_restore_state(vcpu);
> > +
> > + /*
> > + * We must restore the 32-bit state before the sysregs, thanks
> > + * to Cortex-A57 erratum #852523.
> > + */
> > + __sysreg32_restore_state(vcpu);
> > + __sysreg_restore_state(guest_ctxt);
> > + __debug_restore_state(vcpu, &vcpu->arch.vcpu_debug_state,
> > guest_ctxt);
>
> Did you right this before guest debug was merged? Now
> vcpu.debug_ptr/VCPU_DEBUG_PTR selects which set of debug registers we
> are going to use before entering the guest.
I probably just overlooked that bit. Thanks for noticing it!
M.
--
Jazz is not dead. It just smells funny.
next prev parent reply other threads:[~2015-11-24 17:40 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-16 13:11 [PATCH 00/21] arm64: KVM: world switch in C Marc Zyngier
2015-11-16 13:11 ` [PATCH 01/21] arm64: add macros to read/write system registers Marc Zyngier
2015-11-16 13:11 ` [PATCH 02/21] arm64: KVM: Add a HYP-specific header file Marc Zyngier
2015-11-16 13:11 ` [PATCH 03/21] arm64: KVM: Implement vgic-v2 save/restore Marc Zyngier
2015-11-20 15:22 ` Steve Capper
2015-11-20 15:54 ` Marc Zyngier
2015-11-16 13:11 ` [PATCH 04/21] arm64: KVM: Implement vgic-v3 save/restore Marc Zyngier
2015-11-20 16:48 ` Steve Capper
2015-11-20 17:41 ` Marc Zyngier
2015-11-16 13:11 ` [PATCH 05/21] arm64: KVM: Implement timer save/restore Marc Zyngier
2015-11-23 10:47 ` Steve Capper
2015-11-25 8:23 ` Marc Zyngier
2015-11-16 13:11 ` [PATCH 06/21] arm64: KVM: Implement system register save/restore Marc Zyngier
2015-11-16 13:11 ` [PATCH 07/21] arm64: KVM: Implement 32bit " Marc Zyngier
2015-11-16 13:11 ` [PATCH 08/21] arm64: KVM: Implement debug save/restore Marc Zyngier
2015-11-16 13:11 ` [PATCH 09/21] arm64: KVM: Implement guest entry Marc Zyngier
2015-11-16 13:11 ` [PATCH 10/21] arm64: KVM: Add patchable function selector Marc Zyngier
2015-11-16 13:11 ` [PATCH 11/21] arm64: KVM: Implement the core world switch Marc Zyngier
2015-11-24 17:29 ` Alex Bennée
2015-11-24 17:40 ` Marc Zyngier [this message]
2015-11-16 13:11 ` [PATCH 12/21] arm64: KVM: Implement fpsimd save/restore Marc Zyngier
2015-11-17 11:13 ` Steve Capper
2015-11-17 11:25 ` Marc Zyngier
2015-11-17 11:49 ` Steve Capper
2015-11-17 11:56 ` Marc Zyngier
2015-11-16 13:11 ` [PATCH 13/21] arm64: KVM: Implement TLB handling Marc Zyngier
2015-11-16 13:11 ` [PATCH 14/21] arm64: KVM: HYP mode entry points Marc Zyngier
2015-11-16 13:11 ` [PATCH 15/21] arm64: KVM: Add panic handling Marc Zyngier
2015-11-16 14:16 ` Mark Rutland
2015-11-16 14:26 ` Marc Zyngier
2015-11-16 14:32 ` Mark Rutland
2015-11-16 14:44 ` Marc Zyngier
2015-11-16 15:53 ` Ard Biesheuvel
2015-11-16 16:57 ` Marc Zyngier
2015-11-16 13:11 ` [PATCH 16/21] arm64: KVM: Add compatibility aliases Marc Zyngier
2015-11-16 13:11 ` [PATCH 17/21] arm64: KVM: Map the kernel RO section into HYP Marc Zyngier
2015-11-16 14:27 ` Mark Rutland
2015-11-16 14:43 ` Marc Zyngier
2015-11-16 13:11 ` [PATCH 18/21] arm64: KVM: Move away from the assembly version of the world switch Marc Zyngier
2015-11-16 13:11 ` [PATCH 19/21] arm64: KVM: Turn system register numbers to an enum Marc Zyngier
2015-11-16 13:11 ` [PATCH 20/21] arm64: KVM: Cleanup asm-offset.c Marc Zyngier
2015-11-16 13:11 ` [PATCH 21/21] arm64: KVM: Remove weak attributes Marc Zyngier
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=20151124174026.0dfcc7ea@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).