Обновление снапшота с v0.0.0-20250811.0 на пин, которого требует sing-box после мержа 235 коммитов (upstream d620bbbf2 "Update gvisor to 20260727.0"). Прежний снапшот был взят 2026-08-04 ровно с той версии, на которой тогда стоял апстрим; разрыв возник 2026-08-05 вместе с его бампом. За год апстрим-gvisor изменил ~14 000 строк в 292 файлах. Значимое для нас — сетевой стек: tcp/connect.go (PMTU-discovery + исправление начального RTT/RTO: раньше задержка ACK внутри стека завышала стартовый таймаут на несколько RTT), tcp/snd.go, tcp/rcv.go, stack/conntrack.go, stack/packet_buffer.go. Всего 30 файлов в TCP и 37 в stack. Баг SPEC 048 апстрим НЕ исправил — проверено по коду новой версии: handleConnecting по-прежнему проверяет состояние endpoint'а, но не ep.h, а performHandshake так же зануляет h и отпускает мьютекс до Close(). Поэтому guard перенесён (12 строк) вместе со своим тестом (45 строк). Red/green проверен на новой базе: без guard'а тест падает с той же nil-паникой, что в полевом крашдампе; с ним зелёный.
131 lines
3.8 KiB
Go
131 lines
3.8 KiB
Go
// Copyright 2018 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 hostarch
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
// Addr represents an address in an unspecified address space.
|
|
//
|
|
// +stateify savable
|
|
type Addr uintptr
|
|
|
|
// AddLength adds the given length to start and returns the result. ok is true
|
|
// iff adding the length did not overflow the range of Addr.
|
|
//
|
|
// Note: This function is usually used to get the end of an address range
|
|
// defined by its start address and length. Since the resulting end is
|
|
// exclusive, end == 0 is technically valid, and corresponds to a range that
|
|
// extends to the end of the address space, but ok will be false. This isn't
|
|
// expected to ever come up in practice.
|
|
func (v Addr) AddLength(length uint64) (end Addr, ok bool) {
|
|
end = v + Addr(length)
|
|
// As of this writing (Go 1.21), addrAtLeast64b is required to prevent the
|
|
// compiler from generating a tautological `length <= MaxUint64` check on
|
|
// 64-bit architectures.
|
|
ok = end >= v && (addrAtLeast64b || length <= uint64(^Addr(0)))
|
|
return
|
|
}
|
|
|
|
// RoundDown is equivalent to function PageRoundDown.
|
|
func (v Addr) RoundDown() Addr {
|
|
return PageRoundDown(v)
|
|
}
|
|
|
|
// RoundUp is equivalent to function PageRoundUp.
|
|
func (v Addr) RoundUp() (Addr, bool) {
|
|
return PageRoundUp(v)
|
|
}
|
|
|
|
// MustRoundUp is equivalent to function MustPageRoundUp.
|
|
func (v Addr) MustRoundUp() Addr {
|
|
return MustPageRoundUp(v)
|
|
}
|
|
|
|
// HugeRoundDown is equivalent to function HugePageRoundDown.
|
|
func (v Addr) HugeRoundDown() Addr {
|
|
return HugePageRoundDown(v)
|
|
}
|
|
|
|
// HugeRoundUp is equivalent to function HugePageRoundUp.
|
|
func (v Addr) HugeRoundUp() (Addr, bool) {
|
|
return HugePageRoundUp(v)
|
|
}
|
|
|
|
// MustHugeRoundUp is equivalent to function MustHugePageRoundUp.
|
|
func (v Addr) MustHugeRoundUp() Addr {
|
|
return MustHugePageRoundUp(v)
|
|
}
|
|
|
|
// PageOffset is equivalent to function PageOffset, except that it casts the
|
|
// result to uint64.
|
|
func (v Addr) PageOffset() uint64 {
|
|
return uint64(PageOffset(v))
|
|
}
|
|
|
|
// IsPageAligned is equivalent to function IsPageAligned.
|
|
func (v Addr) IsPageAligned() bool {
|
|
return IsPageAligned(v)
|
|
}
|
|
|
|
// HugePageOffset is equivalent to function HugePageOffset.
|
|
func (v Addr) HugePageOffset() uint64 {
|
|
return uint64(HugePageOffset(v))
|
|
}
|
|
|
|
// IsHugePageAligned is equivalent to function IsHugePageAligned.
|
|
func (v Addr) IsHugePageAligned() bool {
|
|
return IsHugePageAligned(v)
|
|
}
|
|
|
|
// AddrRange is a range of Addrs.
|
|
//
|
|
// type AddrRange <generated by go_generics>
|
|
|
|
// ToRange returns [v, v+length).
|
|
func (v Addr) ToRange(length uint64) (AddrRange, bool) {
|
|
end, ok := v.AddLength(length)
|
|
return AddrRange{v, end}, ok
|
|
}
|
|
|
|
// MustToRange is equivalent to ToRange, but panics if the end of the range
|
|
// wraps around.
|
|
//
|
|
//go:nosplit
|
|
func (v Addr) MustToRange(length uint64) AddrRange {
|
|
ar, ok := v.ToRange(length)
|
|
if !ok {
|
|
panic("hostarch.Addr.ToRange() wraps")
|
|
}
|
|
return ar
|
|
}
|
|
|
|
// IsPageAligned returns true if ar.Start.IsPageAligned() and
|
|
// ar.End.IsPageAligned().
|
|
func (ar AddrRange) IsPageAligned() bool {
|
|
return ar.Start.IsPageAligned() && ar.End.IsPageAligned()
|
|
}
|
|
|
|
// IsHugePageAligned returns true if ar.Start.IsHugePageAligned() and
|
|
// ar.End.IsHugePageAligned().
|
|
func (ar AddrRange) IsHugePageAligned() bool {
|
|
return ar.Start.IsHugePageAligned() && ar.End.IsHugePageAligned()
|
|
}
|
|
|
|
// String implements fmt.Stringer.String.
|
|
func (ar AddrRange) String() string {
|
|
return fmt.Sprintf("[%#x, %#x)", ar.Start, ar.End)
|
|
}
|