ARM: KVM: Don't handle PSCI calls via SMC (24a7f675) · Commits · 戴 / test

Currently, kvmtool unconditionally declares that HVC should be used to call PSCI, so the function numbers in the DT tell the guest nothing about the function ID namespace or calling convention for SMC. We already assume that the guest will examine and honour the DT, since there is no way it could possibly guess the KVM-specific PSCI function IDs otherwise. So let's not encourage guests to violate what's specified in the DT by using SMC to make the call. [ Modified to apply to top of kvm/arm tree - Christoffer ] Signed-off-by:

Dave P Martin <Dave.Martin@arm.com> Acked-by:

Marc Zyngier <marc.zyngier@arm.com> Signed-off-by:

Christoffer Dall <cdall@cs.columbia.edu>

arch/arm/kvm/handle_exit.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -52,9 +52,6 @@ static int handle_hvc(struct kvm_vcpu vcpu, struct kvm_run run)

		static int handle_smc(struct kvm_vcpu vcpu, struct kvm_run run)
		{
		if (kvm_psci_call(vcpu))
		return 1;

		kvm_inject_undefined(vcpu);
		return 1;
		}

arch/arm/kvm/psci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
		* kvm_psci_call - handle PSCI call if r0 value is in range
		* @vcpu: Pointer to the VCPU struct
		*
		* Handle PSCI calls from guests through traps from HVC or SMC instructions.
		* Handle PSCI calls from guests through traps from HVC instructions.
		* The calling convention is similar to SMC calls to the secure world where
		* the function number is placed in r0 and this function returns true if the
		* function number specified in r0 is withing the PSCI range, and false

Admin message