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:
commit
2c4ae3b0a4
712 changed files with 185689 additions and 0 deletions
215
pkg/flipcall/ctrl_futex.go
Normal file
215
pkg/flipcall/ctrl_futex.go
Normal file
|
|
@ -0,0 +1,215 @@
|
|||
// 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.
|
||||
|
||||
//go:build !false
|
||||
// +build !false
|
||||
|
||||
package flipcall
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"math"
|
||||
|
||||
"github.com/sagernet/gvisor/pkg/atomicbitops"
|
||||
"github.com/sagernet/gvisor/pkg/log"
|
||||
)
|
||||
|
||||
type endpointControlImpl struct {
|
||||
state atomicbitops.Int32
|
||||
}
|
||||
|
||||
// Bits in endpointControlImpl.state.
|
||||
const (
|
||||
epsBlocked = 1 << iota
|
||||
epsShutdown
|
||||
)
|
||||
|
||||
func (ep *Endpoint) ctrlInit(opts ...EndpointOption) error {
|
||||
if len(opts) != 0 {
|
||||
return fmt.Errorf("unknown EndpointOption: %T", opts[0])
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ep *Endpoint) ctrlConnect() error {
|
||||
if err := ep.enterFutexWait(); err != nil {
|
||||
return err
|
||||
}
|
||||
defer ep.exitFutexWait()
|
||||
|
||||
// Write the connection request.
|
||||
w := ep.NewWriter()
|
||||
if err := json.NewEncoder(w).Encode(struct{}{}); err != nil {
|
||||
return fmt.Errorf("error writing connection request: %v", err)
|
||||
}
|
||||
*ep.dataLen() = atomicbitops.FromUint32(w.Len())
|
||||
|
||||
// Exchange control with the server.
|
||||
if err := ep.futexSetPeerActive(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ep.futexWakePeer(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ep.futexWaitUntilActive(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Read the connection response.
|
||||
var resp struct{}
|
||||
respLen := ep.dataLen().Load()
|
||||
if respLen > ep.dataCap {
|
||||
return fmt.Errorf("invalid connection response length %d (maximum %d)", respLen, ep.dataCap)
|
||||
}
|
||||
if err := json.NewDecoder(ep.NewReader(respLen)).Decode(&resp); err != nil {
|
||||
return fmt.Errorf("error reading connection response: %v", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ep *Endpoint) ctrlWaitFirst() error {
|
||||
if err := ep.enterFutexWait(); err != nil {
|
||||
return err
|
||||
}
|
||||
defer ep.exitFutexWait()
|
||||
|
||||
// Wait for the connection request.
|
||||
if err := ep.futexWaitUntilActive(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Read the connection request.
|
||||
reqLen := ep.dataLen().Load()
|
||||
if reqLen > ep.dataCap {
|
||||
return fmt.Errorf("invalid connection request length %d (maximum %d)", reqLen, ep.dataCap)
|
||||
}
|
||||
var req struct{}
|
||||
if err := json.NewDecoder(ep.NewReader(reqLen)).Decode(&req); err != nil {
|
||||
return fmt.Errorf("error reading connection request: %v", err)
|
||||
}
|
||||
|
||||
// Write the connection response.
|
||||
w := ep.NewWriter()
|
||||
if err := json.NewEncoder(w).Encode(struct{}{}); err != nil {
|
||||
return fmt.Errorf("error writing connection response: %v", err)
|
||||
}
|
||||
*ep.dataLen() = atomicbitops.FromUint32(w.Len())
|
||||
|
||||
// Return control to the client.
|
||||
raceBecomeInactive()
|
||||
if err := ep.futexSetPeerActive(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ep.futexWakePeer(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Wait for the first non-connection message.
|
||||
return ep.futexWaitUntilActive()
|
||||
}
|
||||
|
||||
func (ep *Endpoint) ctrlRoundTrip(mayRetainP bool) error {
|
||||
if err := ep.enterFutexWait(); err != nil {
|
||||
return err
|
||||
}
|
||||
defer ep.exitFutexWait()
|
||||
|
||||
if err := ep.futexSetPeerActive(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ep.futexWakePeer(); err != nil {
|
||||
return err
|
||||
}
|
||||
// Since we don't know if the peer Endpoint is in the same process as this
|
||||
// one (in which case it may need our P to run), we allow our P to be
|
||||
// retaken regardless of mayRetainP.
|
||||
return ep.futexWaitUntilActive()
|
||||
}
|
||||
|
||||
func (ep *Endpoint) ctrlWakeLast() error {
|
||||
if err := ep.futexSetPeerActive(); err != nil {
|
||||
return err
|
||||
}
|
||||
return ep.futexWakePeer()
|
||||
}
|
||||
|
||||
func (ep *Endpoint) enterFutexWait() error {
|
||||
switch eps := ep.ctrl.state.Add(epsBlocked); eps {
|
||||
case epsBlocked:
|
||||
return nil
|
||||
case epsBlocked | epsShutdown:
|
||||
ep.ctrl.state.Add(-epsBlocked)
|
||||
return ShutdownError{}
|
||||
default:
|
||||
// Most likely due to ep.enterFutexWait() being called concurrently
|
||||
// from multiple goroutines.
|
||||
panic(fmt.Sprintf("invalid flipcall.Endpoint.ctrl.state before flipcall.Endpoint.enterFutexWait(): %v", eps-epsBlocked))
|
||||
}
|
||||
}
|
||||
|
||||
func (ep *Endpoint) exitFutexWait() {
|
||||
switch eps := ep.ctrl.state.Add(-epsBlocked); eps {
|
||||
case 0:
|
||||
return
|
||||
case epsShutdown:
|
||||
// ep.ctrlShutdown() was called while we were blocked, so we are
|
||||
// responsible for indicating connection shutdown.
|
||||
ep.shutdownConn()
|
||||
default:
|
||||
panic(fmt.Sprintf("invalid flipcall.Endpoint.ctrl.state after flipcall.Endpoint.exitFutexWait(): %v", eps+epsBlocked))
|
||||
}
|
||||
}
|
||||
|
||||
func (ep *Endpoint) ctrlShutdown() {
|
||||
// Set epsShutdown to ensure that future calls to ep.enterFutexWait() fail.
|
||||
if ep.ctrl.state.Add(epsShutdown)&epsBlocked != 0 {
|
||||
// Wake the blocked thread. This must loop because it's possible that
|
||||
// FUTEX_WAKE occurs after the waiter sets epsBlocked, but before it
|
||||
// blocks in FUTEX_WAIT.
|
||||
for {
|
||||
// Wake MaxInt32 threads to prevent a broken or malicious peer from
|
||||
// swallowing our wakeup by FUTEX_WAITing from multiple threads.
|
||||
if err := ep.futexWakeConnState(math.MaxInt32); err != nil {
|
||||
log.Warningf("failed to FUTEX_WAKE Endpoints: %v", err)
|
||||
break
|
||||
}
|
||||
yieldThread()
|
||||
if ep.ctrl.state.Load()&epsBlocked == 0 {
|
||||
break
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// There is no blocked thread, so we are responsible for indicating
|
||||
// connection shutdown.
|
||||
ep.shutdownConn()
|
||||
}
|
||||
}
|
||||
|
||||
func (ep *Endpoint) shutdownConn() {
|
||||
switch cs := ep.connState().Swap(csShutdown); cs {
|
||||
case ep.activeState:
|
||||
if err := ep.futexWakeConnState(1); err != nil {
|
||||
log.Warningf("failed to FUTEX_WAKE peer Endpoint for shutdown: %v", err)
|
||||
}
|
||||
case ep.inactiveState:
|
||||
// The peer is currently active and will detect shutdown when it tries
|
||||
// to update the connection state.
|
||||
case csShutdown:
|
||||
// The peer also called Endpoint.Shutdown().
|
||||
default:
|
||||
log.Warningf("unexpected connection state before Endpoint.shutdownConn(): %v", cs)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue