upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

vmm: Remove support for vm_rendezvous with a cpuid of -1.

Browse source 
This is not currently used.

Reviewed by:	corvink, markj
Differential Revision:	https://reviews.freebsd.org/D37164
This commit is contained in:
John Baldwin 2022-11-18 10:03:23 -08:00
parent 9388bc1e3a
commit 949f0f47a4
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sys/amd64/vmm/vmm.c
View file

@ -1319,21 +1319,13 @@ vcpu_require_state_locked(struct vm *vm, int vcpuid, enum vcpu_state newstate)
panic("Error %d setting state to %d", error, newstate); panic("Error %d setting state to %d", error, newstate);
} }
#define RENDEZVOUS_CTR0(vm, vcpuid, fmt) \
do { \
if (vcpuid >= 0) \
VCPU_CTR0(vm, vcpuid, fmt); \
else \
VM_CTR0(vm, fmt); \
} while (0)
static int static int
vm_handle_rendezvous(struct vm *vm, int vcpuid) vm_handle_rendezvous(struct vm *vm, int vcpuid)
{ {
struct thread *td; struct thread *td;
int error; int error;
KASSERT(vcpuid == -1 || (vcpuid >= 0 && vcpuid < vm->maxcpus), KASSERT(vcpuid >= 0 && vcpuid < vm->maxcpus,
("vm_handle_rendezvous: invalid vcpuid %d", vcpuid)); ("vm_handle_rendezvous: invalid vcpuid %d", vcpuid));
error = 0; error = 0;
@ -1343,8 +1335,7 @@ vm_handle_rendezvous(struct vm *vm, int vcpuid)
/* 'rendezvous_req_cpus' must be a subset of 'active_cpus' */ /* 'rendezvous_req_cpus' must be a subset of 'active_cpus' */
CPU_AND(&vm->rendezvous_req_cpus, &vm->rendezvous_req_cpus, &vm->active_cpus); CPU_AND(&vm->rendezvous_req_cpus, &vm->rendezvous_req_cpus, &vm->active_cpus);
if (vcpuid != -1 && if (CPU_ISSET(vcpuid, &vm->rendezvous_req_cpus) &&
CPU_ISSET(vcpuid, &vm->rendezvous_req_cpus) &&
!CPU_ISSET(vcpuid, &vm->rendezvous_done_cpus)) { !CPU_ISSET(vcpuid, &vm->rendezvous_done_cpus)) {
VCPU_CTR0(vm, vcpuid, "Calling rendezvous func"); VCPU_CTR0(vm, vcpuid, "Calling rendezvous func");
(*vm->rendezvous_func)(vm, vcpuid, vm->rendezvous_arg); (*vm->rendezvous_func)(vm, vcpuid, vm->rendezvous_arg);
@ -1357,7 +1348,7 @@ vm_handle_rendezvous(struct vm *vm, int vcpuid)
wakeup(&vm->rendezvous_func); wakeup(&vm->rendezvous_func);
break; break;
} }
RENDEZVOUS_CTR0(vm, vcpuid, "Wait for rendezvous completion"); VCPU_CTR0(vm, vcpuid, "Wait for rendezvous completion");
mtx_sleep(&vm->rendezvous_func, &vm->rendezvous_mtx, 0, mtx_sleep(&vm->rendezvous_func, &vm->rendezvous_mtx, 0,
"vmrndv", hz); "vmrndv", hz);
if (td_ast_pending(td, TDA_SUSPEND)) { if (td_ast_pending(td, TDA_SUSPEND)) {
@ -2582,7 +2573,7 @@ vm_smp_rendezvous(struct vm *vm, int vcpuid, cpuset_t dest,
* Enforce that this function is called without any locks * Enforce that this function is called without any locks
*/ */
WITNESS_WARN(WARN_PANIC, NULL, "vm_smp_rendezvous"); WITNESS_WARN(WARN_PANIC, NULL, "vm_smp_rendezvous");
KASSERT(vcpuid == -1 || (vcpuid >= 0 && vcpuid < vm->maxcpus), KASSERT(vcpuid >= 0 && vcpuid < vm->maxcpus,
("vm_smp_rendezvous: invalid vcpuid %d", vcpuid)); ("vm_smp_rendezvous: invalid vcpuid %d", vcpuid));
restart: restart:
@ -2593,7 +2584,7 @@ restart:
* call the rendezvous handler in case this 'vcpuid' is one * call the rendezvous handler in case this 'vcpuid' is one
* of the targets of the rendezvous. * of the targets of the rendezvous.
*/ */
RENDEZVOUS_CTR0(vm, vcpuid, "Rendezvous already in progress"); VCPU_CTR0(vm, vcpuid, "Rendezvous already in progress");
mtx_unlock(&vm->rendezvous_mtx); mtx_unlock(&vm->rendezvous_mtx);
error = vm_handle_rendezvous(vm, vcpuid); error = vm_handle_rendezvous(vm, vcpuid);
if (error != 0) if (error != 0)
@ -2603,7 +2594,7 @@ restart:
KASSERT(vm->rendezvous_func == NULL, ("vm_smp_rendezvous: previous " KASSERT(vm->rendezvous_func == NULL, ("vm_smp_rendezvous: previous "
"rendezvous is still in progress")); "rendezvous is still in progress"));
RENDEZVOUS_CTR0(vm, vcpuid, "Initiating rendezvous"); VCPU_CTR0(vm, vcpuid, "Initiating rendezvous");
vm->rendezvous_req_cpus = dest; vm->rendezvous_req_cpus = dest;
CPU_ZERO(&vm->rendezvous_done_cpus); CPU_ZERO(&vm->rendezvous_done_cpus);
vm->rendezvous_arg = arg; vm->rendezvous_arg = arg;