netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

netstack: make GRO timeout configurable in tcp_benchmark

Browse Source 
Also: don't turn of GRO when --disable-linux-gso is set.
PiperOrigin-RevId: 487346882
This commit is contained in:
Kevin Krakauer
2022-11-09 14:25:57 -08:00
committed by gVisor bot
parent 434cdd398d
commit 935f29ce6e
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/benchmarks/tcp/tcp_benchmark.sh
+11 -4
View File
@@ -47,6 +47,7 @@ helper_dir="$(dirname "$0")"
netstack_opts=
disable_linux_gso=
disable_linux_gro=
gro=0
num_client_threads=1
# Check for netem support.
@@ -156,6 +157,11 @@ while [[ $# -gt 0 ]]; do
--disable-linux-gro)
disable_linux_gro=1
;;
--gro)
shift
[[ "$#" -le 0 ]] && echo "no GRO timeout provided" && exit 1
gro=$1
;;
--ipv6)
client_addr=fd::1
client_proxy_addr=fd::2
@@ -176,6 +182,8 @@ while [[ $# -gt 0 ]]; do
helper_dir=$1
;;
*)
echo "unknown option: $1"
echo ""
echo "usage: $0 [options]"
echo "options:"
echo " --help show this message"
@@ -197,6 +205,7 @@ while [[ $# -gt 0 ]]; do
echo " --num-client-threads number of parallel client threads to run"
echo " --disable-linux-gso disable segmentation offload (TSO, GSO, GRO) in the Linux network stack"
echo " --disable-linux-gro disable GRO in the Linux network stack"
echo " --gro set gVisor GRO timeout"
echo " --ipv6 use ipv6 for benchmarks"
echo ""
echo "The output will of the script will be:"
@@ -246,7 +255,7 @@ if ${client}; then
# and forward traffic using netstack.
client_args="${proxy_binary} ${netstack_opts} -port ${proxy_port} -client \\
-mtu ${mtu} -iface client.0 -addr ${client_proxy_addr} -mask ${mask} \\
-forward ${full_server_proxy_addr} -gso=${gso} -swgso=${swgso}"
-forward ${full_server_proxy_addr} -gso=${gso} -swgso=${swgso} --gro=${gro}"
fi
# Server proxy that will listen on the proxy port and forward to the server's
@@ -257,7 +266,7 @@ if ${server}; then
# iperf server using netstack.
server_args="${proxy_binary} ${netstack_opts} -port ${proxy_port} -server \\
-mtu ${mtu} -iface server.0 -addr ${server_proxy_addr} -mask ${mask} \\
-forward ${full_server_addr} -gso=${gso} -swgso=${swgso}"
-forward ${full_server_addr} -gso=${gso} -swgso=${swgso} --gro=${gro}"
fi
# Specify loss and duplicate parameters only if they are non-zero
@@ -355,10 +364,8 @@ ${nsjoin_binary} /tmp/server.netns ip addr add ${server_addr}/${mask} dev server
if [[ "${disable_linux_gso}" == "1" ]]; then
${nsjoin_binary} /tmp/client.netns ethtool -K client.0 tso off
${nsjoin_binary} /tmp/client.netns ethtool -K client.0 gso off
${nsjoin_binary} /tmp/client.netns ethtool -K client.0 gro off
${nsjoin_binary} /tmp/server.netns ethtool -K server.0 tso off
${nsjoin_binary} /tmp/server.netns ethtool -K server.0 gso off
${nsjoin_binary} /tmp/server.netns ethtool -K server.0 gro off
fi
if [[ "${disable_linux_gro}" == "1" ]]; then
${nsjoin_binary} /tmp/client.netns ethtool -K client.0 gro off
test/benchmarks/tcp/tcp_proxy.go
+3 -1
View File
@@ -63,6 +63,7 @@ var (
cubic = flag.Bool("cubic", false, "enable use of CUBIC congestion control for netstack")
gso = flag.Int("gso", 0, "GSO maximum size")
swgso = flag.Bool("swgso", false, "gVisor-level GSO")
gro = flag.Duration("gro", 0, "gVisor-level GRO timeout")
clientTCPProbeFile = flag.String("client_tcp_probe_file", "", "if specified, installs a tcp probe to dump endpoint state to the specified file.")
serverTCPProbeFile = flag.String("server_tcp_probe_file", "", "if specified, installs a tcp probe to dump endpoint state to the specified file.")
cpuprofile = flag.String("cpuprofile", "", "write cpu profile to the specified file.")
@@ -224,8 +225,9 @@ func newNetstackImpl(mode string) (impl, error) {
if err != nil {
return nil, fmt.Errorf("failed to create FD endpoint: %v", err)
}
qDisc := fifo.New(ep, runtime.GOMAXPROCS(0), 1000)
opts := stack.NICOptions{QDisc: qDisc}
opts := stack.NICOptions{QDisc: qDisc, GROTimeout: *gro}
if err := s.CreateNICWithOptions(nicID, ep, opts); err != nil {
return nil, fmt.Errorf("error creating NIC %q: %v", *iface, err)
}