From 79738d3958a027bcf449cf1bd608f3adec42b72c Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Wed, 22 May 2019 18:18:01 -0700 Subject: Log unhandled faults only at DEBUG level. PiperOrigin-RevId: 249561399 Change-Id: Ic73c68c8538bdca53068f38f82b7260939addac2 --- pkg/sentry/kernel/task_run.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'pkg/sentry') 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. -- cgit v1.2.3