Files
zeekayandHanzo Dev f42ae7beb2 Carry urpc payloads as ZAP, not JSON
encoding/json walked every payload on every call. ZAP reads a field at a
constant offset out of the buffer that arrived, and //tools/zap has
already stated those offsets for every payload, so the transport now asks
the payload for its own bytes and the parse step is gone.

The envelope collapses with it. clientCall and serverCall existed only
because JSON needed one type to hold an any and another to hold a
RawMessage; bytes are bytes, so one Call serves both ends. Framing comes
from the ZAP header, which declares its own length.

A payload that is nothing -- the *struct{} a method takes when it has no
argument or no result -- carries nothing. Anything else without a layout
fails the call naming the type, so a payload that would have arrived
silently empty does not arrive at all.

The methods that took a bare string or returned a bare int now take and
return named payloads, because a scalar has no layout to state and the
rest of the API was already shaped this way.


Co-authored-by: Hanzo Dev <[email protected]>
2026-09-22 23:10:33 -07:00

136 lines
4.0 KiB
Go

// Copyright 2019 The gVisor Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package control
import (
"fmt"
"gvisor.dev/gvisor/pkg/log"
"gvisor.dev/gvisor/pkg/sentry/strace"
"gvisor.dev/gvisor/pkg/tcpip/link/sniffer"
)
// LoggingArgs are the arguments to use for changing the logging
// level and strace list.
type LoggingArgs struct {
// SetLevel is a flag used to indicate that we should update
// the logging level. We should be able to change the strace
// list without affecting the logging level and vice versa.
SetLevel bool
// Level is the log level that will be set if SetLevel is true.
Level log.Level
// SetLogPackets indicates that we should update the log packets flag.
SetLogPackets bool
// LogPackets is the actual value to set for LogPackets.
// SetLogPackets must be enabled to indicate that we're changing
// the value.
LogPackets bool
// SetStrace is a flag used to indicate that strace related
// arguments were passed in.
SetStrace bool
// EnableStrace is a flag from the CLI that specifies whether to
// enable strace at all. If this flag is false then a completely
// pristine copy of the syscall table will be swapped in. This
// approach is used to remain consistent with an empty strace
// allowlist meaning trace all system calls.
EnableStrace bool
// Strace is the allowlist of syscalls to trace to log. If this
// and StraceEventAllowlist are empty trace all system calls.
StraceAllowlist []string
// SetEventStrace is a flag used to indicate that event strace
// related arguments were passed in.
SetEventStrace bool
// StraceEventAllowlist is the allowlist of syscalls to trace
// to event log.
StraceEventAllowlist []string
}
// Logging provides functions related to logging.
type Logging struct{}
// Change will change the log level and strace arguments. Although
// this functions signature requires an error it never actually
// returns an error. It's required by the URPC interface.
// Additionally, it may look odd that this is the only method
// attached to an empty struct but this is also part of how
// URPC dispatches.
func (l *Logging) Change(args *LoggingArgs, _ *struct{}) error {
if args.SetLevel {
// Logging uses an atomic for the level so this is thread safe.
log.SetLevel(args.Level)
}
if args.SetLogPackets {
if args.LogPackets {
sniffer.LogPackets.Store(1)
} else {
sniffer.LogPackets.Store(0)
}
log.Infof("LogPackets set to: %v", sniffer.LogPackets.Load())
}
if args.SetStrace {
if err := l.configureStrace(args); err != nil {
return fmt.Errorf("error configuring strace: %v", err)
}
}
if args.SetEventStrace {
if err := l.configureEventStrace(args); err != nil {
return fmt.Errorf("error configuring event strace: %v", err)
}
}
return nil
}
func (l *Logging) configureStrace(args *LoggingArgs) error {
if args.EnableStrace {
// Install the allowlist specified.
if len(args.StraceAllowlist) > 0 {
if err := strace.Enable(args.StraceAllowlist, strace.SinkTypeLog); err != nil {
return err
}
} else {
// For convenience, if strace is enabled but allowlist
// is empty, enable everything to log.
strace.EnableAll(strace.SinkTypeLog)
}
} else {
// Uninstall all strace functions.
strace.Disable(strace.SinkTypeLog)
}
return nil
}
func (l *Logging) configureEventStrace(args *LoggingArgs) error {
if len(args.StraceEventAllowlist) > 0 {
if err := strace.Enable(args.StraceEventAllowlist, strace.SinkTypeEvent); err != nil {
return err
}
} else {
strace.Disable(strace.SinkTypeEvent)
}
return nil
}