Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b62e850 authored by Marc Zyngier's avatar Marc Zyngier Committed by Greg Kroah-Hartman
Browse files

arm64: KVM: Add HYP per-cpu accessors 



commit 85478bab409171de501b719971fd25a3d5d639f9 upstream.

As we're going to require to access per-cpu variables at EL2,
let's craft the minimum set of accessors required to implement
reading a per-cpu variable, relying on tpidr_el2 to contain the
per-cpu offset.

Reviewed-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c06aab1

arch/arm64/include/asm/kvm_asm.h

+25 −2
Original line number Diff line number Diff line
@@ -66,14 +66,37 @@ extern u32 __kvm_get_mdcr_el2(void); 


extern u32 __init_stage2_translation(void);



/* Home-grown __this_cpu_{ptr,read} variants that always work at HYP */

#define __hyp_this_cpu_ptr(sym)						\

	({								\

		void *__ptr = hyp_symbol_addr(sym);			\

		__ptr += read_sysreg(tpidr_el2);			\

		(typeof(&sym))__ptr;					\

	 })



#define __hyp_this_cpu_read(sym)					\

	({								\

		*__hyp_this_cpu_ptr(sym);				\

	 })



#else /* __ASSEMBLY__ */



.macro get_host_ctxt reg, tmp

	adr_l	\reg, kvm_host_cpu_state

.macro hyp_adr_this_cpu reg, sym, tmp

	adr_l	\reg, \sym

	mrs	\tmp, tpidr_el2

	add	\reg, \reg, \tmp

.endm



.macro hyp_ldr_this_cpu reg, sym, tmp

	adr_l	\reg, \sym

	mrs	\tmp, tpidr_el2

	ldr	\reg,  [\reg, \tmp]

.endm



.macro get_host_ctxt reg, tmp

	hyp_adr_this_cpu \reg, kvm_host_cpu_state, \tmp

.endm



.macro get_vcpu_ptr vcpu, ctxt

	get_host_ctxt \ctxt, \vcpu

	ldr	\vcpu, [\ctxt, #HOST_CONTEXT_VCPU]