snapshot: sagernet/gvisor v0.0.0-20250811.0-sing-box-mod.1
Содержимое пина, зафиксированного в go.mod sing-box-lx, одним коммитом без истории. Полная история SagerNet/gvisor — 1.45 ГБ и клонируется в каждой CI-джобе; наша дельта — одна вставка в одну функцию, история для неё не нужна. Module path github.com/sagernet/gvisor сохранён намеренно: на него опирается replace-директива суперпроекта. Патч поверх — отдельным коммитом, чтобы дельта читалась одним git show и переносилась на новый пин копированием. SPECS/TASKS/048-GVISOR_HANDSHAKE_NIL_CRASH
This commit is contained in:
Leadaxe
commit
2c4ae3b0a4
712 changed files with 185689 additions and 0 deletions
96
pkg/tcpip/link/veth/endpoint_mutex.go
Normal file
96
pkg/tcpip/link/veth/endpoint_mutex.go
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
package veth
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
|
||||
"github.com/sagernet/gvisor/pkg/sync"
|
||||
"github.com/sagernet/gvisor/pkg/sync/locking"
|
||||
)
|
||||
|
||||
// RWMutex is sync.RWMutex with the correctness validator.
|
||||
type endpointRWMutex struct {
|
||||
mu sync.RWMutex
|
||||
}
|
||||
|
||||
// lockNames is a list of user-friendly lock names.
|
||||
// Populated in init.
|
||||
var endpointlockNames []string
|
||||
|
||||
// lockNameIndex is used as an index passed to NestedLock and NestedUnlock,
|
||||
// referring to an index within lockNames.
|
||||
// Values are specified using the "consts" field of go_template_instance.
|
||||
type endpointlockNameIndex int
|
||||
|
||||
// DO NOT REMOVE: The following function automatically replaced with lock index constants.
|
||||
// LOCK_NAME_INDEX_CONSTANTS
|
||||
const ()
|
||||
|
||||
// Lock locks m.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) Lock() {
|
||||
locking.AddGLock(endpointprefixIndex, -1)
|
||||
m.mu.Lock()
|
||||
}
|
||||
|
||||
// NestedLock locks m knowing that another lock of the same type is held.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) NestedLock(i endpointlockNameIndex) {
|
||||
locking.AddGLock(endpointprefixIndex, int(i))
|
||||
m.mu.Lock()
|
||||
}
|
||||
|
||||
// Unlock unlocks m.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) Unlock() {
|
||||
m.mu.Unlock()
|
||||
locking.DelGLock(endpointprefixIndex, -1)
|
||||
}
|
||||
|
||||
// NestedUnlock unlocks m knowing that another lock of the same type is held.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) NestedUnlock(i endpointlockNameIndex) {
|
||||
m.mu.Unlock()
|
||||
locking.DelGLock(endpointprefixIndex, int(i))
|
||||
}
|
||||
|
||||
// RLock locks m for reading.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) RLock() {
|
||||
locking.AddGLock(endpointprefixIndex, -1)
|
||||
m.mu.RLock()
|
||||
}
|
||||
|
||||
// RUnlock undoes a single RLock call.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) RUnlock() {
|
||||
m.mu.RUnlock()
|
||||
locking.DelGLock(endpointprefixIndex, -1)
|
||||
}
|
||||
|
||||
// RLockBypass locks m for reading without executing the validator.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) RLockBypass() {
|
||||
m.mu.RLock()
|
||||
}
|
||||
|
||||
// RUnlockBypass undoes a single RLockBypass call.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) RUnlockBypass() {
|
||||
m.mu.RUnlock()
|
||||
}
|
||||
|
||||
// DowngradeLock atomically unlocks rw for writing and locks it for reading.
|
||||
// +checklocksignore
|
||||
func (m *endpointRWMutex) DowngradeLock() {
|
||||
m.mu.DowngradeLock()
|
||||
}
|
||||
|
||||
var endpointprefixIndex *locking.MutexClass
|
||||
|
||||
// DO NOT REMOVE: The following function is automatically replaced.
|
||||
func endpointinitLockNames() {}
|
||||
|
||||
func init() {
|
||||
endpointinitLockNames()
|
||||
endpointprefixIndex = locking.NewMutexClass(reflect.TypeOf(endpointRWMutex{}), endpointlockNames)
|
||||
}
|
||||
258
pkg/tcpip/link/veth/veth.go
Normal file
258
pkg/tcpip/link/veth/veth.go
Normal file
|
|
@ -0,0 +1,258 @@
|
|||
// Copyright 2024 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 veth provides the implementation of virtual ethernet device pair.
|
||||
package veth
|
||||
|
||||
import (
|
||||
"github.com/sagernet/gvisor/pkg/tcpip"
|
||||
"github.com/sagernet/gvisor/pkg/tcpip/header"
|
||||
"github.com/sagernet/gvisor/pkg/tcpip/stack"
|
||||
)
|
||||
|
||||
// DefaultBacklogSize is the default size of a veth device's buffer.
|
||||
const DefaultBacklogSize = 1000
|
||||
|
||||
var (
|
||||
_ stack.LinkEndpoint = (*Endpoint)(nil)
|
||||
_ stack.GSOEndpoint = (*Endpoint)(nil)
|
||||
)
|
||||
|
||||
// +stateify savable
|
||||
type veth struct {
|
||||
mu vethRWMutex `state:"nosave"`
|
||||
closed bool
|
||||
backlogQueue chan vethPacket `state:"nosave"`
|
||||
mtu uint32
|
||||
endpoints [2]Endpoint
|
||||
}
|
||||
|
||||
func (v *veth) close() {
|
||||
v.mu.Lock()
|
||||
closed := v.closed
|
||||
v.closed = true
|
||||
v.mu.Unlock()
|
||||
if closed {
|
||||
return
|
||||
}
|
||||
|
||||
for i := range v.endpoints {
|
||||
e := &v.endpoints[i]
|
||||
e.mu.Lock()
|
||||
action := e.onCloseAction
|
||||
e.onCloseAction = nil
|
||||
e.mu.Unlock()
|
||||
if action != nil {
|
||||
action()
|
||||
}
|
||||
}
|
||||
close(v.backlogQueue)
|
||||
}
|
||||
|
||||
// +stateify savable
|
||||
type vethPacket struct {
|
||||
e *Endpoint
|
||||
protocol tcpip.NetworkProtocolNumber
|
||||
pkt *stack.PacketBuffer
|
||||
}
|
||||
|
||||
// Endpoint is link layer endpoint that redirects packets to a pair veth endpoint.
|
||||
//
|
||||
// +stateify savable
|
||||
type Endpoint struct {
|
||||
peer *Endpoint
|
||||
|
||||
veth *veth
|
||||
|
||||
mu endpointRWMutex `state:"nosave"`
|
||||
// +checklocks:mu
|
||||
dispatcher stack.NetworkDispatcher
|
||||
// linkAddr is the local address of this endpoint.
|
||||
//
|
||||
// +checklocks:mu
|
||||
linkAddr tcpip.LinkAddress
|
||||
// +checklocks:mu
|
||||
onCloseAction func() `state:"nosave"`
|
||||
}
|
||||
|
||||
// NewPair creates a new veth pair.
|
||||
func NewPair(mtu, backlogQueueSize uint32) (*Endpoint, *Endpoint) {
|
||||
veth := veth{
|
||||
backlogQueue: make(chan vethPacket, backlogQueueSize),
|
||||
mtu: mtu,
|
||||
endpoints: [2]Endpoint{
|
||||
{
|
||||
linkAddr: tcpip.GetRandMacAddr(),
|
||||
},
|
||||
{
|
||||
linkAddr: tcpip.GetRandMacAddr(),
|
||||
},
|
||||
},
|
||||
}
|
||||
a := &veth.endpoints[0]
|
||||
b := &veth.endpoints[1]
|
||||
a.peer = b
|
||||
b.peer = a
|
||||
a.veth = &veth
|
||||
b.veth = &veth
|
||||
go func() {
|
||||
for t := range veth.backlogQueue {
|
||||
t.e.InjectInbound(t.protocol, t.pkt)
|
||||
t.pkt.DecRef()
|
||||
}
|
||||
}()
|
||||
return a, b
|
||||
}
|
||||
|
||||
// Close closes e. Further packet injections will return an error, and all pending
|
||||
// packets are discarded. Close may be called concurrently with WritePackets.
|
||||
func (e *Endpoint) Close() {
|
||||
e.veth.close()
|
||||
}
|
||||
|
||||
// InjectInbound injects an inbound packet. If the endpoint is not attached, the
|
||||
// packet is not delivered.
|
||||
func (e *Endpoint) InjectInbound(protocol tcpip.NetworkProtocolNumber, pkt *stack.PacketBuffer) {
|
||||
e.mu.RLock()
|
||||
d := e.dispatcher
|
||||
e.mu.RUnlock()
|
||||
if d != nil {
|
||||
d.DeliverNetworkPacket(protocol, pkt)
|
||||
}
|
||||
}
|
||||
|
||||
// Attach saves the stack network-layer dispatcher for use later when packets
|
||||
// are injected.
|
||||
func (e *Endpoint) Attach(dispatcher stack.NetworkDispatcher) {
|
||||
e.mu.Lock()
|
||||
defer e.mu.Unlock()
|
||||
e.dispatcher = dispatcher
|
||||
}
|
||||
|
||||
// IsAttached implements stack.LinkEndpoint.IsAttached.
|
||||
func (e *Endpoint) IsAttached() bool {
|
||||
e.mu.RLock()
|
||||
defer e.mu.RUnlock()
|
||||
return e.dispatcher != nil
|
||||
}
|
||||
|
||||
// MTU implements stack.LinkEndpoint.MTU.
|
||||
func (e *Endpoint) MTU() uint32 {
|
||||
e.veth.mu.RLock()
|
||||
defer e.veth.mu.RUnlock()
|
||||
return e.veth.mtu
|
||||
}
|
||||
|
||||
// SetMTU implements stack.LinkEndpoint.SetMTU.
|
||||
func (e *Endpoint) SetMTU(mtu uint32) {
|
||||
e.veth.mu.Lock()
|
||||
defer e.veth.mu.Unlock()
|
||||
e.veth.mtu = mtu
|
||||
}
|
||||
|
||||
// Capabilities implements stack.LinkEndpoint.Capabilities.
|
||||
func (e *Endpoint) Capabilities() stack.LinkEndpointCapabilities {
|
||||
// TODO(b/352384218): Enable CapabilityTXChecksumOffload.
|
||||
return stack.CapabilityRXChecksumOffload | stack.CapabilitySaveRestore
|
||||
}
|
||||
|
||||
// GSOMaxSize implements stack.GSOEndpoint.
|
||||
func (*Endpoint) GSOMaxSize() uint32 {
|
||||
return stack.GVisorGSOMaxSize
|
||||
}
|
||||
|
||||
// SupportedGSO implements stack.GSOEndpoint.
|
||||
func (e *Endpoint) SupportedGSO() stack.SupportedGSO {
|
||||
return stack.GVisorGSOSupported
|
||||
}
|
||||
|
||||
// MaxHeaderLength returns the maximum size of the link layer header. Given it
|
||||
// doesn't have a header, it just returns 0.
|
||||
func (*Endpoint) MaxHeaderLength() uint16 {
|
||||
return 0
|
||||
}
|
||||
|
||||
// LinkAddress returns the link address of this endpoint.
|
||||
func (e *Endpoint) LinkAddress() tcpip.LinkAddress {
|
||||
e.mu.RLock()
|
||||
defer e.mu.RUnlock()
|
||||
return e.linkAddr
|
||||
}
|
||||
|
||||
// SetLinkAddress implements stack.LinkEndpoint.SetLinkAddress.
|
||||
func (e *Endpoint) SetLinkAddress(addr tcpip.LinkAddress) {
|
||||
e.mu.Lock()
|
||||
defer e.mu.Unlock()
|
||||
e.linkAddr = addr
|
||||
}
|
||||
|
||||
// WritePackets stores outbound packets into the channel.
|
||||
// Multiple concurrent calls are permitted.
|
||||
func (e *Endpoint) WritePackets(pkts stack.PacketBufferList) (int, tcpip.Error) {
|
||||
e.veth.mu.RLock()
|
||||
defer e.veth.mu.RUnlock()
|
||||
|
||||
if e.veth.closed {
|
||||
return 0, nil
|
||||
}
|
||||
|
||||
n := 0
|
||||
for _, pkt := range pkts.AsSlice() {
|
||||
// In order to properly loop back to the inbound side we must create a
|
||||
// fresh packet that only contains the underlying payload with no headers
|
||||
// or struct fields set. We must deep clone the payload to avoid
|
||||
// two goroutines writing to the same buffer.
|
||||
//
|
||||
// TODO(b/240580913): Remove this once IP headers use reference counted
|
||||
// views instead of raw byte slices.
|
||||
payload := pkt.ToBuffer()
|
||||
newPkt := stack.NewPacketBuffer(stack.PacketBufferOptions{
|
||||
Payload: payload.DeepClone(),
|
||||
})
|
||||
payload.Release()
|
||||
select {
|
||||
case (e.veth.backlogQueue) <- vethPacket{
|
||||
e: e.peer,
|
||||
protocol: pkt.NetworkProtocolNumber,
|
||||
pkt: newPkt,
|
||||
}:
|
||||
n++
|
||||
default:
|
||||
newPkt.DecRef()
|
||||
return n, &tcpip.ErrNoBufferSpace{}
|
||||
}
|
||||
}
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// Wait implements stack.LinkEndpoint.Wait.
|
||||
func (*Endpoint) Wait() {}
|
||||
|
||||
// ARPHardwareType implements stack.LinkEndpoint.ARPHardwareType.
|
||||
func (*Endpoint) ARPHardwareType() header.ARPHardwareType {
|
||||
return header.ARPHardwareNone
|
||||
}
|
||||
|
||||
// AddHeader implements stack.LinkEndpoint.AddHeader.
|
||||
func (e *Endpoint) AddHeader(pkt *stack.PacketBuffer) {}
|
||||
|
||||
// ParseHeader implements stack.LinkEndpoint.ParseHeader.
|
||||
func (e *Endpoint) ParseHeader(pkt *stack.PacketBuffer) bool { return true }
|
||||
|
||||
// SetOnCloseAction implements stack.LinkEndpoint.
|
||||
func (e *Endpoint) SetOnCloseAction(action func()) {
|
||||
e.mu.Lock()
|
||||
defer e.mu.Unlock()
|
||||
e.onCloseAction = action
|
||||
}
|
||||
96
pkg/tcpip/link/veth/veth_mutex.go
Normal file
96
pkg/tcpip/link/veth/veth_mutex.go
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
package veth
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
|
||||
"github.com/sagernet/gvisor/pkg/sync"
|
||||
"github.com/sagernet/gvisor/pkg/sync/locking"
|
||||
)
|
||||
|
||||
// RWMutex is sync.RWMutex with the correctness validator.
|
||||
type vethRWMutex struct {
|
||||
mu sync.RWMutex
|
||||
}
|
||||
|
||||
// lockNames is a list of user-friendly lock names.
|
||||
// Populated in init.
|
||||
var vethlockNames []string
|
||||
|
||||
// lockNameIndex is used as an index passed to NestedLock and NestedUnlock,
|
||||
// referring to an index within lockNames.
|
||||
// Values are specified using the "consts" field of go_template_instance.
|
||||
type vethlockNameIndex int
|
||||
|
||||
// DO NOT REMOVE: The following function automatically replaced with lock index constants.
|
||||
// LOCK_NAME_INDEX_CONSTANTS
|
||||
const ()
|
||||
|
||||
// Lock locks m.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) Lock() {
|
||||
locking.AddGLock(vethprefixIndex, -1)
|
||||
m.mu.Lock()
|
||||
}
|
||||
|
||||
// NestedLock locks m knowing that another lock of the same type is held.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) NestedLock(i vethlockNameIndex) {
|
||||
locking.AddGLock(vethprefixIndex, int(i))
|
||||
m.mu.Lock()
|
||||
}
|
||||
|
||||
// Unlock unlocks m.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) Unlock() {
|
||||
m.mu.Unlock()
|
||||
locking.DelGLock(vethprefixIndex, -1)
|
||||
}
|
||||
|
||||
// NestedUnlock unlocks m knowing that another lock of the same type is held.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) NestedUnlock(i vethlockNameIndex) {
|
||||
m.mu.Unlock()
|
||||
locking.DelGLock(vethprefixIndex, int(i))
|
||||
}
|
||||
|
||||
// RLock locks m for reading.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) RLock() {
|
||||
locking.AddGLock(vethprefixIndex, -1)
|
||||
m.mu.RLock()
|
||||
}
|
||||
|
||||
// RUnlock undoes a single RLock call.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) RUnlock() {
|
||||
m.mu.RUnlock()
|
||||
locking.DelGLock(vethprefixIndex, -1)
|
||||
}
|
||||
|
||||
// RLockBypass locks m for reading without executing the validator.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) RLockBypass() {
|
||||
m.mu.RLock()
|
||||
}
|
||||
|
||||
// RUnlockBypass undoes a single RLockBypass call.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) RUnlockBypass() {
|
||||
m.mu.RUnlock()
|
||||
}
|
||||
|
||||
// DowngradeLock atomically unlocks rw for writing and locks it for reading.
|
||||
// +checklocksignore
|
||||
func (m *vethRWMutex) DowngradeLock() {
|
||||
m.mu.DowngradeLock()
|
||||
}
|
||||
|
||||
var vethprefixIndex *locking.MutexClass
|
||||
|
||||
// DO NOT REMOVE: The following function is automatically replaced.
|
||||
func vethinitLockNames() {}
|
||||
|
||||
func init() {
|
||||
vethinitLockNames()
|
||||
vethprefixIndex = locking.NewMutexClass(reflect.TypeOf(vethRWMutex{}), vethlockNames)
|
||||
}
|
||||
111
pkg/tcpip/link/veth/veth_state_autogen.go
Normal file
111
pkg/tcpip/link/veth/veth_state_autogen.go
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
// automatically generated by stateify.
|
||||
|
||||
package veth
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/sagernet/gvisor/pkg/state"
|
||||
)
|
||||
|
||||
func (v *veth) StateTypeName() string {
|
||||
return "pkg/tcpip/link/veth.veth"
|
||||
}
|
||||
|
||||
func (v *veth) StateFields() []string {
|
||||
return []string{
|
||||
"closed",
|
||||
"mtu",
|
||||
"endpoints",
|
||||
}
|
||||
}
|
||||
|
||||
func (v *veth) beforeSave() {}
|
||||
|
||||
// +checklocksignore
|
||||
func (v *veth) StateSave(stateSinkObject state.Sink) {
|
||||
v.beforeSave()
|
||||
stateSinkObject.Save(0, &v.closed)
|
||||
stateSinkObject.Save(1, &v.mtu)
|
||||
stateSinkObject.Save(2, &v.endpoints)
|
||||
}
|
||||
|
||||
func (v *veth) afterLoad(context.Context) {}
|
||||
|
||||
// +checklocksignore
|
||||
func (v *veth) StateLoad(ctx context.Context, stateSourceObject state.Source) {
|
||||
stateSourceObject.Load(0, &v.closed)
|
||||
stateSourceObject.Load(1, &v.mtu)
|
||||
stateSourceObject.Load(2, &v.endpoints)
|
||||
}
|
||||
|
||||
func (v *vethPacket) StateTypeName() string {
|
||||
return "pkg/tcpip/link/veth.vethPacket"
|
||||
}
|
||||
|
||||
func (v *vethPacket) StateFields() []string {
|
||||
return []string{
|
||||
"e",
|
||||
"protocol",
|
||||
"pkt",
|
||||
}
|
||||
}
|
||||
|
||||
func (v *vethPacket) beforeSave() {}
|
||||
|
||||
// +checklocksignore
|
||||
func (v *vethPacket) StateSave(stateSinkObject state.Sink) {
|
||||
v.beforeSave()
|
||||
stateSinkObject.Save(0, &v.e)
|
||||
stateSinkObject.Save(1, &v.protocol)
|
||||
stateSinkObject.Save(2, &v.pkt)
|
||||
}
|
||||
|
||||
func (v *vethPacket) afterLoad(context.Context) {}
|
||||
|
||||
// +checklocksignore
|
||||
func (v *vethPacket) StateLoad(ctx context.Context, stateSourceObject state.Source) {
|
||||
stateSourceObject.Load(0, &v.e)
|
||||
stateSourceObject.Load(1, &v.protocol)
|
||||
stateSourceObject.Load(2, &v.pkt)
|
||||
}
|
||||
|
||||
func (e *Endpoint) StateTypeName() string {
|
||||
return "pkg/tcpip/link/veth.Endpoint"
|
||||
}
|
||||
|
||||
func (e *Endpoint) StateFields() []string {
|
||||
return []string{
|
||||
"peer",
|
||||
"veth",
|
||||
"dispatcher",
|
||||
"linkAddr",
|
||||
}
|
||||
}
|
||||
|
||||
func (e *Endpoint) beforeSave() {}
|
||||
|
||||
// +checklocksignore
|
||||
func (e *Endpoint) StateSave(stateSinkObject state.Sink) {
|
||||
e.beforeSave()
|
||||
stateSinkObject.Save(0, &e.peer)
|
||||
stateSinkObject.Save(1, &e.veth)
|
||||
stateSinkObject.Save(2, &e.dispatcher)
|
||||
stateSinkObject.Save(3, &e.linkAddr)
|
||||
}
|
||||
|
||||
func (e *Endpoint) afterLoad(context.Context) {}
|
||||
|
||||
// +checklocksignore
|
||||
func (e *Endpoint) StateLoad(ctx context.Context, stateSourceObject state.Source) {
|
||||
stateSourceObject.Load(0, &e.peer)
|
||||
stateSourceObject.Load(1, &e.veth)
|
||||
stateSourceObject.Load(2, &e.dispatcher)
|
||||
stateSourceObject.Load(3, &e.linkAddr)
|
||||
}
|
||||
|
||||
func init() {
|
||||
state.Register((*veth)(nil))
|
||||
state.Register((*vethPacket)(nil))
|
||||
state.Register((*Endpoint)(nil))
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue