diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-07-12 16:19:23 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-07-12 16:19:23 +0000 |
| commit | 715afd5da8c2d5aacd7ab64535b92dac1abc3f37 (patch) | |
| tree | 432c7c1ada560a23f26de6e9b8beefdda97ccdcc /pkg/sentry/platform/kvm/machine.go | |
| parent | e3abe5ebdf5e0c98429faee7d57d126d452f7293 (diff) | |
| parent | 69e0affaecda24b4d193e4592202b55b53afecc3 (diff) | |
Merge 69e0affa (automated)
Diffstat (limited to 'pkg/sentry/platform/kvm/machine.go')
| -rw-r--r-- | pkg/sentry/platform/kvm/machine.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/sentry/platform/kvm/machine.go b/pkg/sentry/platform/kvm/machine.go index 7d92e16cc..679087e25 100644 --- a/pkg/sentry/platform/kvm/machine.go +++ b/pkg/sentry/platform/kvm/machine.go @@ -426,7 +426,12 @@ func (c *vCPU) unlock() { // Normal state. case vCPUUser | vCPUGuest | vCPUWaiter: // Force a transition: this must trigger a notification when we - // return from guest mode. + // return from guest mode. We must clear vCPUWaiter here + // anyways, because BounceToKernel will force a transition only + // from ring3 to ring0, which will not clear this bit. Halt may + // workaround the issue, but if there is no exception or + // syscall in this period, BounceToKernel will hang. + atomicbitops.AndUint32(&c.state, ^vCPUWaiter) c.notify() case vCPUUser | vCPUWaiter: // Waiting for the lock to be released; the responsibility is |