diff options
author | neel <neel@FreeBSD.org> | 2014-05-05 16:19:24 +0000 |
---|---|---|
committer | neel <neel@FreeBSD.org> | 2014-05-05 16:19:24 +0000 |
commit | 5fd692c3b580554aa0926a4aa512022b56575d31 (patch) | |
tree | 8f01a84416a7b59305f56b2785a3357635908366 | |
parent | c163eb4b72ccdf316e1f9e38ad2eeef0b39028a9 (diff) | |
download | FreeBSD-src-5fd692c3b580554aa0926a4aa512022b56575d31.zip FreeBSD-src-5fd692c3b580554aa0926a4aa512022b56575d31.tar.gz |
Virtual machine halt detection is turned on by default. Allow it to be
disabled via the tunable 'hw.vmm.halt_detection'.
-rw-r--r-- | sys/amd64/vmm/vmm.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index cd16608..9aed5f5 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -189,6 +189,16 @@ static VMM_STAT(VCPU_TOTAL_RUNTIME, "vcpu total runtime"); SYSCTL_NODE(_hw, OID_AUTO, vmm, CTLFLAG_RW, NULL, NULL); +/* + * Halt the guest if all vcpus are executing a HLT instruction with + * interrupts disabled. + */ +static int halt_detection_enabled = 1; +TUNABLE_INT("hw.vmm.halt_detection", &halt_detection_enabled); +SYSCTL_INT(_hw_vmm, OID_AUTO, halt_detection, CTLFLAG_RDTUN, + &halt_detection_enabled, 0, + "Halt VM if all vcpus execute HLT with interrupts disabled"); + static int vmm_ipinum; SYSCTL_INT(_hw_vmm, OID_AUTO, ipinum, CTLFLAG_RD, &vmm_ipinum, 0, "IPI vector used for vcpu notifications"); @@ -1047,7 +1057,7 @@ vm_handle_hlt(struct vm *vm, int vcpuid, bool intr_disabled, bool *retu) if (intr_disabled) { wmesg = "vmhalt"; VCPU_CTR0(vm, vcpuid, "Halted"); - if (!vcpu_halted) { + if (!vcpu_halted && halt_detection_enabled) { vcpu_halted = 1; CPU_SET_ATOMIC(vcpuid, &vm->halted_cpus); } |