Commit 021234ef authored Jun 09, 2017 by Marc Zyngier

KVM: arm64: Make kvm_condition_valid32() accessible from EL2



As we're about to trap CP15 accesses and handle them at EL2, we
need to evaluate whether or not the condition flags are valid,
as an implementation is allowed to trap despite the condition
not being met.

Tagging the function as __hyp_text allows this. We still rely on
the cc_map array to be mapped at EL2 by virtue of being "const",
and the linker to only emit relative references.

Tested-by: Alexander Graf <agraf@suse.de>
Acked-by: David Daney <david.daney@cavium.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>

parent 63000dd8

virt/kvm/arm/aarch32.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ static const unsigned short cc_map[16] = {
		/*
		* Check if a trapped instruction should have been executed or not.
		*/
		bool kvm_condition_valid32(const struct kvm_vcpu *vcpu)
		bool __hyp_text kvm_condition_valid32(const struct kvm_vcpu *vcpu)
		{
		unsigned long cpsr;
		u32 cpsr_cond;

Admin message