Page MenuHomeFreeBSD
Files F146184639

D22881.id65821.diff
No OneTemporary
Actions

D22881.id65821.diff
View Options

Index: sys/amd64/include/vmm.h
===================================================================
--- sys/amd64/include/vmm.h
+++ sys/amd64/include/vmm.h
@@ -289,7 +289,7 @@
* forward progress when the rendezvous is in progress.
*/
typedef void (*vm_rendezvous_func_t)(struct vm *vm, int vcpuid, void *arg);
-void vm_smp_rendezvous(struct vm *vm, int vcpuid, cpuset_t dest,
+int vm_smp_rendezvous(struct vm *vm, int vcpuid, cpuset_t dest,
vm_rendezvous_func_t func, void *arg);
cpuset_t vm_active_cpus(struct vm *vm);
cpuset_t vm_debug_cpus(struct vm *vm);
Index: sys/amd64/vmm/io/vioapic.c
===================================================================
--- sys/amd64/vmm/io/vioapic.c
+++ sys/amd64/vmm/io/vioapic.c
@@ -353,7 +353,7 @@
"vlapic trigger-mode register", pin);
VIOAPIC_UNLOCK(vioapic);
allvcpus = vm_active_cpus(vioapic->vm);
- vm_smp_rendezvous(vioapic->vm, vcpuid, allvcpus,
+ (void)vm_smp_rendezvous(vioapic->vm, vcpuid, allvcpus,
vioapic_update_tmr, NULL);
VIOAPIC_LOCK(vioapic);
}
Index: sys/amd64/vmm/vmm.c
===================================================================
--- sys/amd64/vmm/vmm.c
+++ sys/amd64/vmm/vmm.c
@@ -1243,13 +1243,17 @@
VM_CTR0(vm, fmt); \
} while (0)
-static void
+static int
vm_handle_rendezvous(struct vm *vm, int vcpuid)
{
+ struct thread *td;
+ int error;
KASSERT(vcpuid == -1 || (vcpuid >= 0 && vcpuid < vm->maxcpus),
("vm_handle_rendezvous: invalid vcpuid %d", vcpuid));
+ error = 0;
+ td = curthread;
mtx_lock(&vm->rendezvous_mtx);
while (vm->rendezvous_func != NULL) {
/* 'rendezvous_req_cpus' must be a subset of 'active_cpus' */
@@ -1272,8 +1276,16 @@
RENDEZVOUS_CTR0(vm, vcpuid, "Wait for rendezvous completion");
mtx_sleep(&vm->rendezvous_func, &vm->rendezvous_mtx, 0,
"vmrndv", 0);
+ if ((td->td_flags & TDF_NEEDSUSPCHK) != 0) {
+ mtx_unlock(&vm->rendezvous_mtx);
+ error = thread_check_susp(td, false);
+ if (error != 0)
+ return (error);
+ mtx_lock(&vm->rendezvous_mtx);
+ }
}
mtx_unlock(&vm->rendezvous_mtx);
+ return (0);
}
/*
@@ -1284,13 +1296,16 @@
{
struct vcpu *vcpu;
const char *wmesg;
- int t, vcpu_halted, vm_halted;
+ struct thread *td;
+ int error, t, vcpu_halted, vm_halted;
KASSERT(!CPU_ISSET(vcpuid, &vm->halted_cpus), ("vcpu already halted"));
vcpu = &vm->vcpu[vcpuid];
vcpu_halted = 0;
vm_halted = 0;
+ error = 0;
+ td = curthread;
vcpu_lock(vcpu);
while (1) {
@@ -1351,6 +1366,13 @@
msleep_spin(vcpu, &vcpu->mtx, wmesg, hz);
vcpu_require_state_locked(vm, vcpuid, VCPU_FROZEN);
vmm_stat_incr(vm, vcpuid, VCPU_IDLE_TICKS, ticks - t);
+ if ((td->td_flags & TDF_NEEDSUSPCHK) != 0) {
+ vcpu_unlock(vcpu);
+ error = thread_check_susp(td, false);
+ if (error != 0)
+ return (error);
+ vcpu_lock(vcpu);
+ }
}
if (vcpu_halted)
@@ -1487,11 +1509,13 @@
static int
vm_handle_suspend(struct vm *vm, int vcpuid, bool *retu)
{
- int i, done;
+ int error, i;
struct vcpu *vcpu;
+ struct thread *td;
- done = 0;
+ error = 0;
vcpu = &vm->vcpu[vcpuid];
+ td = curthread;
CPU_SET_ATOMIC(vcpuid, &vm->suspended_cpus);
@@ -1503,7 +1527,7 @@
* handler while we are waiting to prevent a deadlock.
*/
vcpu_lock(vcpu);
- while (1) {
+ while (error == 0) {
if (CPU_CMP(&vm->suspended_cpus, &vm->active_cpus) == 0) {
VCPU_CTR0(vm, vcpuid, "All vcpus suspended");
break;
@@ -1514,10 +1538,15 @@
vcpu_require_state_locked(vm, vcpuid, VCPU_SLEEPING);
msleep_spin(vcpu, &vcpu->mtx, "vmsusp", hz);
vcpu_require_state_locked(vm, vcpuid, VCPU_FROZEN);
+ if ((td->td_flags & TDF_NEEDSUSPCHK) != 0) {
+ vcpu_unlock(vcpu);
+ error = thread_check_susp(td, false);
+ vcpu_lock(vcpu);
+ }
} else {
VCPU_CTR0(vm, vcpuid, "Rendezvous during suspend");
vcpu_unlock(vcpu);
- vm_handle_rendezvous(vm, vcpuid);
+ error = vm_handle_rendezvous(vm, vcpuid);
vcpu_lock(vcpu);
}
}
@@ -1533,7 +1562,7 @@
}
*retu = true;
- return (0);
+ return (error);
}
static int
@@ -1707,8 +1736,7 @@
vme->u.ioapic_eoi.vector);
break;
case VM_EXITCODE_RENDEZVOUS:
- vm_handle_rendezvous(vm, vcpuid);
- error = 0;
+ error = vm_handle_rendezvous(vm, vcpuid);
break;
case VM_EXITCODE_HLT:
intr_disabled = ((vme->u.hlt.rflags & PSL_I) == 0);
@@ -2486,11 +2514,11 @@
return (apicid);
}
-void
+int
vm_smp_rendezvous(struct vm *vm, int vcpuid, cpuset_t dest,
vm_rendezvous_func_t func, void *arg)
{
- int i;
+ int error, i;
/*
* Enforce that this function is called without any locks
@@ -2509,7 +2537,9 @@
*/
RENDEZVOUS_CTR0(vm, vcpuid, "Rendezvous already in progress");
mtx_unlock(&vm->rendezvous_mtx);
- vm_handle_rendezvous(vm, vcpuid);
+ error = vm_handle_rendezvous(vm, vcpuid);
+ if (error != 0)
+ return (error);
goto restart;
}
KASSERT(vm->rendezvous_func == NULL, ("vm_smp_rendezvous: previous "
@@ -2531,7 +2561,7 @@
vcpu_notify_event(vm, i, false);
}
- vm_handle_rendezvous(vm, vcpuid);
+ return (vm_handle_rendezvous(vm, vcpuid));
}
struct vatpic *
Index: sys/kern/kern_umtx.c
===================================================================
--- sys/kern/kern_umtx.c
+++ sys/kern/kern_umtx.c
@@ -732,6 +732,12 @@
return (error);
}
+int
+thread_check_susp(struct thread *td, bool sleep)
+{
+ return (umtxq_check_susp(td, sleep));
+}
+
/*
* Wake up threads waiting on an userland object.
*/
Index: sys/sys/proc.h
===================================================================
--- sys/sys/proc.h
+++ sys/sys/proc.h
@@ -1144,6 +1144,7 @@
void cpu_thread_swapout(struct thread *);
struct thread *thread_alloc(int pages);
int thread_alloc_stack(struct thread *, int pages);
+int thread_check_susp(struct thread *td, bool sleep);
void thread_cow_get_proc(struct thread *newtd, struct proc *p);
void thread_cow_get(struct thread *newtd, struct thread *td);
void thread_cow_free(struct thread *td);

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 1:34 PM (3 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29115253
Default Alt Text
D22881.id65821.diff (5 KB)

Event Timeline