From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 09/15] KVM: arm: redefine kvm_cpu_context_t to save the host cp14 states
Date: Wed, 2 Sep 2015 16:54:22 +0200 [thread overview]
Message-ID: <20150902145422.GM10991@cbox> (raw)
In-Reply-To: <1439213167-8988-10-git-send-email-zhichao.huang@linaro.org>
On Mon, Aug 10, 2015 at 09:26:01PM +0800, Zhichao Huang wrote:
> Redefine kvm_cpu_context_t as a new struct that include the cp14 states,
> which we used to save the host cp14 states.
>
> Signed-off-by: Zhichao Huang <zhichao.huang@linaro.org>
> ---
> arch/arm/include/asm/kvm_host.h | 6 +++++-
> arch/arm/kernel/asm-offsets.c | 4 +++-
> arch/arm/kvm/interrupts.S | 6 ++++--
> 3 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
> index 63ac005..fc461ac 100644
> --- a/arch/arm/include/asm/kvm_host.h
> +++ b/arch/arm/include/asm/kvm_host.h
> @@ -91,7 +91,11 @@ struct kvm_vcpu_fault_info {
> u32 hyp_pc; /* PC when exception was taken from Hyp mode */
> };
>
> -typedef struct vfp_hard_struct kvm_cpu_context_t;
> +struct kvm_cpu_context {
> + struct vfp_hard_struct vfp;
> + u32 cp14[NR_CP14_REGS];
> +};
> +typedef struct kvm_cpu_context kvm_cpu_context_t;
>
> struct kvm_vcpu_arch {
> struct kvm_regs regs;
> diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
> index 9158de0..cee4254 100644
> --- a/arch/arm/kernel/asm-offsets.c
> +++ b/arch/arm/kernel/asm-offsets.c
> @@ -175,7 +175,9 @@ int main(void)
> DEFINE(VCPU_CP14, offsetof(struct kvm_vcpu, arch.cp14));
> DEFINE(VCPU_CP15, offsetof(struct kvm_vcpu, arch.cp15));
> DEFINE(VCPU_VFP_GUEST, offsetof(struct kvm_vcpu, arch.vfp_guest));
> - DEFINE(VCPU_VFP_HOST, offsetof(struct kvm_vcpu, arch.host_cpu_context));
> + DEFINE(VCPU_HOST_CONTEXT, offsetof(struct kvm_vcpu, arch.host_cpu_context));
> + DEFINE(VCPU_VFP_HOST, offsetof(struct kvm_cpu_context, vfp));
> + DEFINE(VCPU_CP14_HOST, offsetof(struct kvm_cpu_context, cp14));
it's a bit weird to call these last two VCPU_ something when they're not
offsets of the vcpu struct...
> DEFINE(VCPU_REGS, offsetof(struct kvm_vcpu, arch.regs));
> DEFINE(VCPU_USR_REGS, offsetof(struct kvm_vcpu, arch.regs.usr_regs));
> DEFINE(VCPU_SVC_REGS, offsetof(struct kvm_vcpu, arch.regs.svc_regs));
> diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
> index 48333ff..d4ff22e 100644
> --- a/arch/arm/kvm/interrupts.S
> +++ b/arch/arm/kvm/interrupts.S
> @@ -176,8 +176,9 @@ __kvm_vcpu_return:
> @ Switch VFP/NEON hardware state to the host's
> add r7, vcpu, #VCPU_VFP_GUEST
> store_vfp_state r7
> - add r7, vcpu, #VCPU_VFP_HOST
> + add r7, vcpu, #VCPU_HOST_CONTEXT
> ldr r7, [r7]
> + add r7, r7, #VCPU_VFP_HOST
> restore_vfp_state r7
>
> after_vfp_restore:
> @@ -484,8 +485,9 @@ switch_to_guest_vfp:
> set_hcptr vmtrap, (HCPTR_TCP(10) | HCPTR_TCP(11))
>
> @ Switch VFP/NEON hardware state to the guest's
> - add r7, r0, #VCPU_VFP_HOST
> + add r7, r0, #VCPU_HOST_CONTEXT
> ldr r7, [r7]
> + add r7, r7, #VCPU_VFP_HOST
> store_vfp_state r7
> add r7, r0, #VCPU_VFP_GUEST
> restore_vfp_state r7
> --
> 1.7.12.4
>
Otherwise this look ok.
-Christoffer
next prev parent reply other threads:[~2015-09-02 14:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-10 13:25 [PATCH v4 00/15] KVM: arm: debug infrastructure support Zhichao Huang
2015-08-10 13:25 ` [PATCH v4 01/15] KVM: arm: plug guest debug exploit Zhichao Huang
2015-09-02 11:38 ` Christoffer Dall
2015-09-29 5:13 ` Zhichao Huang
2015-08-10 13:25 ` [PATCH v4 02/15] KVM: arm: rename pm_fake handler to trap_raz_wi Zhichao Huang
2015-08-10 13:25 ` [PATCH v4 03/15] KVM: arm: enable to use the ARM_DSCR_MDBGEN macro from KVM assembly code Zhichao Huang
2015-08-10 13:25 ` [PATCH v4 04/15] KVM: arm: common infrastructure for handling AArch32 CP14/CP15 Zhichao Huang
2015-09-02 13:09 ` Christoffer Dall
2015-08-10 13:25 ` [PATCH v4 05/15] KVM: arm: check ordering of all system register tables Zhichao Huang
2015-08-10 13:25 ` [PATCH v4 06/15] KVM: arm: add trap handlers for 32-bit debug registers Zhichao Huang
2015-09-02 16:03 ` Christoffer Dall
2015-08-10 13:25 ` [PATCH v4 07/15] KVM: arm: add trap handlers for 64-bit " Zhichao Huang
2015-08-10 13:26 ` [PATCH v4 08/15] KVM: arm: add a trace event for cp14 traps Zhichao Huang
2015-08-10 13:26 ` [PATCH v4 09/15] KVM: arm: redefine kvm_cpu_context_t to save the host cp14 states Zhichao Huang
2015-09-02 14:54 ` Christoffer Dall [this message]
2015-08-10 13:26 ` [PATCH v4 10/15] KVM: arm: implement world switch for debug registers Zhichao Huang
2015-09-02 14:53 ` Christoffer Dall
2015-09-29 5:32 ` Zhichao Huang
2015-09-29 7:34 ` Christoffer Dall
2015-08-10 13:26 ` [PATCH v4 11/15] KVM: arm: add a function to keep track of host use of the " Zhichao Huang
2015-09-02 15:40 ` Christoffer Dall
2015-08-10 13:26 ` [PATCH v4 12/15] KVM: arm: " Zhichao Huang
2015-09-02 15:44 ` Christoffer Dall
2015-08-10 13:26 ` [PATCH v4 13/15] KVM: arm: keep track of guest " Zhichao Huang
2015-09-02 16:01 ` Christoffer Dall
2015-09-29 5:36 ` Zhichao Huang
2015-08-10 13:26 ` [PATCH v4 14/15] KVM: arm: implement lazy world switch for " Zhichao Huang
2015-09-02 16:06 ` Christoffer Dall
2015-08-10 13:26 ` [PATCH v4 15/15] KVM: arm: enable trapping of all " Zhichao Huang
2015-09-02 16:08 ` Christoffer Dall
2015-09-29 5:41 ` Zhichao Huang
2015-09-29 7:38 ` 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=20150902145422.GM10991@cbox \
--to=christoffer.dall@linaro.org \
--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).