diff mbox series

[RFC,v1,08/30] KVM: arm64: add hypervisor state accessors

Message ID	20210924125359.2587041-9-tabba@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=n783=OO=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B61C861265 Date: Fri, 24 Sep 2021 13:53:37 +0100 In-Reply-To: <20210924125359.2587041-1-tabba@google.com> Message-Id: <20210924125359.2587041-9-tabba@google.com> Mime-Version: 1.0 References: <20210924125359.2587041-1-tabba@google.com> Subject: [RFC PATCH v1 08/30] KVM: arm64: add hypervisor state accessors From: Fuad Tabba <tabba@google.com> To: kvmarm@lists.cs.columbia.edu Cc: maz@kernel.org, will@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, mark.rutland@arm.com, christoffer.dall@arm.com, drjones@redhat.com, qperret@google.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, tabba@google.com Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org
Series	Reduce scope of vcpu state at hyp by refactoring out state hyp needs \| expand [RFC,v1,00/30] Reduce scope of vcpu state at hyp by refactoring out state hyp needs [RFC,v1,01/30] KVM: arm64: placeholder to check if VM is protected [RFC,v1,02/30,DONOTMERGE] Temporarily disable unused variable warning [RFC,v1,03/30,DONOTMERGE] Coccinelle scripts for refactoring [RFC,v1,04/30] KVM: arm64: remove unused parameters and asm offsets [RFC,v1,05/30] KVM: arm64: add accessors for kvm_cpu_context [RFC,v1,06/30] KVM: arm64: COCCI: use_ctxt_access.cocci: use kvm_cpu_context accessors [RFC,v1,07/30] KVM: arm64: COCCI: add_ctxt.cocci use_ctxt.cocci: reduce scope of functions to kvm_c… [RFC,v1,08/30] KVM: arm64: add hypervisor state accessors [RFC,v1,09/30] KVM: arm64: COCCI: vcpu_hyp_accessors.cocci: use accessors for hypervisor state vcpu… [RFC,v1,10/30] KVM: arm64: Add accessors for hypervisor state in kvm_vcpu_arch [RFC,v1,11/30] KVM: arm64: create and use a new vcpu_hyp_state struct [RFC,v1,12/30] KVM: arm64: COCCI: add_hypstate.cocci use_hypstate.cocci: Reduce scope of functions … [RFC,v1,13/30] KVM: arm64: change function parameters to use kvm_cpu_ctxt and hyp_state [RFC,v1,14/30] KVM: arm64: reduce scope of vgic v2 [RFC,v1,15/30] KVM: arm64: COCCI: vgic3_cpu.cocci: reduce scope of vgic v3 [RFC,v1,16/30] KVM: arm64: reduce scope of vgic_v3 access parameters [RFC,v1,17/30] KVM: arm64: access __hyp_running_vcpu via accessors only [RFC,v1,18/30] KVM: arm64: reduce scope of __guest_exit to only depend on kvm_cpu_context [RFC,v1,19/30] KVM: arm64: change calls of get_loaded_vcpu to get_loaded_vcpu_ctxt [RFC,v1,20/30] KVM: arm64: add __hyp_running_ctxt and __hyp_running_hyps [RFC,v1,21/30] KVM: arm64: transition code to __hyp_running_ctxt and __hyp_running_hyps [RFC,v1,22/30] KVM: arm64: reduce scope of __guest_enter to depend only on kvm_cpu_ctxt [RFC,v1,23/30] KVM: arm64: COCCI: remove_unused.cocci: remove unused ctxt and hypstate variables [RFC,v1,24/30] KVM: arm64: remove unused functions [RFC,v1,25/30] KVM: arm64: separate kvm_run() for protected VMs [RFC,v1,26/30] KVM: arm64: pVM activate_traps to use vcpu_ctxt and vcpu_hyp_state [RFC,v1,27/30] KVM: arm64: remove unsupported pVM features [RFC,v1,28/30] KVM: arm64: reduce scope of pVM fixup_guest_exit to hyp_state and kvm_cpu_ctxt [RFC,v1,29/30,DONOTMERGE] Remove Coccinelle scripts added for refactoring [RFC,v1,30/30,DONOTMERGE] Re-enable warnings

Commit Message

Fuad Tabba Sept. 24, 2021, 12:53 p.m. UTC

Part of the state in vcpu_arch is hypervisor-specific. To isolate
that state in future patches, start by creating accessors for
this state rather than by dereferencing vcpu.

Signed-off-by: Fuad Tabba <tabba@google.com>
---
 arch/arm64/include/asm/kvm_host.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff mbox series

Patch

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 097e5f533af9..280ee23dfc5a 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -373,6 +373,13 @@  struct kvm_vcpu_arch {
 	} steal;
 };
 
+/* Accessors for vcpu parameters related to the hypervistor state. */
+#define vcpu_hcr_el2(vcpu) (vcpu)->arch.hcr_el2
+#define vcpu_mdcr_el2(vcpu) (vcpu)->arch.mdcr_el2
+#define vcpu_vsesr_el2(vcpu) (vcpu)->arch.vsesr_el2
+#define vcpu_fault(vcpu) (vcpu)->arch.fault
+#define vcpu_flags(vcpu) (vcpu)->arch.flags
+
 /* Pointer to the vcpu's SVE FFR for sve_{save,load}_state() */
 #define vcpu_sve_pffr(vcpu) (kern_hyp_va((vcpu)->arch.sve_state) +	\
 			     sve_ffr_offset((vcpu)->arch.sve_max_vl))