From: Christoffer Dall <christoffer.dall@linaro.org>
To: Marc Zyngier <marc.zyngier@arm.com>
Cc: kvm@vger.kernel.org, Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 10/21] arm64: KVM: VHE: Split save/restore of sysregs shared between EL1 and EL2
Date: Mon, 1 Feb 2016 14:54:38 +0100 [thread overview]
Message-ID: <20160201135438.GL1478@cbox> (raw)
In-Reply-To: <1453737235-16522-11-git-send-email-marc.zyngier@arm.com>
On Mon, Jan 25, 2016 at 03:53:44PM +0000, Marc Zyngier wrote:
> A handful of system registers are still shared between EL1 and EL2,
> even while using VHE. These are tpidr*_el[01], actlr_el1, sp0, elr,
> and spsr.
So by shared registers you mean registers that do both have an EL0/1
version as well as an EL2 version, but where accesses aren't rewritten
transparently?
also, by sp0 do you mean sp_el0, and by elr you mean elr_el1, and by
spsr you mean spsr_el1 ?
>
> In order to facilitate the introduction of a VHE-specific sysreg
> save/restore, make move the access to these registers to their
> own save/restore functions.
>
> No functionnal change.
Otherwise:
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm64/kvm/hyp/sysreg-sr.c | 48 +++++++++++++++++++++++++++++-------------
> 1 file changed, 33 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c
> index bd5b543..61bad17 100644
> --- a/arch/arm64/kvm/hyp/sysreg-sr.c
> +++ b/arch/arm64/kvm/hyp/sysreg-sr.c
> @@ -23,13 +23,29 @@
>
> #include "hyp.h"
>
> -/* ctxt is already in the HYP VA space */
> +/*
> + * Non-VHE: Both host and guest must save everything.
> + *
> + * VHE: Host must save tpidr*_el[01], actlr_el1, sp0, pc, pstate, and
> + * guest must save everything.
> + */
> +
> +static void __hyp_text __sysreg_save_common_state(struct kvm_cpu_context *ctxt)
> +{
> + ctxt->sys_regs[ACTLR_EL1] = read_sysreg(actlr_el1);
> + ctxt->sys_regs[TPIDR_EL0] = read_sysreg(tpidr_el0);
> + ctxt->sys_regs[TPIDRRO_EL0] = read_sysreg(tpidrro_el0);
> + ctxt->sys_regs[TPIDR_EL1] = read_sysreg(tpidr_el1);
> + ctxt->gp_regs.regs.sp = read_sysreg(sp_el0);
> + ctxt->gp_regs.regs.pc = read_sysreg(elr_el2);
> + ctxt->gp_regs.regs.pstate = read_sysreg(spsr_el2);
> +}
> +
> static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> {
> ctxt->sys_regs[MPIDR_EL1] = read_sysreg(vmpidr_el2);
> ctxt->sys_regs[CSSELR_EL1] = read_sysreg(csselr_el1);
> ctxt->sys_regs[SCTLR_EL1] = read_sysreg(sctlr_el1);
> - ctxt->sys_regs[ACTLR_EL1] = read_sysreg(actlr_el1);
> ctxt->sys_regs[CPACR_EL1] = read_sysreg(cpacr_el1);
> ctxt->sys_regs[TTBR0_EL1] = read_sysreg(ttbr0_el1);
> ctxt->sys_regs[TTBR1_EL1] = read_sysreg(ttbr1_el1);
> @@ -41,17 +57,11 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> ctxt->sys_regs[MAIR_EL1] = read_sysreg(mair_el1);
> ctxt->sys_regs[VBAR_EL1] = read_sysreg(vbar_el1);
> ctxt->sys_regs[CONTEXTIDR_EL1] = read_sysreg(contextidr_el1);
> - ctxt->sys_regs[TPIDR_EL0] = read_sysreg(tpidr_el0);
> - ctxt->sys_regs[TPIDRRO_EL0] = read_sysreg(tpidrro_el0);
> - ctxt->sys_regs[TPIDR_EL1] = read_sysreg(tpidr_el1);
> ctxt->sys_regs[AMAIR_EL1] = read_sysreg(amair_el1);
> ctxt->sys_regs[CNTKCTL_EL1] = read_sysreg(cntkctl_el1);
> ctxt->sys_regs[PAR_EL1] = read_sysreg(par_el1);
> ctxt->sys_regs[MDSCR_EL1] = read_sysreg(mdscr_el1);
>
> - ctxt->gp_regs.regs.sp = read_sysreg(sp_el0);
> - ctxt->gp_regs.regs.pc = read_sysreg(elr_el2);
> - ctxt->gp_regs.regs.pstate = read_sysreg(spsr_el2);
> ctxt->gp_regs.sp_el1 = read_sysreg(sp_el1);
> ctxt->gp_regs.elr_el1 = read_sysreg(elr_el1);
> ctxt->gp_regs.spsr[KVM_SPSR_EL1]= read_sysreg(spsr_el1);
> @@ -60,11 +70,24 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> void __hyp_text __sysreg_save_host_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_save_state(ctxt);
> + __sysreg_save_common_state(ctxt);
> }
>
> void __hyp_text __sysreg_save_guest_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_save_state(ctxt);
> + __sysreg_save_common_state(ctxt);
> +}
> +
> +static void __hyp_text __sysreg_restore_common_state(struct kvm_cpu_context *ctxt)
> +{
> + write_sysreg(ctxt->sys_regs[ACTLR_EL1], actlr_el1);
> + write_sysreg(ctxt->sys_regs[TPIDR_EL0], tpidr_el0);
> + write_sysreg(ctxt->sys_regs[TPIDRRO_EL0], tpidrro_el0);
> + write_sysreg(ctxt->sys_regs[TPIDR_EL1], tpidr_el1);
> + write_sysreg(ctxt->gp_regs.regs.sp, sp_el0);
> + write_sysreg(ctxt->gp_regs.regs.pc, elr_el2);
> + write_sysreg(ctxt->gp_regs.regs.pstate, spsr_el2);
> }
>
> static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> @@ -72,7 +95,6 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> write_sysreg(ctxt->sys_regs[MPIDR_EL1], vmpidr_el2);
> write_sysreg(ctxt->sys_regs[CSSELR_EL1], csselr_el1);
> write_sysreg(ctxt->sys_regs[SCTLR_EL1], sctlr_el1);
> - write_sysreg(ctxt->sys_regs[ACTLR_EL1], actlr_el1);
> write_sysreg(ctxt->sys_regs[CPACR_EL1], cpacr_el1);
> write_sysreg(ctxt->sys_regs[TTBR0_EL1], ttbr0_el1);
> write_sysreg(ctxt->sys_regs[TTBR1_EL1], ttbr1_el1);
> @@ -84,17 +106,11 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> write_sysreg(ctxt->sys_regs[MAIR_EL1], mair_el1);
> write_sysreg(ctxt->sys_regs[VBAR_EL1], vbar_el1);
> write_sysreg(ctxt->sys_regs[CONTEXTIDR_EL1], contextidr_el1);
> - write_sysreg(ctxt->sys_regs[TPIDR_EL0], tpidr_el0);
> - write_sysreg(ctxt->sys_regs[TPIDRRO_EL0], tpidrro_el0);
> - write_sysreg(ctxt->sys_regs[TPIDR_EL1], tpidr_el1);
> write_sysreg(ctxt->sys_regs[AMAIR_EL1], amair_el1);
> write_sysreg(ctxt->sys_regs[CNTKCTL_EL1], cntkctl_el1);
> write_sysreg(ctxt->sys_regs[PAR_EL1], par_el1);
> write_sysreg(ctxt->sys_regs[MDSCR_EL1], mdscr_el1);
>
> - write_sysreg(ctxt->gp_regs.regs.sp, sp_el0);
> - write_sysreg(ctxt->gp_regs.regs.pc, elr_el2);
> - write_sysreg(ctxt->gp_regs.regs.pstate, spsr_el2);
> write_sysreg(ctxt->gp_regs.sp_el1, sp_el1);
> write_sysreg(ctxt->gp_regs.elr_el1, elr_el1);
> write_sysreg(ctxt->gp_regs.spsr[KVM_SPSR_EL1], spsr_el1);
> @@ -103,11 +119,13 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> void __hyp_text __sysreg_restore_host_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_restore_state(ctxt);
> + __sysreg_restore_common_state(ctxt);
> }
>
> void __hyp_text __sysreg_restore_guest_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_restore_state(ctxt);
> + __sysreg_restore_common_state(ctxt);
> }
>
> void __hyp_text __sysreg32_save_state(struct kvm_vcpu *vcpu)
> --
> 2.1.4
>
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 10/21] arm64: KVM: VHE: Split save/restore of sysregs shared between EL1 and EL2
Date: Mon, 1 Feb 2016 14:54:38 +0100 [thread overview]
Message-ID: <20160201135438.GL1478@cbox> (raw)
In-Reply-To: <1453737235-16522-11-git-send-email-marc.zyngier@arm.com>
On Mon, Jan 25, 2016 at 03:53:44PM +0000, Marc Zyngier wrote:
> A handful of system registers are still shared between EL1 and EL2,
> even while using VHE. These are tpidr*_el[01], actlr_el1, sp0, elr,
> and spsr.
So by shared registers you mean registers that do both have an EL0/1
version as well as an EL2 version, but where accesses aren't rewritten
transparently?
also, by sp0 do you mean sp_el0, and by elr you mean elr_el1, and by
spsr you mean spsr_el1 ?
>
> In order to facilitate the introduction of a VHE-specific sysreg
> save/restore, make move the access to these registers to their
> own save/restore functions.
>
> No functionnal change.
Otherwise:
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm64/kvm/hyp/sysreg-sr.c | 48 +++++++++++++++++++++++++++++-------------
> 1 file changed, 33 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c
> index bd5b543..61bad17 100644
> --- a/arch/arm64/kvm/hyp/sysreg-sr.c
> +++ b/arch/arm64/kvm/hyp/sysreg-sr.c
> @@ -23,13 +23,29 @@
>
> #include "hyp.h"
>
> -/* ctxt is already in the HYP VA space */
> +/*
> + * Non-VHE: Both host and guest must save everything.
> + *
> + * VHE: Host must save tpidr*_el[01], actlr_el1, sp0, pc, pstate, and
> + * guest must save everything.
> + */
> +
> +static void __hyp_text __sysreg_save_common_state(struct kvm_cpu_context *ctxt)
> +{
> + ctxt->sys_regs[ACTLR_EL1] = read_sysreg(actlr_el1);
> + ctxt->sys_regs[TPIDR_EL0] = read_sysreg(tpidr_el0);
> + ctxt->sys_regs[TPIDRRO_EL0] = read_sysreg(tpidrro_el0);
> + ctxt->sys_regs[TPIDR_EL1] = read_sysreg(tpidr_el1);
> + ctxt->gp_regs.regs.sp = read_sysreg(sp_el0);
> + ctxt->gp_regs.regs.pc = read_sysreg(elr_el2);
> + ctxt->gp_regs.regs.pstate = read_sysreg(spsr_el2);
> +}
> +
> static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> {
> ctxt->sys_regs[MPIDR_EL1] = read_sysreg(vmpidr_el2);
> ctxt->sys_regs[CSSELR_EL1] = read_sysreg(csselr_el1);
> ctxt->sys_regs[SCTLR_EL1] = read_sysreg(sctlr_el1);
> - ctxt->sys_regs[ACTLR_EL1] = read_sysreg(actlr_el1);
> ctxt->sys_regs[CPACR_EL1] = read_sysreg(cpacr_el1);
> ctxt->sys_regs[TTBR0_EL1] = read_sysreg(ttbr0_el1);
> ctxt->sys_regs[TTBR1_EL1] = read_sysreg(ttbr1_el1);
> @@ -41,17 +57,11 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> ctxt->sys_regs[MAIR_EL1] = read_sysreg(mair_el1);
> ctxt->sys_regs[VBAR_EL1] = read_sysreg(vbar_el1);
> ctxt->sys_regs[CONTEXTIDR_EL1] = read_sysreg(contextidr_el1);
> - ctxt->sys_regs[TPIDR_EL0] = read_sysreg(tpidr_el0);
> - ctxt->sys_regs[TPIDRRO_EL0] = read_sysreg(tpidrro_el0);
> - ctxt->sys_regs[TPIDR_EL1] = read_sysreg(tpidr_el1);
> ctxt->sys_regs[AMAIR_EL1] = read_sysreg(amair_el1);
> ctxt->sys_regs[CNTKCTL_EL1] = read_sysreg(cntkctl_el1);
> ctxt->sys_regs[PAR_EL1] = read_sysreg(par_el1);
> ctxt->sys_regs[MDSCR_EL1] = read_sysreg(mdscr_el1);
>
> - ctxt->gp_regs.regs.sp = read_sysreg(sp_el0);
> - ctxt->gp_regs.regs.pc = read_sysreg(elr_el2);
> - ctxt->gp_regs.regs.pstate = read_sysreg(spsr_el2);
> ctxt->gp_regs.sp_el1 = read_sysreg(sp_el1);
> ctxt->gp_regs.elr_el1 = read_sysreg(elr_el1);
> ctxt->gp_regs.spsr[KVM_SPSR_EL1]= read_sysreg(spsr_el1);
> @@ -60,11 +70,24 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> void __hyp_text __sysreg_save_host_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_save_state(ctxt);
> + __sysreg_save_common_state(ctxt);
> }
>
> void __hyp_text __sysreg_save_guest_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_save_state(ctxt);
> + __sysreg_save_common_state(ctxt);
> +}
> +
> +static void __hyp_text __sysreg_restore_common_state(struct kvm_cpu_context *ctxt)
> +{
> + write_sysreg(ctxt->sys_regs[ACTLR_EL1], actlr_el1);
> + write_sysreg(ctxt->sys_regs[TPIDR_EL0], tpidr_el0);
> + write_sysreg(ctxt->sys_regs[TPIDRRO_EL0], tpidrro_el0);
> + write_sysreg(ctxt->sys_regs[TPIDR_EL1], tpidr_el1);
> + write_sysreg(ctxt->gp_regs.regs.sp, sp_el0);
> + write_sysreg(ctxt->gp_regs.regs.pc, elr_el2);
> + write_sysreg(ctxt->gp_regs.regs.pstate, spsr_el2);
> }
>
> static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> @@ -72,7 +95,6 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> write_sysreg(ctxt->sys_regs[MPIDR_EL1], vmpidr_el2);
> write_sysreg(ctxt->sys_regs[CSSELR_EL1], csselr_el1);
> write_sysreg(ctxt->sys_regs[SCTLR_EL1], sctlr_el1);
> - write_sysreg(ctxt->sys_regs[ACTLR_EL1], actlr_el1);
> write_sysreg(ctxt->sys_regs[CPACR_EL1], cpacr_el1);
> write_sysreg(ctxt->sys_regs[TTBR0_EL1], ttbr0_el1);
> write_sysreg(ctxt->sys_regs[TTBR1_EL1], ttbr1_el1);
> @@ -84,17 +106,11 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> write_sysreg(ctxt->sys_regs[MAIR_EL1], mair_el1);
> write_sysreg(ctxt->sys_regs[VBAR_EL1], vbar_el1);
> write_sysreg(ctxt->sys_regs[CONTEXTIDR_EL1], contextidr_el1);
> - write_sysreg(ctxt->sys_regs[TPIDR_EL0], tpidr_el0);
> - write_sysreg(ctxt->sys_regs[TPIDRRO_EL0], tpidrro_el0);
> - write_sysreg(ctxt->sys_regs[TPIDR_EL1], tpidr_el1);
> write_sysreg(ctxt->sys_regs[AMAIR_EL1], amair_el1);
> write_sysreg(ctxt->sys_regs[CNTKCTL_EL1], cntkctl_el1);
> write_sysreg(ctxt->sys_regs[PAR_EL1], par_el1);
> write_sysreg(ctxt->sys_regs[MDSCR_EL1], mdscr_el1);
>
> - write_sysreg(ctxt->gp_regs.regs.sp, sp_el0);
> - write_sysreg(ctxt->gp_regs.regs.pc, elr_el2);
> - write_sysreg(ctxt->gp_regs.regs.pstate, spsr_el2);
> write_sysreg(ctxt->gp_regs.sp_el1, sp_el1);
> write_sysreg(ctxt->gp_regs.elr_el1, elr_el1);
> write_sysreg(ctxt->gp_regs.spsr[KVM_SPSR_EL1], spsr_el1);
> @@ -103,11 +119,13 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> void __hyp_text __sysreg_restore_host_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_restore_state(ctxt);
> + __sysreg_restore_common_state(ctxt);
> }
>
> void __hyp_text __sysreg_restore_guest_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_restore_state(ctxt);
> + __sysreg_restore_common_state(ctxt);
> }
>
> void __hyp_text __sysreg32_save_state(struct kvm_vcpu *vcpu)
> --
> 2.1.4
>
WARNING: multiple messages have this Message-ID (diff)
From: Christoffer Dall <christoffer.dall@linaro.org>
To: Marc Zyngier <marc.zyngier@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
kvmarm@lists.cs.columbia.edu
Subject: Re: [PATCH v2 10/21] arm64: KVM: VHE: Split save/restore of sysregs shared between EL1 and EL2
Date: Mon, 1 Feb 2016 14:54:38 +0100 [thread overview]
Message-ID: <20160201135438.GL1478@cbox> (raw)
In-Reply-To: <1453737235-16522-11-git-send-email-marc.zyngier@arm.com>
On Mon, Jan 25, 2016 at 03:53:44PM +0000, Marc Zyngier wrote:
> A handful of system registers are still shared between EL1 and EL2,
> even while using VHE. These are tpidr*_el[01], actlr_el1, sp0, elr,
> and spsr.
So by shared registers you mean registers that do both have an EL0/1
version as well as an EL2 version, but where accesses aren't rewritten
transparently?
also, by sp0 do you mean sp_el0, and by elr you mean elr_el1, and by
spsr you mean spsr_el1 ?
>
> In order to facilitate the introduction of a VHE-specific sysreg
> save/restore, make move the access to these registers to their
> own save/restore functions.
>
> No functionnal change.
Otherwise:
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm64/kvm/hyp/sysreg-sr.c | 48 +++++++++++++++++++++++++++++-------------
> 1 file changed, 33 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c
> index bd5b543..61bad17 100644
> --- a/arch/arm64/kvm/hyp/sysreg-sr.c
> +++ b/arch/arm64/kvm/hyp/sysreg-sr.c
> @@ -23,13 +23,29 @@
>
> #include "hyp.h"
>
> -/* ctxt is already in the HYP VA space */
> +/*
> + * Non-VHE: Both host and guest must save everything.
> + *
> + * VHE: Host must save tpidr*_el[01], actlr_el1, sp0, pc, pstate, and
> + * guest must save everything.
> + */
> +
> +static void __hyp_text __sysreg_save_common_state(struct kvm_cpu_context *ctxt)
> +{
> + ctxt->sys_regs[ACTLR_EL1] = read_sysreg(actlr_el1);
> + ctxt->sys_regs[TPIDR_EL0] = read_sysreg(tpidr_el0);
> + ctxt->sys_regs[TPIDRRO_EL0] = read_sysreg(tpidrro_el0);
> + ctxt->sys_regs[TPIDR_EL1] = read_sysreg(tpidr_el1);
> + ctxt->gp_regs.regs.sp = read_sysreg(sp_el0);
> + ctxt->gp_regs.regs.pc = read_sysreg(elr_el2);
> + ctxt->gp_regs.regs.pstate = read_sysreg(spsr_el2);
> +}
> +
> static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> {
> ctxt->sys_regs[MPIDR_EL1] = read_sysreg(vmpidr_el2);
> ctxt->sys_regs[CSSELR_EL1] = read_sysreg(csselr_el1);
> ctxt->sys_regs[SCTLR_EL1] = read_sysreg(sctlr_el1);
> - ctxt->sys_regs[ACTLR_EL1] = read_sysreg(actlr_el1);
> ctxt->sys_regs[CPACR_EL1] = read_sysreg(cpacr_el1);
> ctxt->sys_regs[TTBR0_EL1] = read_sysreg(ttbr0_el1);
> ctxt->sys_regs[TTBR1_EL1] = read_sysreg(ttbr1_el1);
> @@ -41,17 +57,11 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> ctxt->sys_regs[MAIR_EL1] = read_sysreg(mair_el1);
> ctxt->sys_regs[VBAR_EL1] = read_sysreg(vbar_el1);
> ctxt->sys_regs[CONTEXTIDR_EL1] = read_sysreg(contextidr_el1);
> - ctxt->sys_regs[TPIDR_EL0] = read_sysreg(tpidr_el0);
> - ctxt->sys_regs[TPIDRRO_EL0] = read_sysreg(tpidrro_el0);
> - ctxt->sys_regs[TPIDR_EL1] = read_sysreg(tpidr_el1);
> ctxt->sys_regs[AMAIR_EL1] = read_sysreg(amair_el1);
> ctxt->sys_regs[CNTKCTL_EL1] = read_sysreg(cntkctl_el1);
> ctxt->sys_regs[PAR_EL1] = read_sysreg(par_el1);
> ctxt->sys_regs[MDSCR_EL1] = read_sysreg(mdscr_el1);
>
> - ctxt->gp_regs.regs.sp = read_sysreg(sp_el0);
> - ctxt->gp_regs.regs.pc = read_sysreg(elr_el2);
> - ctxt->gp_regs.regs.pstate = read_sysreg(spsr_el2);
> ctxt->gp_regs.sp_el1 = read_sysreg(sp_el1);
> ctxt->gp_regs.elr_el1 = read_sysreg(elr_el1);
> ctxt->gp_regs.spsr[KVM_SPSR_EL1]= read_sysreg(spsr_el1);
> @@ -60,11 +70,24 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
> void __hyp_text __sysreg_save_host_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_save_state(ctxt);
> + __sysreg_save_common_state(ctxt);
> }
>
> void __hyp_text __sysreg_save_guest_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_save_state(ctxt);
> + __sysreg_save_common_state(ctxt);
> +}
> +
> +static void __hyp_text __sysreg_restore_common_state(struct kvm_cpu_context *ctxt)
> +{
> + write_sysreg(ctxt->sys_regs[ACTLR_EL1], actlr_el1);
> + write_sysreg(ctxt->sys_regs[TPIDR_EL0], tpidr_el0);
> + write_sysreg(ctxt->sys_regs[TPIDRRO_EL0], tpidrro_el0);
> + write_sysreg(ctxt->sys_regs[TPIDR_EL1], tpidr_el1);
> + write_sysreg(ctxt->gp_regs.regs.sp, sp_el0);
> + write_sysreg(ctxt->gp_regs.regs.pc, elr_el2);
> + write_sysreg(ctxt->gp_regs.regs.pstate, spsr_el2);
> }
>
> static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> @@ -72,7 +95,6 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> write_sysreg(ctxt->sys_regs[MPIDR_EL1], vmpidr_el2);
> write_sysreg(ctxt->sys_regs[CSSELR_EL1], csselr_el1);
> write_sysreg(ctxt->sys_regs[SCTLR_EL1], sctlr_el1);
> - write_sysreg(ctxt->sys_regs[ACTLR_EL1], actlr_el1);
> write_sysreg(ctxt->sys_regs[CPACR_EL1], cpacr_el1);
> write_sysreg(ctxt->sys_regs[TTBR0_EL1], ttbr0_el1);
> write_sysreg(ctxt->sys_regs[TTBR1_EL1], ttbr1_el1);
> @@ -84,17 +106,11 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> write_sysreg(ctxt->sys_regs[MAIR_EL1], mair_el1);
> write_sysreg(ctxt->sys_regs[VBAR_EL1], vbar_el1);
> write_sysreg(ctxt->sys_regs[CONTEXTIDR_EL1], contextidr_el1);
> - write_sysreg(ctxt->sys_regs[TPIDR_EL0], tpidr_el0);
> - write_sysreg(ctxt->sys_regs[TPIDRRO_EL0], tpidrro_el0);
> - write_sysreg(ctxt->sys_regs[TPIDR_EL1], tpidr_el1);
> write_sysreg(ctxt->sys_regs[AMAIR_EL1], amair_el1);
> write_sysreg(ctxt->sys_regs[CNTKCTL_EL1], cntkctl_el1);
> write_sysreg(ctxt->sys_regs[PAR_EL1], par_el1);
> write_sysreg(ctxt->sys_regs[MDSCR_EL1], mdscr_el1);
>
> - write_sysreg(ctxt->gp_regs.regs.sp, sp_el0);
> - write_sysreg(ctxt->gp_regs.regs.pc, elr_el2);
> - write_sysreg(ctxt->gp_regs.regs.pstate, spsr_el2);
> write_sysreg(ctxt->gp_regs.sp_el1, sp_el1);
> write_sysreg(ctxt->gp_regs.elr_el1, elr_el1);
> write_sysreg(ctxt->gp_regs.spsr[KVM_SPSR_EL1], spsr_el1);
> @@ -103,11 +119,13 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
> void __hyp_text __sysreg_restore_host_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_restore_state(ctxt);
> + __sysreg_restore_common_state(ctxt);
> }
>
> void __hyp_text __sysreg_restore_guest_state(struct kvm_cpu_context *ctxt)
> {
> __sysreg_restore_state(ctxt);
> + __sysreg_restore_common_state(ctxt);
> }
>
> void __hyp_text __sysreg32_save_state(struct kvm_vcpu *vcpu)
> --
> 2.1.4
>
next prev parent reply other threads:[~2016-02-01 13:48 UTC|newest]
Thread overview: 231+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 15:53 [PATCH v2 00/21] arm64: Virtualization Host Extension support Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` [PATCH v2 01/21] arm/arm64: Add new is_kernel_in_hyp_mode predicate Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:59 ` Christoffer Dall
2016-02-01 13:59 ` Christoffer Dall
2016-02-01 13:59 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 02/21] arm64: Allow the arch timer to use the HYP timer Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 12:29 ` Christoffer Dall
2016-02-01 12:29 ` Christoffer Dall
2016-02-01 12:29 ` Christoffer Dall
2016-02-01 13:42 ` Marc Zyngier
2016-02-01 13:42 ` Marc Zyngier
2016-02-01 13:42 ` Marc Zyngier
2016-02-01 15:37 ` Christoffer Dall
2016-02-01 15:37 ` Christoffer Dall
2016-02-01 15:37 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 03/21] arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:59 ` Christoffer Dall
2016-02-01 13:59 ` Christoffer Dall
2016-02-01 13:59 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 04/21] arm64: KVM: Skip HYP setup when already running in HYP Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:59 ` Christoffer Dall
2016-02-01 13:59 ` Christoffer Dall
2016-02-01 13:59 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 05/21] arm64: KVM: VHE: Turn VTCR_EL2 setup into a reusable macro Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:13 ` Christoffer Dall
2016-02-01 13:13 ` Christoffer Dall
2016-02-01 13:13 ` Christoffer Dall
2016-02-01 14:21 ` Marc Zyngier
2016-02-01 14:21 ` Marc Zyngier
2016-02-01 14:21 ` Marc Zyngier
2016-02-01 15:38 ` Christoffer Dall
2016-02-01 15:38 ` Christoffer Dall
2016-02-01 15:38 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 06/21] arm64: KVM: VHE: Patch out use of HVC Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:16 ` Christoffer Dall
2016-02-01 13:16 ` Christoffer Dall
2016-02-01 13:34 ` Marc Zyngier
2016-02-01 13:34 ` Marc Zyngier
2016-02-01 15:36 ` Catalin Marinas
2016-02-01 15:36 ` Catalin Marinas
2016-02-01 15:36 ` Catalin Marinas
2016-02-01 16:20 ` Marc Zyngier
2016-02-01 16:20 ` Marc Zyngier
2016-02-01 16:20 ` Marc Zyngier
2016-02-01 17:08 ` Ard Biesheuvel
2016-02-01 17:08 ` Ard Biesheuvel
2016-02-01 17:08 ` Ard Biesheuvel
2016-02-01 17:28 ` Marc Zyngier
2016-02-01 17:28 ` Marc Zyngier
2016-02-01 17:28 ` Marc Zyngier
2016-02-02 15:42 ` Christoffer Dall
2016-02-02 15:42 ` Christoffer Dall
2016-02-01 15:39 ` Christoffer Dall
2016-02-01 15:39 ` Christoffer Dall
2016-02-01 15:39 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 07/21] arm64: KVM: VHE: Patch out kern_hyp_va Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:20 ` Christoffer Dall
2016-02-01 13:20 ` Christoffer Dall
2016-02-01 13:20 ` Christoffer Dall
2016-02-01 13:38 ` Marc Zyngier
2016-02-01 13:38 ` Marc Zyngier
2016-02-01 13:38 ` Marc Zyngier
2016-02-01 15:40 ` Christoffer Dall
2016-02-01 15:40 ` Christoffer Dall
2016-02-01 15:40 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 08/21] arm64: KVM: VHE: Introduce unified system register accessors Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:47 ` Christoffer Dall
2016-02-01 13:47 ` Christoffer Dall
2016-02-01 13:47 ` Christoffer Dall
2016-02-01 14:04 ` Marc Zyngier
2016-02-01 14:04 ` Marc Zyngier
2016-02-01 14:04 ` Marc Zyngier
2016-02-01 15:43 ` Christoffer Dall
2016-02-01 15:43 ` Christoffer Dall
2016-02-01 15:43 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 09/21] arm64: KVM: VHE: Differenciate host/guest sysreg save/restore Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:59 ` Christoffer Dall
2016-02-01 13:59 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 10/21] arm64: KVM: VHE: Split save/restore of sysregs shared between EL1 and EL2 Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:54 ` Christoffer Dall [this message]
2016-02-01 13:54 ` Christoffer Dall
2016-02-01 13:54 ` Christoffer Dall
2016-02-02 9:46 ` Marc Zyngier
2016-02-02 9:46 ` Marc Zyngier
2016-02-02 9:46 ` Marc Zyngier
2016-02-02 15:46 ` Christoffer Dall
2016-02-02 15:46 ` Christoffer Dall
2016-02-02 16:19 ` Marc Zyngier
2016-02-02 16:19 ` Marc Zyngier
2016-02-02 16:19 ` Marc Zyngier
2016-02-02 20:07 ` Christoffer Dall
2016-02-02 20:07 ` Christoffer Dall
2016-02-02 20:07 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 11/21] arm64: KVM: VHE: Use unified system register accessors Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 13:59 ` Christoffer Dall
2016-02-01 13:59 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 12/21] arm64: KVM: VHE: Enable minimal sysreg save/restore Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 14:02 ` Christoffer Dall
2016-02-01 14:02 ` Christoffer Dall
2016-02-01 14:02 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 13/21] arm64: KVM: VHE: Make __fpsimd_enabled VHE aware Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 14:17 ` Christoffer Dall
2016-02-01 14:17 ` Christoffer Dall
2016-02-01 14:17 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 14/21] arm64: KVM: VHE: Implement VHE activate/deactivate_traps Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 14:20 ` Christoffer Dall
2016-02-01 14:20 ` Christoffer Dall
2016-02-01 14:20 ` Christoffer Dall
2016-02-02 11:27 ` Marc Zyngier
2016-02-02 11:27 ` Marc Zyngier
2016-01-25 15:53 ` [PATCH v2 15/21] arm64: KVM: VHE: Use unified sysreg accessors for timer Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 14:23 ` Christoffer Dall
2016-02-01 14:23 ` Christoffer Dall
2016-02-01 14:23 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 16/21] arm64: KVM: VHE: Add fpsimd enabling on guest access Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 14:24 ` Christoffer Dall
2016-02-01 14:24 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 17/21] arm64: KVM: VHE: Add alternative panic handling Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 14:26 ` Christoffer Dall
2016-02-01 14:26 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 18/21] arm64: KVM: Introduce hyp_alternate_value helper Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 14:41 ` Christoffer Dall
2016-02-01 14:41 ` Christoffer Dall
2016-02-02 13:42 ` Marc Zyngier
2016-02-02 13:42 ` Marc Zyngier
2016-02-02 15:47 ` Christoffer Dall
2016-02-02 15:47 ` Christoffer Dall
2016-02-02 15:47 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 19/21] arm64: KVM: Move most of the fault decoding to C Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-02-01 15:21 ` Christoffer Dall
2016-02-01 15:21 ` Christoffer Dall
2016-02-01 15:21 ` Christoffer Dall
2016-02-02 14:24 ` Marc Zyngier
2016-02-02 14:24 ` Marc Zyngier
2016-02-02 14:24 ` Marc Zyngier
2016-02-02 15:50 ` Christoffer Dall
2016-02-02 15:50 ` Christoffer Dall
2016-02-02 15:50 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 20/21] arm64: VHE: Add support for running Linux in EL2 mode Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-26 14:04 ` Suzuki K. Poulose
2016-01-26 14:04 ` Suzuki K. Poulose
2016-01-26 14:30 ` Suzuki K. Poulose
2016-01-26 14:30 ` Suzuki K. Poulose
2016-02-01 15:26 ` Christoffer Dall
2016-02-01 15:26 ` Christoffer Dall
2016-01-25 15:53 ` [PATCH v2 21/21] arm64: Panic when VHE and non VHE CPUs coexist Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-25 15:53 ` Marc Zyngier
2016-01-26 14:25 ` Suzuki K. Poulose
2016-01-26 14:25 ` Suzuki K. Poulose
2016-01-26 14:25 ` Suzuki K. Poulose
2016-01-26 14:34 ` Marc Zyngier
2016-01-26 14:34 ` Marc Zyngier
2016-01-26 14:34 ` Marc Zyngier
2016-02-01 15:36 ` Christoffer Dall
2016-02-01 15:36 ` Christoffer Dall
2016-02-01 15:36 ` Christoffer Dall
2016-02-02 15:32 ` Marc Zyngier
2016-02-02 15:32 ` Marc Zyngier
2016-02-03 8:49 ` Christoffer Dall
2016-02-03 8:49 ` Christoffer Dall
2016-02-03 8:49 ` Christoffer Dall
2016-02-03 17:45 ` Marc Zyngier
2016-02-03 17:45 ` Marc Zyngier
2016-02-03 17:45 ` Marc Zyngier
2016-02-03 19:12 ` Christoffer Dall
2016-02-03 19:12 ` Christoffer Dall
2016-02-03 19:12 ` Christoffer Dall
2016-01-25 16:15 ` [PATCH v2 00/21] arm64: Virtualization Host Extension support Arnd Bergmann
2016-01-25 16:15 ` Arnd Bergmann
2016-01-25 16:15 ` Arnd Bergmann
2016-01-25 16:23 ` Marc Zyngier
2016-01-25 16:23 ` Marc Zyngier
2016-01-25 16:26 ` Arnd Bergmann
2016-01-25 16:26 ` Arnd Bergmann
2016-01-25 16:26 ` Arnd Bergmann
2016-01-25 16:26 ` Will Deacon
2016-01-25 16:26 ` Will Deacon
2016-01-25 16:26 ` Will Deacon
2016-01-25 16:37 ` Marc Zyngier
2016-01-25 16:37 ` Marc Zyngier
2016-01-25 16:37 ` Marc Zyngier
2016-01-25 16:44 ` Will Deacon
2016-01-25 16:44 ` Will Deacon
2016-01-25 19:16 ` Marc Zyngier
2016-01-25 19:16 ` Marc Zyngier
2016-01-25 19:16 ` Marc Zyngier
2016-02-01 16:25 ` Christoffer Dall
2016-02-01 16:25 ` Christoffer Dall
2016-02-01 16:25 ` Christoffer Dall
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=20160201135438.GL1478@cbox \
--to=christoffer.dall@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=will.deacon@arm.com \
/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 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.