netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add uncaught signal message to the user log

Browse Source 
This help troubleshoot cases where the container is killed and the
app logs don't show the reason.

PiperOrigin-RevId: 236982883
Change-Id: I361892856a146cea5b04abaa3aedbf805e123724
This commit is contained in:
Fabricio Voznika
2019-03-05 22:20:17 -08:00
committed by Shentubot
parent 1718fdd1a8
commit fcba4e8f04
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/boot/BUILD
+1
View File
@@ -46,6 +46,7 @@ go_library(
"//pkg/sentry/fs/tty",
"//pkg/sentry/inet",
"//pkg/sentry/kernel",
"//pkg/sentry/kernel:uncaught_signal_go_proto",
"//pkg/sentry/kernel/auth",
"//pkg/sentry/kernel/kdefs",
"//pkg/sentry/limits",
runsc/boot/compat.go
+19 -6
View File
@@ -26,6 +26,7 @@ import (
"gvisor.googlesource.com/gvisor/pkg/log"
"gvisor.googlesource.com/gvisor/pkg/sentry/arch"
rpb "gvisor.googlesource.com/gvisor/pkg/sentry/arch/registers_go_proto"
ucspb "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/uncaught_signal_go_proto"
"gvisor.googlesource.com/gvisor/pkg/sentry/strace"
spb "gvisor.googlesource.com/gvisor/pkg/sentry/unimpl/unimplemented_syscall_go_proto"
)
@@ -73,12 +74,18 @@ func newCompatEmitter(logFD int) (*compatEmitter, error) {
}
// Emit implements eventchannel.Emitter.
func (c *compatEmitter) Emit(msg proto.Message) (hangup bool, err error) {
// Only interested in UnimplementedSyscall, skip the rest.
us, ok := msg.(*spb.UnimplementedSyscall)
if !ok {
return false, nil
func (c *compatEmitter) Emit(msg proto.Message) (bool, error) {
switch m := msg.(type) {
case *spb.UnimplementedSyscall:
c.emitUnimplementedSyscall(m)
case *ucspb.UncaughtSignal:
c.emitUncaughtSignal(m)
}
return false, nil
}
func (c *compatEmitter) emitUnimplementedSyscall(us *spb.UnimplementedSyscall) {
regs := us.Registers.GetArch().(*rpb.Registers_Amd64).Amd64
c.mu.Lock()
@@ -113,7 +120,13 @@ func (c *compatEmitter) Emit(msg proto.Message) (hangup bool, err error) {
c.sink.Infof("Unsupported syscall: %s, regs: %+v", c.nameMap.Name(uintptr(sysnr)), regs)
tr.onReported(regs)
}
return false, nil
}
func (c *compatEmitter) emitUncaughtSignal(msg *ucspb.UncaughtSignal) {
sig := syscall.Signal(msg.SignalNumber)
c.sink.Infof(
"Uncaught signal: %q (%d), PID: %d, TID: %d, fault addr: %#x",
sig, msg.SignalNumber, msg.Pid, msg.Tid, msg.FaultAddr)
}
// Close implements eventchannel.Emitter.