Skip to contentSkip to conversation

ARM: KVM: don't BUG() if guest executes smc.

PATCH In review Rusty Russell 1 participant 1 message Mar 9, 2012 Arm (32-bit)

lore
Share & tools
lore

Rusty Russell

author
#0 lore raw

PATCH 8/8 ARM: KVM: don't BUG() if guest executes smc.

From: Rusty Russell <[email protected]>

In this case, we just kill the guest.

Signed-off-by Rusty Russell <[email protected]>
---
 arch/arm/kvm/arm.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
arch/arm/kvm/arm.c +8 -0
index 1724657..9ef5bdb 100644
@@ -367,6 +367,13 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)
 	return 0;
 }
 
+static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run)
+{
+	/* We don't support SMC; don't do that. */
+	kvm_debug("smc: at %08x", vcpu->arch.regs.pc);
+	return -EINVAL;
+}
+
 static int handle_dabt_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
 	/* The hypervisor should never cause aborts */

@@ -386,6 +393,7 @@ static int (*arm_exit_handlers[])(struct kvm_vcpu *vcpu, struct kvm_run *r) = {
 	[HSR_EC_CP10_ID]	= kvm_handle_cp10_id,
 	[HSR_EC_SVC_HYP]	= handle_svc_hyp,
 	[HSR_EC_HVC]		= handle_hvc,
+	[HSR_EC_SMC	]	= handle_smc,
 	[HSR_EC_IABT]		= kvm_handle_guest_abort,
 	[HSR_EC_DABT]		= kvm_handle_guest_abort,
 	[HSR_EC_DABT_HYP]	= handle_dabt_hyp,