summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2019-05-22 18:18:01 -0700
committerShentubot <shentubot@google.com>2019-05-22 18:18:53 -0700
commit79738d3958a027bcf449cf1bd608f3adec42b72c (patch)
treecfd8f47c8f33564c0d3f6d80ea4ca5ed3f84c142 /pkg
parentf65dfec09650768626a9af916b0487afa557a930 (diff)
Log unhandled faults only at DEBUG level.
PiperOrigin-RevId: 249561399 Change-Id: Ic73c68c8538bdca53068f38f82b7260939addac2
Diffstat (limited to 'pkg')
-rw-r--r--pkg/sentry/kernel/task_run.go10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkg/sentry/kernel/task_run.go b/pkg/sentry/kernel/task_run.go
index 4549b437e..a79101a18 100644
--- a/pkg/sentry/kernel/task_run.go
+++ b/pkg/sentry/kernel/task_run.go
@@ -26,7 +26,6 @@ import (
"gvisor.googlesource.com/gvisor/pkg/sentry/memmap"
"gvisor.googlesource.com/gvisor/pkg/sentry/platform"
"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
- "gvisor.googlesource.com/gvisor/pkg/syserror"
)
// A taskRunState is a reified state in the task state machine. See README.md
@@ -267,13 +266,8 @@ func (*runApp) execute(t *Task) taskRunState {
}
}
- // The JVM will trigger these errors constantly, so don't
- // spam logs with this error.
- if err == syserror.EFAULT || err == syserror.EPERM {
- t.Debugf("Unhandled user fault: addr=%x ip=%x access=%v err=%v", addr, t.Arch().IP(), at, err)
- } else {
- t.Warningf("Unhandled user fault: addr=%x ip=%x access=%v err=%v", addr, t.Arch().IP(), at, err)
- }
+ // Faults are common, log only at debug level.
+ t.Debugf("Unhandled user fault: addr=%x ip=%x access=%v err=%v", addr, t.Arch().IP(), at, err)
t.DebugDumpState()
// Continue to signal handling.