Skip to content

Commit

Permalink
Make perf iso exps the same
Browse files Browse the repository at this point in the history
  • Loading branch information
@stolet
stolet committed Apr 19, 2023
1 parent c828662 commit 16eb312
Show file tree
Hide file tree
Showing 32 changed files with 255 additions and 209 deletions.
3 changes: 3 additions & 0 deletions experiments/components/vm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ def enable_hugepages(self):

def enable_noiommu(self, vendor_id):
self.pane.send_keys("sudo su -")
time.sleep(1)
self.pane.send_keys("sudo echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode")
time.sleep(1)
self.pane.send_keys("sudo echo {} > /sys/bus/pci/drivers/vfio-pci/new_id".format(vendor_id))
time.sleep(1)
self.pane.send_keys("exit")
time.sleep(1)

Expand Down
10 changes: 5 additions & 5 deletions experiments/exps/perf_iso_latconn/configs/bare_tas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ def __init__(self, exp_name, nconns):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand All @@ -65,7 +65,7 @@ def __init__(self, exp_name, nconns):
project_dir=self.defaults.default_otas_dir_bare,
ip=self.c_machine_config.ip,
n_cores=1)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.c_tas_configs.append(tas_config)

client0_config = ClientConfig(exp_name=exp_name,
Expand Down
10 changes: 5 additions & 5 deletions experiments/exps/perf_iso_latconn/configs/bare_vtas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ def __init__(self, exp_name, nconns):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand All @@ -65,7 +65,7 @@ def __init__(self, exp_name, nconns):
project_dir=self.defaults.default_vtas_dir_bare,
ip=self.c_machine_config.ip,
n_cores=1)
tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
self.c_tas_configs.append(tas_config)

client0_config = ClientConfig(exp_name=exp_name,
Expand Down
8 changes: 4 additions & 4 deletions experiments/exps/perf_iso_latconn/configs/ovs_linux.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ def __init__(self, exp_name, nconns):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand Down
12 changes: 6 additions & 6 deletions experiments/exps/perf_iso_latconn/configs/ovs_tas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ def __init__(self, exp_name, nconns):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand Down Expand Up @@ -72,7 +72,7 @@ def __init__(self, exp_name, nconns):
project_dir=self.defaults.default_otas_dir_virt,
ip=vm0_config.tas_tap_ip,
n_cores=1, dpdk_extra="00:03.0")
tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
tas0_config.args = tas0_config.args + ' --shm-len=8589934592'


vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
Expand All @@ -85,7 +85,7 @@ def __init__(self, exp_name, nconns):
project_dir=self.defaults.default_otas_dir_virt,
ip=vm1_config.tas_tap_ip,
n_cores=1, dpdk_extra="00:03.0")
tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
tas1_config.args = tas1_config.args + ' --shm-len=8589934592'


self.c_tas_configs.append(tas0_config)
Expand Down
10 changes: 5 additions & 5 deletions experiments/exps/perf_iso_latconn/configs/virt_tas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ def __init__(self, exp_name, nconns):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand All @@ -68,7 +68,7 @@ def __init__(self, exp_name, nconns):
project_dir=self.defaults.default_vtas_dir_bare,
ip=self.c_machine_config.ip,
n_cores=1)
tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
self.c_tas_configs.append(tas_config)

self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
Expand Down
10 changes: 5 additions & 5 deletions experiments/exps/perf_iso_latconn/perf_iso_latconn.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

experiments = []

n_conns = [128, 256, 512, 1024, 2048, 4096, 8192]
n_conns = [128, 256, 512, 1024, 2048, 4096, 8192, 16384]
n_runs = 3

for n_r in range(n_runs):
Expand All @@ -20,9 +20,9 @@
ovs_linux_exp = exp.Experiment(OVSLinuxConf(exp_name + "ovs-linux", n_c), name=exp_name)
ovs_tas_exp = exp.Experiment(OVSTasConf(exp_name + "ovs-tas", n_c), name=exp_name)

# experiments.append(tas_bare_exp)
# experiments.append(vtas_bare_exp)
# experiments.append(tas_virt_exp)
experiments.append(tas_bare_exp)
experiments.append(vtas_bare_exp)
experiments.append(tas_virt_exp)
experiments.append(ovs_tas_exp)
# experiments.append(ovs_linux_exp)
experiments.append(ovs_linux_exp)

10 changes: 5 additions & 5 deletions experiments/exps/perf_iso_latmsize/configs/bare_tas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ def __init__(self, exp_name, msize):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand All @@ -65,7 +65,7 @@ def __init__(self, exp_name, msize):
project_dir=self.defaults.default_otas_dir_bare,
ip=self.c_machine_config.ip,
n_cores=1)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.c_tas_configs.append(tas_config)

client0_config = ClientConfig(exp_name=exp_name,
Expand Down
10 changes: 5 additions & 5 deletions experiments/exps/perf_iso_latmsize/configs/bare_vtas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ def __init__(self, exp_name, msize):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand All @@ -65,7 +65,7 @@ def __init__(self, exp_name, msize):
project_dir=self.defaults.default_vtas_dir_bare,
ip=self.c_machine_config.ip,
n_cores=1)
tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
self.c_tas_configs.append(tas_config)

client0_config = ClientConfig(exp_name=exp_name,
Expand Down
8 changes: 4 additions & 4 deletions experiments/exps/perf_iso_latmsize/configs/ovs_linux.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ def __init__(self, exp_name, msize):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand Down
12 changes: 6 additions & 6 deletions experiments/exps/perf_iso_latmsize/configs/ovs_tas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ def __init__(self, exp_name, msize):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand Down Expand Up @@ -72,7 +72,7 @@ def __init__(self, exp_name, msize):
project_dir=self.defaults.default_otas_dir_virt,
ip=vm0_config.tas_tap_ip,
n_cores=1, dpdk_extra="00:03.0")
tas0_config.args = tas0_config.args + ' --shm-len=4294967296'
tas0_config.args = tas0_config.args + ' --shm-len=8589934592'


vm1_config = VMConfig(pane=self.defaults.c_vm_pane,
Expand All @@ -85,7 +85,7 @@ def __init__(self, exp_name, msize):
project_dir=self.defaults.default_otas_dir_virt,
ip=vm1_config.tas_tap_ip,
n_cores=1, dpdk_extra="00:03.0")
tas1_config.args = tas1_config.args + ' --shm-len=4294967296'
tas1_config.args = tas1_config.args + ' --shm-len=8589934592'


self.c_tas_configs.append(tas0_config)
Expand Down
10 changes: 5 additions & 5 deletions experiments/exps/perf_iso_latmsize/configs/virt_tas.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ def __init__(self, exp_name, msize):
machine_config=self.s_machine_config,
project_dir=self.defaults.default_otas_dir_bare,
ip=self.s_machine_config.ip,
n_cores=12)
tas_config.args = tas_config.args + ' --shm-len=4294967296'
n_cores=14)
tas_config.args = tas_config.args + ' --shm-len=8589934592'
self.s_tas_configs.append(tas_config)

server0_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=0, vmid=0,
port=1234, ncores=8, max_flows=4096, max_bytes=4096,
port=1234, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
server1_config = ServerConfig(pane=self.defaults.s_server_pane,
idx=1, vmid=0,
port=1235, ncores=8, max_flows=4096, max_bytes=4096,
port=1235, ncores=12, max_flows=4096, max_bytes=4096,
bench_dir=self.defaults.default_obenchmark_dir_bare,
tas_dir=self.defaults.default_otas_dir_bare)
self.server_configs.append(server0_config)
Expand All @@ -68,7 +68,7 @@ def __init__(self, exp_name, msize):
project_dir=self.defaults.default_vtas_dir_bare,
ip=self.c_machine_config.ip,
n_cores=1)
tas_config.args = tas_config.args + ' --vm-shm-len=4294967296'
tas_config.args = tas_config.args + ' --vm-shm-len=8589934592'
self.c_tas_configs.append(tas_config)

self.c_proxyh_config = HostProxyConfig(pane=self.defaults.c_proxyh_pane,
Expand Down
Loading

0 comments on commit 16eb312

Please sign in to comment.