[RFC,v2,22/26] KVM: arm64: Refactor __load_guest_stage2()

Message ID	20210108121524.656872-23-qperret@google.com
State	Accepted
Commit	6ec7e56d3265f6e7673d0788bfa3a76820c9bdfe
Headers	show Return-Path: <devicetree-owner@kernel.org> Sender: "qperret via sendgmr" <qperret@r2d2-qp.c.googlers.com> Date: Fri, 8 Jan 2021 12:15:20 +0000 In-Reply-To: <20210108121524.656872-1-qperret@google.com> Message-Id: <20210108121524.656872-23-qperret@google.com> Mime-Version: 1.0 References: <20210108121524.656872-1-qperret@google.com> Subject: [RFC PATCH v2 22/26] KVM: arm64: Refactor __load_guest_stage2() From: Quentin Perret <qperret@google.com> To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>, Julien Thierry <julien.thierry.kdev@gmail.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com> Cc: devicetree@vger.kernel.org, android-kvm@google.com, linux-kernel@vger.kernel.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Fuad Tabba <tabba@google.com>, Mark Rutland <mark.rutland@arm.com>, David Brazdil <dbrazdil@google.com> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	KVM/arm64: A stage 2 for the host \| expand [RFC,v2,00/26] KVM/arm64: A stage 2 for the host [RFC,v2,01/26] arm64: lib: Annotate {clear,copy}_page() as position-independent [RFC,v2,02/26] KVM: arm64: Link position-independent string routines into .hyp.text [RFC,v2,03/26] arm64: kvm: Add standalone ticket spinlock implementation for use at hyp [RFC,v2,04/26] KVM: arm64: Initialize kvm_nvhe_init_params early [RFC,v2,05/26] KVM: arm64: Avoid free_page() in page-table allocator [RFC,v2,06/26] KVM: arm64: Factor memory allocation out of pgtable.c [RFC,v2,07/26] KVM: arm64: Introduce a BSS section for use at Hyp [RFC,v2,08/26] KVM: arm64: Make kvm_call_hyp() a function call at Hyp [RFC,v2,09/26] KVM: arm64: Allow using kvm_nvhe_sym() in hyp code [RFC,v2,10/26] KVM: arm64: Introduce an early Hyp page allocator [RFC,v2,11/26] KVM: arm64: Stub CONFIG_DEBUG_LIST at Hyp [RFC,v2,12/26] KVM: arm64: Introduce a Hyp buddy page allocator [RFC,v2,13/26] KVM: arm64: Enable access to sanitized CPU features at EL2 [RFC,v2,14/26] KVM: arm64: Factor out vector address calculation [RFC,v2,15/26] of/fdt: Introduce early_init_dt_add_memory_hyp() [RFC,v2,16/26] KVM: arm64: Prepare Hyp memory protection [RFC,v2,17/26] KVM: arm64: Elevate Hyp mappings creation at EL2 [RFC,v2,18/26] KVM: arm64: Use kvm_arch for stage 2 pgtable [RFC,v2,19/26] KVM: arm64: Use kvm_arch in kvm_s2_mmu [RFC,v2,20/26] KVM: arm64: Set host stage 2 using kvm_nvhe_init_params [RFC,v2,21/26] KVM: arm64: Refactor kvm_arm_setup_stage2() [RFC,v2,22/26] KVM: arm64: Refactor __load_guest_stage2() [RFC,v2,23/26] KVM: arm64: Refactor __populate_fault_info() [RFC,v2,24/26] KVM: arm64: Make memcache anonymous in pgtable allocator [RFC,v2,25/26] KVM: arm64: Reserve memory for host stage 2 [RFC,v2,26/26] KVM: arm64: Wrap the host with a stage 2

Message ID

20210108121524.656872-23-qperret@google.com

State

Accepted

Commit

6ec7e56d3265f6e7673d0788bfa3a76820c9bdfe

Headers

Sender: "qperret via sendgmr" <qperret@r2d2-qp.c.googlers.com>
Date: Fri,  8 Jan 2021 12:15:20 +0000
In-Reply-To: <20210108121524.656872-1-qperret@google.com>
Message-Id: <20210108121524.656872-23-qperret@google.com>
Mime-Version: 1.0
References: <20210108121524.656872-1-qperret@google.com>
Subject: [RFC PATCH v2 22/26] KVM: arm64: Refactor __load_guest_stage2()
From: Quentin Perret <qperret@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>,
	James Morse <james.morse@arm.com>,
	Julien Thierry <julien.thierry.kdev@gmail.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com>
Cc: devicetree@vger.kernel.org, android-kvm@google.com,
	linux-kernel@vger.kernel.org, kernel-team@android.com,
	kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org,
	Fuad Tabba <tabba@google.com>, Mark Rutland <mark.rutland@arm.com>,
	David Brazdil <dbrazdil@google.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Series

KVM/arm64: A stage 2 for the host | expand

Commit Message

Quentin Perret Jan. 8, 2021, 12:15 p.m. UTC

Refactor __load_guest_stage2() to introduce __load_stage2() which will
be re-used when loading the host stage 2.

Signed-off-by: Quentin Perret <qperret@google.com>
---
 arch/arm64/include/asm/kvm_mmu.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Will Deacon Feb. 3, 2021, 3:54 p.m. UTC | #1

On Fri, Jan 08, 2021 at 12:15:20PM +0000, Quentin Perret wrote:
> Refactor __load_guest_stage2() to introduce __load_stage2() which will

> be re-used when loading the host stage 2.

> 

> Signed-off-by: Quentin Perret <qperret@google.com>

> ---

>  arch/arm64/include/asm/kvm_mmu.h | 9 +++++++--

>  1 file changed, 7 insertions(+), 2 deletions(-)


Acked-by: Will Deacon <will@kernel.org>


Will

diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
index 83b4c5cf4768..8d37d6d1ed29 100644
--- a/arch/arm64/include/asm/kvm_mmu.h
+++ b/arch/arm64/include/asm/kvm_mmu.h
@@ -345,9 +345,9 @@  static __always_inline u64 kvm_get_vttbr(struct kvm_s2_mmu *mmu)
  * Must be called from hyp code running at EL2 with an updated VTTBR
  * and interrupts disabled.
  */
-static __always_inline void __load_guest_stage2(struct kvm_s2_mmu *mmu)
+static __always_inline void __load_stage2(struct kvm_s2_mmu *mmu, unsigned long vtcr)
 {
-	write_sysreg(kern_hyp_va(mmu->arch)->vtcr, vtcr_el2);
+	write_sysreg(vtcr, vtcr_el2);
 	write_sysreg(kvm_get_vttbr(mmu), vttbr_el2);
 
 	/*
@@ -358,6 +358,11 @@  static __always_inline void __load_guest_stage2(struct kvm_s2_mmu *mmu)
 	asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_SPECULATIVE_AT));
 }
 
+static __always_inline void __load_guest_stage2(struct kvm_s2_mmu *mmu)
+{
+	__load_stage2(mmu, kern_hyp_va(mmu->arch)->vtcr);
+}
+
 static inline struct kvm *kvm_s2_mmu_to_kvm(struct kvm_s2_mmu *mmu)
 {
 	return container_of(mmu->arch, struct kvm, arch);

[RFC,v2,22/26] KVM: arm64: Refactor __load_guest_stage2()

Commit Message

Comments

Patch