linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 09/21] arm64: KVM: Implement guest entry
Date: Fri, 27 Nov 2015 18:50:03 +0000	[thread overview]
Message-ID: <1448650215-15218-10-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1448650215-15218-1-git-send-email-marc.zyngier@arm.com>

Contrary to the previous patch, the guest entry is fairly different
from its assembly counterpart, mostly because it is only concerned
with saving/restoring the GP registers, and nothing else.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/kvm/hyp/Makefile |   1 +
 arch/arm64/kvm/hyp/entry.S  | 155 ++++++++++++++++++++++++++++++++++++++++++++
 arch/arm64/kvm/hyp/hyp.h    |   2 +
 3 files changed, 158 insertions(+)
 create mode 100644 arch/arm64/kvm/hyp/entry.S

diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index ec14cac..1e1ff06 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_KVM_ARM_HOST) += vgic-v3-sr.o
 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
diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S
new file mode 100644
index 0000000..2c4449a
--- /dev/null
+++ b/arch/arm64/kvm/hyp/entry.S
@@ -0,0 +1,155 @@
+/*
+ * 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 <linux/linkage.h>
+
+#include <asm/asm-offsets.h>
+#include <asm/assembler.h>
+#include <asm/fpsimdmacros.h>
+#include <asm/kvm.h>
+#include <asm/kvm_arm.h>
+#include <asm/kvm_asm.h>
+#include <asm/kvm_mmu.h>
+
+#define CPU_GP_REG_OFFSET(x)	(CPU_GP_REGS + x)
+#define CPU_XREG_OFFSET(x)	CPU_GP_REG_OFFSET(CPU_USER_PT_REGS + 8*x)
+
+	.text
+	.pushsection	.hyp.text, "ax"
+
+.macro save_common_regs ctxt
+	stp	x19, x20, [\ctxt, #CPU_XREG_OFFSET(19)]
+	stp	x21, x22, [\ctxt, #CPU_XREG_OFFSET(21)]
+	stp	x23, x24, [\ctxt, #CPU_XREG_OFFSET(23)]
+	stp	x25, x26, [\ctxt, #CPU_XREG_OFFSET(25)]
+	stp	x27, x28, [\ctxt, #CPU_XREG_OFFSET(27)]
+	stp	x29, lr,  [\ctxt, #CPU_XREG_OFFSET(29)]
+.endm
+
+.macro restore_common_regs ctxt
+	ldp	x19, x20, [\ctxt, #CPU_XREG_OFFSET(19)]
+	ldp	x21, x22, [\ctxt, #CPU_XREG_OFFSET(21)]
+	ldp	x23, x24, [\ctxt, #CPU_XREG_OFFSET(23)]
+	ldp	x25, x26, [\ctxt, #CPU_XREG_OFFSET(25)]
+	ldp	x27, x28, [\ctxt, #CPU_XREG_OFFSET(27)]
+	ldp	x29, lr,  [\ctxt, #CPU_XREG_OFFSET(29)]
+.endm
+
+.macro save_host_regs reg
+	save_common_regs \reg
+.endm
+
+.macro restore_host_regs reg
+	restore_common_regs \reg
+.endm
+
+.macro save_guest_regs
+	// x0 is the vcpu address
+	// x1 is the return code, do not corrupt!
+	// x2 is the cpu context
+	// x3 is a tmp register
+	// Guest's x0-x3 are on the stack
+
+	add	x2, x0, #VCPU_CONTEXT
+
+	// Compute base to save registers
+	stp	x4, x5,   [x2, #CPU_XREG_OFFSET(4)]
+	stp	x6, x7,   [x2, #CPU_XREG_OFFSET(6)]
+	stp	x8, x9,   [x2, #CPU_XREG_OFFSET(8)]
+	stp	x10, x11, [x2, #CPU_XREG_OFFSET(10)]
+	stp	x12, x13, [x2, #CPU_XREG_OFFSET(12)]
+	stp	x14, x15, [x2, #CPU_XREG_OFFSET(14)]
+	stp	x16, x17, [x2, #CPU_XREG_OFFSET(16)]
+	str	x18,      [x2, #CPU_XREG_OFFSET(18)]
+
+	pop	x6, x7			// x2, x3
+	pop	x4, x5			// x0, x1
+
+	stp	x4, x5, [x2, #CPU_XREG_OFFSET(0)]
+	stp	x6, x7, [x2, #CPU_XREG_OFFSET(2)]
+
+	save_common_regs x2
+.endm
+
+.macro restore_guest_regs
+	// Assume vcpu in x0, clobbers everything else
+
+	add	x2, x0, #VCPU_CONTEXT
+
+	// Prepare x0-x3 for later restore
+	ldp	x4, x5, [x2, #CPU_XREG_OFFSET(0)]
+	ldp	x6, x7, [x2, #CPU_XREG_OFFSET(2)]
+	push	x4, x5		// Push x0-x3 on the stack
+	push	x6, x7
+
+	// x4-x18
+	ldp	x4, x5,   [x2, #CPU_XREG_OFFSET(4)] 
+	ldp	x6, x7,   [x2, #CPU_XREG_OFFSET(6)] 
+	ldp	x8, x9,   [x2, #CPU_XREG_OFFSET(8)] 
+	ldp	x10, x11, [x2, #CPU_XREG_OFFSET(10)]
+	ldp	x12, x13, [x2, #CPU_XREG_OFFSET(12)]
+	ldp	x14, x15, [x2, #CPU_XREG_OFFSET(14)]
+	ldp	x16, x17, [x2, #CPU_XREG_OFFSET(16)]
+	ldr	x18,      [x2, #CPU_XREG_OFFSET(18)]
+
+	// x19-x29, lr
+	restore_common_regs x2
+
+	// Last bits of the 64bit state
+	pop	x2, x3
+	pop	x0, x1
+
+	// Do not touch any register after this!
+.endm
+
+/*
+ * u64 __guest_enter(struct kvm_vcpu *vcpu,
+ *		     struct kvm_cpu_context *host_ctxt);
+ */
+ENTRY(__guest_enter)
+	// x0: vcpu
+	// x1: host_ctxt
+	// x2, x3: parameter registers
+	// x4-x18: clobbered by macros
+
+	save_host_regs x1
+
+	// Preserve vcpu & host_ctxt for use at exit time
+	stp	x0, x1, [sp, #-16]!
+
+	restore_guest_regs
+	eret
+ENDPROC(__guest_enter)
+
+ENTRY(__guest_exit)
+	// x0: vcpu
+	// x1: return code
+	// x2-x3: free
+	// x4-x29,lr: vcpu regs
+	// vcpu x0-x3 on the stack
+	save_guest_regs
+
+	// Restore vcpu & host_ctxt from the stack
+	// (preserving return code in x1)
+	ldp	x0, x2, [sp], #16
+	restore_host_regs x2
+
+	mov	x0, x1
+	ret
+ENDPROC(__guest_exit)
+
+	/* Insert fault handling here */
diff --git a/arch/arm64/kvm/hyp/hyp.h b/arch/arm64/kvm/hyp/hyp.h
index 2581232..7ac8e11 100644
--- a/arch/arm64/kvm/hyp/hyp.h
+++ b/arch/arm64/kvm/hyp/hyp.h
@@ -50,5 +50,7 @@ void __debug_restore_state(struct kvm_vcpu *vcpu,
 void __debug_cond_save_host_state(struct kvm_vcpu *vcpu);
 void __debug_cond_restore_host_state(struct kvm_vcpu *vcpu);
 
+u64 __guest_enter(struct kvm_vcpu *vcpu, struct kvm_cpu_context *host_ctxt);
+
 #endif /* __ARM64_KVM_HYP_H__ */
 
-- 
2.1.4

  parent reply	other threads:[~2015-11-27 18:50 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-27 18:49 [PATCH v2 00/21] arm64: KVM: world switch in C Marc Zyngier
2015-11-27 18:49 ` [PATCH v2 01/21] arm64: Add macros to read/write system registers Marc Zyngier
2015-11-30 20:00   ` Christoffer Dall
2015-11-27 18:49 ` [PATCH v2 02/21] arm64: KVM: Add a HYP-specific header file Marc Zyngier
2015-11-30 20:00   ` Christoffer Dall
2015-12-01 11:41     ` Marc Zyngier
2015-12-01 11:47       ` Christoffer Dall
2015-11-27 18:49 ` [PATCH v2 03/21] arm64: KVM: Implement vgic-v2 save/restore Marc Zyngier
2015-11-30 20:00   ` Christoffer Dall
2015-12-01 11:39     ` Marc Zyngier
2015-11-27 18:49 ` [PATCH v2 04/21] arm64: KVM: Implement vgic-v3 save/restore Marc Zyngier
2015-11-30  9:59   ` Alex Bennée
2015-11-30 10:43     ` Marc Zyngier
2015-11-30 19:50   ` Christoffer Dall
2015-12-01 11:32     ` Marc Zyngier
2015-12-01 11:44       ` Christoffer Dall
2015-12-01 11:50         ` Christoffer Dall
2015-12-01 11:57           ` Marc Zyngier
2015-12-01 12:24             ` Christoffer Dall
2015-12-01 12:49               ` Marc Zyngier
2015-12-01 11:54         ` Marc Zyngier
2015-11-27 18:49 ` [PATCH v2 05/21] arm64: KVM: Implement timer save/restore Marc Zyngier
2015-11-30 19:59   ` Christoffer Dall
2015-12-01 11:34     ` Marc Zyngier
2015-11-27 18:50 ` [PATCH v2 06/21] arm64: KVM: Implement system register save/restore Marc Zyngier
2015-12-01 15:53   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 07/21] arm64: KVM: Implement 32bit " Marc Zyngier
2015-12-01 15:52   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 08/21] arm64: KVM: Implement debug save/restore Marc Zyngier
2015-11-30 12:00   ` Alex Bennée
2015-11-30 12:24     ` Marc Zyngier
2015-12-01 12:56   ` Christoffer Dall
2015-12-01 13:06     ` Marc Zyngier
2015-12-01 13:19       ` Alex Bennée
2015-12-01 13:34         ` Marc Zyngier
2015-12-01 14:47       ` Christoffer Dall
2015-12-01 14:56         ` Christoffer Dall
2015-12-01 15:01         ` Marc Zyngier
2015-12-01 15:41           ` Christoffer Dall
2015-12-01 18:34             ` Marc Zyngier
2015-11-27 18:50 ` Marc Zyngier [this message]
2015-12-01 15:29   ` [PATCH v2 09/21] arm64: KVM: Implement guest entry Christoffer Dall
2015-12-01 18:41     ` Marc Zyngier
2015-11-27 18:50 ` [PATCH v2 10/21] arm64: KVM: Add patchable function selector Marc Zyngier
2015-12-01 15:39   ` Christoffer Dall
2015-12-01 18:51     ` Marc Zyngier
2015-12-02  9:27       ` Christoffer Dall
2015-12-02  9:47         ` Marc Zyngier
2015-12-02 11:53           ` Christoffer Dall
2015-12-02 13:19             ` Marc Zyngier
2015-12-02 16:19               ` Christoffer Dall
2015-12-02 22:34   ` Andrew Jones
2015-12-03  8:18     ` Marc Zyngier
2015-11-27 18:50 ` [PATCH v2 11/21] arm64: KVM: Implement the core world switch Marc Zyngier
2015-12-01 15:55   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 12/21] arm64: KVM: Implement fpsimd save/restore Marc Zyngier
2015-12-02 11:53   ` Christoffer Dall
2015-12-02 15:29     ` Marc Zyngier
2015-12-02 16:19       ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 13/21] arm64: KVM: Implement TLB handling Marc Zyngier
2015-12-02 11:53   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 14/21] arm64: KVM: HYP mode entry points Marc Zyngier
2015-12-02 11:53   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 15/21] arm64: KVM: Add panic handling Marc Zyngier
2015-12-02 11:53   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 16/21] arm64: KVM: Add compatibility aliases Marc Zyngier
2015-12-02 11:49   ` Christoffer Dall
2015-12-02 15:23     ` Marc Zyngier
2015-11-27 18:50 ` [PATCH v2 17/21] arm64: KVM: Map the kernel RO section into HYP Marc Zyngier
2015-12-02 11:49   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 18/21] arm64: KVM: Move away from the assembly version of the world switch Marc Zyngier
2015-12-02 11:49   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 19/21] arm64: KVM: Turn system register numbers to an enum Marc Zyngier
2015-12-02 11:51   ` Christoffer Dall
2015-12-02 15:26     ` Marc Zyngier
2015-11-27 18:50 ` [PATCH v2 20/21] arm64: KVM: Cleanup asm-offset.c Marc Zyngier
2015-12-02 11:51   ` Christoffer Dall
2015-11-27 18:50 ` [PATCH v2 21/21] arm64: KVM: Remove weak attributes Marc Zyngier
2015-12-02 11:47   ` Christoffer Dall
2015-12-02 15:21     ` Marc Zyngier
2015-12-02 16:21       ` Christoffer Dall
2015-12-02 17:52         ` Marc Zyngier
2015-11-30 20:33 ` [PATCH v2 00/21] arm64: KVM: world switch in C Christoffer Dall
2015-12-01  3:19   ` Mario Smarduch
2015-12-01  9:58   ` Marc Zyngier
2015-12-01 12:00     ` Christoffer Dall
2015-12-01 17:51       ` Marc Zyngier
2015-12-01 19:34         ` 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=1448650215-15218-10-git-send-email-marc.zyngier@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).