Tc

Author: msune

test/cni/Makefile

@@ -107,7 +107,7 @@ _check_perf_gso:
 	$(QUIET) echo "Adjusting GSO (DISABLE_GSO=$(DISABLE_GSO))..."
 	$(QUIET) $(MAKE) _adjust_gso
 	$(QUIET) echo "Launching $(CMD) tests..."
-	$(QUIET) DISABLE_GSO=$(DISABLE_GSO) DEBUG=1 NETNS=client python3 perf/check_perf.py $(CMD)
+	$(QUIET) DISABLE_GSO=$(DISABLE_GSO) DEBUG=1 NETNS=client sudo -E python3 perf/check_perf.py $(CMD)
 
 _gen_perf_reports:
 	$(QUIET) python3 perf/gen_report.py .$(REPORT)_report_nogso.json "$(REPORT) tests (TSO/GSO=off)"
@@ -140,13 +140,19 @@ check_perf_iperf: _wait_up _wait_running
 	$(QUIET) $(MAKE) _deploy
 	$(QUIET) $(MAKE) _gen_perf_reports REPORT=iperf
 
-_check_perf_mtu:
-	$(QUIET) echo "Adjusting GSO (DISABLE_GSO=$(DISABLE_GSO))..."
-	$(QUIET) $(MAKE) _adjust_gso
-	$(QUIET) echo "Launching iperf tests..."
-	$(QUIET) sudo ip netns exec client wget DISABLE_GSO=$(DISABLE_GSO) DEBUG=1 NETNS=client python3 perf/check_perf.py
-
 check_perf_requests: _wait_up _wait_running
+	$(QUIET) echo "Checking perf with GSO..."
+	$(QUIET) DISABLE_GSO=0 $(MAKE) _check_perf_gso CMD=requests
+	$(QUIET) echo "Checking perf without GSO..."
+	$(QUIET) DISABLE_GSO=1 $(MAKE) _check_perf_gso CMD=requests
+	$(QUIET) echo "Unloading NDEBUG sfunnel in NS..."
+	$(QUIET) $(MAKE) _unload
+	$(QUIET) echo "Loading DEBUG sfunnel in NS..."
+	$(QUIET) $(MAKE) _load
+	$(QUIET) echo "Restoring nginx..."
+	$(QUIET) $(MAKE) _deploy
+	$(QUIET) $(MAKE) _gen_perf_reports REPORT=requests
+	exit 11
 	$(QUIET) echo "Unloading DEBUG sfunnel in NS..."
 	$(QUIET) $(MAKE) _unload
 	$(QUIET) echo "Loading NDEBUG sfunnel in NS..."
@@ -167,14 +173,3 @@ check_perf_requests: _wait_up _wait_running
 	         done;
 	$(QUIET) echo "Workaround lingering old conntrack (metallb/kubeproxy bug?)..."
 	$(QUIET) for NODE in $$(minikube node list | awk '{print $$1}'); do minikube ssh -n $${NODE} "sudo conntrack -F"; done;
-	$(QUIET) echo "Checking perf with GSO..."
-	$(QUIET) DISABLE_GSO=0 $(MAKE) _check_perf_gso CMD=wget
-	$(QUIET) echo "Checking perf without GSO..."
-	$(QUIET) DISABLE_GSO=1 $(MAKE) _check_perf_gso CMD=wget
-	$(QUIET) echo "Unloading NDEBUG sfunnel in NS..."
-	$(QUIET) $(MAKE) _unload
-	$(QUIET) echo "Loading DEBUG sfunnel in NS..."
-	$(QUIET) $(MAKE) _load
-	$(QUIET) echo "Restoring nginx..."
-	$(QUIET) $(MAKE) _deploy
-	$(QUIET) $(MAKE) _gen_perf_reports REPORT=wget

test/cni/perf/check_perf.py

@@ -1,12 +1,19 @@
 import argparse
 import json
 import os
+from pyroute2 import netns
 import re
 import requests
 import subprocess
 import sys
 import time
 
+def set_ns():
+    ns_name = os.getenv('NETNS')
+    if not ns_name:
+        return
+    netns.setns(ns_name)
+
 def get_lb_ip():
     return subprocess.getoutput(
         "minikube kubectl -- get service my-loadbalancer-service -o jsonpath='{.status.loadBalancer.ingress[0].ip}'"
@@ -25,8 +32,6 @@ def check_perf_iperf(test_name, fqdn, results, target_ports, src_ips=[]):
     debug = int(os.getenv('DEBUG', 0)) == 1
     mss = 1500 - 40 - 20 #IP+TCP overhead + funneling TCP overhead
     CMD = f"iperf --mss {mss} -f m"
-    if os.getenv('NETNS'):
-        CMD = f"sudo ip netns exec {os.getenv('NETNS')} " + CMD
     total_throughput = 0
     print(f"[{test_name}] Starting {N_WORKERS} workers against '{fqdn}' with target_ports='{target_ports}', src_ips='{src_ips}'")
 
@@ -64,12 +69,15 @@ def check_perf_iperf(test_name, fqdn, results, target_ports, src_ips=[]):
 
 def check_perf_requests(test_name, fqdn, results, port):
     fqdn = "http://"+fqdn+":"+str(port)+"/testfile.bin"
+
+    print(f"{fqdn}")
+
     start = time.time()
     r = requests.get(fqdn, stream=True)
     total = sum(len(chunk) for chunk in r.iter_content(8192))
     elapsed = time.time() - start
-    throughput = (total * 8) / 1e6 / elapsed
 
+    throughput = (total * 8) / 1e6 / elapsed
     results[test_name] = {
         'number_of_workers': 1,
         'total_throughput': throughput,
@@ -87,6 +95,9 @@ def main():
     LB_IP = get_lb_ip()
     results = {}
 
+    # Enter the right NS first
+    set_ns()
+
     if args.command == "iperf":
         results = check_perf_iperf("test_port_80 (calibration)", LB_IP, results, [80])
         results = check_perf_iperf("test_port_8080", LB_IP, results, [8080])