mirror of
https://github.com/soypat/lneto.git
synced 2026-09-08 15:59:10 +00:00
80ea9256e7
* fix(xnet): make blocking waits deadline-driven instead of iteration-capped
All six StackBlocking wait loops run 'for range maxIter' (1000). With a
non-sleeping backoff like BackoffFlagGosched, the sensible choice on
GOMAXPROCS=1 targets where sleeping starves the NIC poll, those 1000
iterations complete in ~20ms of wall time and silently replace the
caller's timeout: a dial with the default 2s timeout fails after ~21ms
with a spurious deadline error against any peer slower than that.
Observed dialing github.com from a single-core bare-metal (tamago)
target through go-net.
The deadline check inside every loop is the real guard, so it becomes the
loop condition itself and keeps the bounded lifetime visible on the for
statement:
for ok := true; ok; ok = s.checkDeadline(deadline) == nil {
DoDHCPv4 loses its separate deadline branch as a result. It used to check
only on iterations without a state change, which without the iteration
cap would let a peer that keeps feeding state transitions hold the loop
past any deadline; from the header the check runs every iteration.
The regression test drives a dial through 4000 no-progress wait
iterations on simulated time (<5% of the deadline elapsed) and requires
establishment once the handshake is finally serviced; on current main it
fails at exactly iteration 1000.
* go fix
---------
Co-authored-by: Derek den Haas <d.haas@directcode.com>
224 lines
5.7 KiB
Go
224 lines
5.7 KiB
Go
package xnet
|
|
|
|
import (
|
|
"errors"
|
|
"net"
|
|
"net/netip"
|
|
"time"
|
|
|
|
"github.com/soypat/lneto"
|
|
"github.com/soypat/lneto/dhcp/dhcpv4"
|
|
"github.com/soypat/lneto/dns"
|
|
"github.com/soypat/lneto/tcp"
|
|
)
|
|
|
|
// Blocking waits below are bounded by their deadline instead of an iteration
|
|
// count: with a non-sleeping backoff such as [lneto.BackoffFlagGosched] a cap
|
|
// of N spins expires well before the caller's timeout (~20ms for the former
|
|
// 1000 iterations), so the timeout argument had no effect.
|
|
|
|
var (
|
|
errDeadlineExceed = errors.New("cywnet: deadline exceeded")
|
|
)
|
|
|
|
func (s *StackAsync) StackBlocking(stackProtoBackoff lneto.BackoffStrategy) StackBlocking {
|
|
if stackProtoBackoff == nil {
|
|
panic("nil backoff to StackBlocking")
|
|
}
|
|
return StackBlocking{
|
|
async: s,
|
|
_backoff: stackProtoBackoff,
|
|
}
|
|
}
|
|
|
|
type StackBlocking struct {
|
|
async *StackAsync
|
|
_backoff lneto.BackoffStrategy
|
|
_nanotime func() int64
|
|
}
|
|
|
|
func (s StackBlocking) nanotime() int64 {
|
|
if s._nanotime != nil {
|
|
return s._nanotime()
|
|
}
|
|
return time.Now().UnixNano()
|
|
}
|
|
|
|
func (s StackBlocking) deadlineTO(timeout time.Duration) int64 {
|
|
return int64(timeout) + s.nanotime()
|
|
}
|
|
|
|
func (s StackBlocking) DoDHCPv4(reqAddr [4]byte, timeout time.Duration) (*DHCPResults, error) {
|
|
err := s.async.StartDHCPv4Request(reqAddr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var backoffs uint
|
|
deadline := s.deadlineTO(timeout)
|
|
requested := false
|
|
var lastState dhcpv4.ClientState
|
|
for ok := true; ok; ok = s.checkDeadline(deadline) == nil {
|
|
s.async.mu.Lock()
|
|
state := s.async.dhcp.State()
|
|
s.async.mu.Unlock()
|
|
if state == lastState {
|
|
s.backoff(backoffs)
|
|
backoffs++
|
|
continue
|
|
}
|
|
// State change indicates something happened.
|
|
backoffs = 0
|
|
lastState = state
|
|
requested = requested || state > dhcpv4.StateInit
|
|
if requested && state == dhcpv4.StateInit {
|
|
return nil, errors.New("DHCP NACK")
|
|
} else if state == dhcpv4.StateBound {
|
|
return s.async.ResultDHCP() // DHCP done succesfully.
|
|
}
|
|
}
|
|
return nil, errDeadlineExceed
|
|
}
|
|
|
|
func (s StackBlocking) DoPing(hostAddr netip.Addr, timeout time.Duration) (roundtrip time.Duration, err error) {
|
|
if !hostAddr.Is4() {
|
|
return 0, lneto.ErrInvalidAddr
|
|
}
|
|
var buf [16]byte
|
|
s.async.mu.Lock()
|
|
s.async.prandRead(buf[:])
|
|
key, err := s.async.icmp.PingStart(hostAddr.As4(), buf[:], 56) // size=56 so ICMP size is 64, like linux.
|
|
s.async.mu.Unlock()
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
start := time.Now()
|
|
var backoffs uint
|
|
for ok := true; ok; ok = time.Since(start) <= timeout {
|
|
s.async.mu.Lock()
|
|
completed, exists := s.async.icmp.PingPop(key)
|
|
s.async.mu.Unlock()
|
|
if !exists {
|
|
return 0, net.ErrClosed // lneto.ErrAborted
|
|
} else if completed {
|
|
return time.Since(start), nil
|
|
}
|
|
s.backoff(backoffs)
|
|
backoffs++
|
|
}
|
|
return 0, errDeadlineExceed
|
|
}
|
|
|
|
func (s StackBlocking) DoNTP(hostAddr netip.Addr, timeout time.Duration) (offset time.Duration, err error) {
|
|
err = s.async.StartNTP(hostAddr)
|
|
if err != nil {
|
|
return -1, err
|
|
}
|
|
|
|
deadline := s.deadlineTO(timeout)
|
|
var done bool
|
|
var backoffs uint
|
|
for ok := true; ok; ok = s.checkDeadline(deadline) == nil {
|
|
offset, done = s.async.ResultNTPOffset()
|
|
if done {
|
|
return offset, nil
|
|
}
|
|
s.backoff(backoffs)
|
|
backoffs++
|
|
}
|
|
return -1, errDeadlineExceed
|
|
}
|
|
|
|
func (s StackBlocking) DoResolveHardwareAddress6(addr netip.Addr, timeout time.Duration) (hw [6]byte, err error) {
|
|
err = s.async.StartResolveHardwareAddress6(addr)
|
|
if err != nil {
|
|
return hw, err
|
|
}
|
|
var backoffs uint
|
|
deadline := s.deadlineTO(timeout)
|
|
for ok := true; ok; ok = s.checkDeadline(deadline) == nil {
|
|
hw, err = s.async.ResultResolveHardwareAddress6(addr)
|
|
if err == nil {
|
|
break
|
|
}
|
|
s.backoff(backoffs)
|
|
backoffs++
|
|
}
|
|
if err != nil {
|
|
err = errDeadlineExceed // Loop only ends on the deadline; err is stale.
|
|
}
|
|
ip4 := addr.As4()
|
|
s.async.arp.CacheRemove(ip4[:])
|
|
return hw, err
|
|
}
|
|
|
|
func (s StackBlocking) DoLookupIP(host string, timeout time.Duration) (addrs []netip.Addr, err error) {
|
|
return s.DoLookupIPType(host, timeout, dns.TypeA)
|
|
}
|
|
|
|
// DoLookupIPType resolves host for the given record type (dns.TypeA or dns.TypeAAAA),
|
|
// blocking until a response arrives or the timeout elapses.
|
|
func (s StackBlocking) DoLookupIPType(host string, timeout time.Duration, qtype dns.Type) (addrs []netip.Addr, err error) {
|
|
err = s.async.StartLookupIPType(host, qtype)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
deadline := s.deadlineTO(timeout)
|
|
var backoffs uint
|
|
for ok := true; ok; ok = s.checkDeadline(deadline) == nil {
|
|
addrs, completed, err := s.async.ResultLookupIP(host)
|
|
if completed {
|
|
return addrs, err
|
|
}
|
|
s.backoff(backoffs)
|
|
backoffs++
|
|
}
|
|
return nil, errDeadlineExceed
|
|
}
|
|
|
|
var errTCPFailedToConnect = errors.New("tcp failed to connect")
|
|
|
|
func (s StackBlocking) DoDialTCP(conn *tcp.Conn, localPort uint16, addrp netip.AddrPort, timeout time.Duration) (err error) {
|
|
err = s.async.DialTCP(conn, localPort, addrp)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = s.waitDialTCP(conn, timeout)
|
|
if err != nil {
|
|
conn.Abort()
|
|
}
|
|
return err
|
|
}
|
|
|
|
func (s StackBlocking) waitDialTCP(conn *tcp.Conn, timeout time.Duration) (err error) {
|
|
deadline := s.deadlineTO(timeout)
|
|
var backoffs uint
|
|
for ok := true; ok; ok = s.checkDeadline(deadline) == nil {
|
|
state := conn.State()
|
|
if state == tcp.StateEstablished {
|
|
return nil
|
|
} else if state != tcp.StateSynSent && state != tcp.StateSynRcvd && !conn.AwaitingSynSend() {
|
|
// Unexpected state, abort and terminate connection.
|
|
return errTCPFailedToConnect
|
|
}
|
|
s.backoff(backoffs)
|
|
backoffs++
|
|
}
|
|
return errDeadlineExceed
|
|
}
|
|
|
|
func (s StackBlocking) checkDeadline(deadline int64) error {
|
|
if s.nanotime() > deadline {
|
|
return errDeadlineExceed
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s StackBlocking) backoff(consecutiveBackoffs uint) {
|
|
backoff(s._backoff, consecutiveBackoffs)
|
|
}
|
|
|
|
func backoff(bo lneto.BackoffStrategy, consecutiveBackoffs uint) {
|
|
bo.Do(consecutiveBackoffs)
|
|
}
|