mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-27 14:21:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: start peer relay path discovery sooner (#17485)

Browse Source 
This commit also shuffles the hasPeerRelayServers atomic load
to happen sooner, reducing the cost for clients with no peer relay
servers.

Updates tailscale/corp#33099

Signed-off-by: Jordan Whited <jordan@tailscale.com>
This commit is contained in:
Jordan Whited 2025-10-08 09:53:32 -07:00 committed by GitHub
parent 9a72513fa4
commit 4543ea5c8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wgengine/magicsock/endpoint.go
View File

@ -879,14 +879,6 @@ func (de *endpoint) setHeartbeatDisabled(v bool) {
// discoverUDPRelayPathsLocked starts UDP relay path discovery. // discoverUDPRelayPathsLocked starts UDP relay path discovery.
func (de *endpoint) discoverUDPRelayPathsLocked(now mono.Time) { func (de *endpoint) discoverUDPRelayPathsLocked(now mono.Time) {
if !de.c.hasPeerRelayServers.Load() {
// Changes in this value between its access and the logic following
// are fine, we will eventually do the "right" thing during future path
// discovery. The worst case is we suppress path discovery for the
// current cycle, or we unnecessarily call into [relayManager] and do
// some wasted work.
return
}
de.lastUDPRelayPathDiscovery = now de.lastUDPRelayPathDiscovery = now
lastBest := de.bestAddr lastBest := de.bestAddr
lastBestIsTrusted := mono.Now().Before(de.trustBestAddrUntil) lastBestIsTrusted := mono.Now().Before(de.trustBestAddrUntil)
@ -899,6 +891,14 @@ func (de *endpoint) wantUDPRelayPathDiscoveryLocked(now mono.Time) bool {
if runtime.GOOS == "js" { if runtime.GOOS == "js" {
return false return false
} }
if !de.c.hasPeerRelayServers.Load() {
// Changes in this value between its access and a call to
// [endpoint.discoverUDPRelayPathsLocked] are fine, we will eventually
// do the "right" thing during future path discovery. The worst case is
// we suppress path discovery for the current cycle, or we unnecessarily
// call into [relayManager] and do some wasted work.
return false
}
if !de.relayCapable { if !de.relayCapable {
return false return false
} }
@ -1013,14 +1013,18 @@ func (de *endpoint) discoPing(res *ipnstate.PingResult, size int, cb func(*ipnst
// order to also try all candidate direct paths. // order to also try all candidate direct paths.
fallthrough fallthrough
default: default:
// Ping all candidate direct paths. This work overlaps with what // Ping all candidate direct paths and start peer relay path discovery,
// [de.heartbeat] will periodically fire when it calls // if appropriate. This work overlaps with what [de.heartbeat] will
// [de.sendDiscoPingsLocked], but a user-initiated [pingCLI] is a // periodically fire when it calls [de.sendDiscoPingsLocked] and
// "do it now" operation that should not be subject to // [de.discoveryUDPRelayPathsLocked], but a user-initiated [pingCLI] is
// a "do it now" operation that should not be subject to
// [heartbeatInterval] tick or [discoPingInterval] rate-limiting. // [heartbeatInterval] tick or [discoPingInterval] rate-limiting.
for ep := range de.endpointState { for ep := range de.endpointState {
de.startDiscoPingLocked(epAddr{ap: ep}, now, pingCLI, size, resCB) de.startDiscoPingLocked(epAddr{ap: ep}, now, pingCLI, size, resCB)
} }
if de.wantUDPRelayPathDiscoveryLocked(now) {
de.discoverUDPRelayPathsLocked(now)
}
} }
} }
@ -1046,14 +1050,10 @@ func (de *endpoint) send(buffs [][]byte, offset int) error {
} }
} else if !udpAddr.isDirect() || now.After(de.trustBestAddrUntil) { } else if !udpAddr.isDirect() || now.After(de.trustBestAddrUntil) {
de.sendDiscoPingsLocked(now, true) de.sendDiscoPingsLocked(now, true)
if de.wantUDPRelayPathDiscoveryLocked(now) {
de.discoverUDPRelayPathsLocked(now)
}
} }
// TODO(jwhited): consider triggering UDP relay path discovery here under
// certain conditions. We currently only trigger it in heartbeat(), which
// is both good and bad. It's good because the first heartbeat() tick is 3s
// after the first packet, which gives us time to discover a UDP direct
// path and potentially avoid what would be wasted UDP relay path discovery
// work. It's bad because we might not discover a UDP direct path, and we
// incur a 3s delay before we try to discover a UDP relay path.
de.noteTxActivityExtTriggerLocked(now) de.noteTxActivityExtTriggerLocked(now)
de.lastSendAny = now de.lastSendAny = now
de.mu.Unlock() de.mu.Unlock()