TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-21 04:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "wgengine/netstack: use buffer pools for UDP packet forwarding"

Browse Source 
This reverts commit fb2f3e474134302ac01b2d5a41da32883d0e1e97.

Signed-off-by: Val <valerie@tailscale.com>
This commit is contained in:
Val 2023-09-22 19:45:07 +02:00 committed by valscale
parent 6cc5b272d8
commit 08302c0731
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wgengine/netstack/netstack.go
View File

@ -1059,15 +1059,10 @@ func (ns *Impl) acceptUDP(r *udp.ForwarderRequest) {
go ns.forwardUDP(c, srcAddr, dstAddr) go ns.forwardUDP(c, srcAddr, dstAddr)
} }
// Buffer pool for forwarding UDP packets.
var udpBufPool = &sync.Pool{
New: func() any {
b := make([]byte, maxUDPPacketSize)
return &b
},
}
func (ns *Impl) handleMagicDNSUDP(srcAddr netip.AddrPort, c *gonet.UDPConn) { func (ns *Impl) handleMagicDNSUDP(srcAddr netip.AddrPort, c *gonet.UDPConn) {
// In practice, implementations are advised not to exceed 512 bytes
// due to fragmenting. Just to be sure, we bump all the way to the MTU.
var maxUDPReqSize = tstun.DefaultMTU()
// Packets are being generated by the local host, so there should be // Packets are being generated by the local host, so there should be
// very, very little latency. 150ms was chosen as something of an upper // very, very little latency. 150ms was chosen as something of an upper
// bound on resource usage, while hopefully still being long enough for // bound on resource usage, while hopefully still being long enough for
@ -1075,10 +1070,7 @@ func (ns *Impl) handleMagicDNSUDP(srcAddr netip.AddrPort, c *gonet.UDPConn) {
const readDeadline = 150 * time.Millisecond const readDeadline = 150 * time.Millisecond
defer c.Close() defer c.Close()
q := make([]byte, maxUDPReqSize)
bufp := udpBufPool.Get().(*[]byte)
defer udpBufPool.Put(bufp)
q := *bufp
// libresolv from glibc is quite adamant that transmitting multiple DNS // libresolv from glibc is quite adamant that transmitting multiple DNS
// requests down the same UDP socket is valid. To support this, we read // requests down the same UDP socket is valid. To support this, we read
@ -1191,11 +1183,7 @@ func startPacketCopy(ctx context.Context, cancel context.CancelFunc, dst net.Pac
} }
go func() { go func() {
defer cancel() // tear down the other direction's copy defer cancel() // tear down the other direction's copy
pkt := make([]byte, maxUDPPacketSize)
bufp := udpBufPool.Get().(*[]byte)
defer udpBufPool.Put(bufp)
pkt := *bufp
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():