diff options
author | Adin Scannell <ascannell@google.com> | 2020-04-01 11:05:05 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-04-01 11:06:26 -0700 |
commit | 4e6a1a5adb5607423c180089d8b464ef7dfdd1ae (patch) | |
tree | aac579d8395dd545fb647ca6e08ca8079262fcdc /pkg/sentry/platform/kvm/bluepill.go | |
parent | db7917556a7e4bd2cd6d183c68f04a4787dec493 (diff) |
Automated rollback of changelist 303799678
PiperOrigin-RevId: 304221302
Diffstat (limited to 'pkg/sentry/platform/kvm/bluepill.go')
-rw-r--r-- | pkg/sentry/platform/kvm/bluepill.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkg/sentry/platform/kvm/bluepill.go b/pkg/sentry/platform/kvm/bluepill.go index 555b5fa96..4b23f7803 100644 --- a/pkg/sentry/platform/kvm/bluepill.go +++ b/pkg/sentry/platform/kvm/bluepill.go @@ -46,14 +46,6 @@ var ( // bounceSignalMask has only bounceSignal set. bounceSignalMask = uint64(1 << (uint64(bounceSignal) - 1)) - // otherSignalsMask includes all other signals that will be cause the - // vCPU to exit during execution. - // - // Currently, this includes the preemption signal and the profiling - // signal. In general, these should be signals whose delivery actually - // influences the way the program executes as the switch can be costly. - otherSignalsMask = uint64(1<<(uint64(syscall.SIGURG)-1)) | uint64(1<<(uint64(syscall.SIGPROF)-1)) - // bounce is the interrupt vector used to return to the kernel. bounce = uint32(ring0.VirtualizationException) @@ -94,8 +86,8 @@ func (c *vCPU) die(context *arch.SignalContext64, msg string) { } func init() { - // Install the handler, masking all signals. - if err := safecopy.ReplaceSignalHandler(bluepillSignal, reflect.ValueOf(sighandler).Pointer(), &savedHandler, ^uint64(0)); err != nil { + // Install the handler. + if err := safecopy.ReplaceSignalHandler(bluepillSignal, reflect.ValueOf(sighandler).Pointer(), &savedHandler); err != nil { panic(fmt.Sprintf("Unable to set handler for signal %d: %v", bluepillSignal, err)) } |