]> git.ipfire.org Git - thirdparty/wireguard-go.git/commit
conn: fix StdNetEndpoint data race by dynamically allocating endpoints
authorJordan Whited <jordan@tailscale.com>
Thu, 23 Mar 2023 23:57:21 +0000 (16:57 -0700)
committerJason A. Donenfeld <Jason@zx2c4.com>
Fri, 24 Mar 2023 13:37:13 +0000 (14:37 +0100)
commit334b605e726db70fdba2740ba2b48fd72490cc44
tree1bb65e183cb44e276026542450900ac7f72bad35
parent3a9e75374f434e4cebadb6cfb322be3e2e80d0f0
conn: fix StdNetEndpoint data race by dynamically allocating endpoints

In 9e2f386 ("conn, device, tun: implement vectorized I/O on Linux"), the
Linux-specific Bind implementation was collapsed into StdNetBind. This
introduced a race on StdNetEndpoint from getSrcFromControl() and
setSrcControl().

Remove the sync.Pool involved in the race, and simplify StdNetBind's
receive path to allocate StdNetEndpoint on the heap instead, with the
intent for it to be cleaned up by the GC, later. This essentially
reverts ef5c587 ("conn: remove the final alloc per packet receive"),
adding back that allocation, unfortunately.

This does slightly increase resident memory usage in higher throughput
scenarios. StdNetBind is the only Bind implementation that was using
this Endpoint recycling technique prior to this commit.

This is considered a stop-gap solution, and there are plans to replace
the allocation with a better mechanism.

Reported-by: lsc <lsc@lv6.tw>
Link: https://lore.kernel.org/wireguard/ac87f86f-6837-4e0e-ec34-1df35f52540e@lv6.tw/
Fixes: 9e2f386 ("conn, device, tun: implement vectorized I/O on Linux")
Cc: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: James Tucker <james@tailscale.com>
Signed-off-by: Jordan Whited <jordan@tailscale.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
conn/bind_std.go