Fix kill, makecerts, summary

This commit is contained in:
Pascal Engélibert 2026-03-25 09:49:10 +01:00
commit c311c4626b
3 changed files with 64 additions and 35 deletions

42
exp.py
View file

@ -87,7 +87,9 @@ CONFIGS = {
True,
],
"records": [
{ "filename": "wikipedia", "repeat": 10000, "time": 90 },
#{ "filename": "wikipedia", "repeat": 10000, "time": 90 },
{ "filename": "yt2-ads", "repeat": 10000, "time": 600 },
{ "filename": "yt2-ublock", "repeat": 10000, "time": 600 },
],
"repo_dir": "/home/tuxmain/reps/tlsbench",
"exp_dir": "/dev/shm/exp",
@ -263,6 +265,8 @@ CONFIGS = {
# Can't repeat more than 8000 times here
# TODO check if netreplay client frees ports correctly, or try to reuse ports
{ "filename": "wikipedia", "repeat": 8000, "time": 45 },
{ "filename": "yt2-ads", "repeat": 8000, "time": 180 },
{ "filename": "yt2-ublock", "repeat": 8000, "time": 180 },
],
"repo_dir": "/home/pengelib/tlsbench",
"exp_dir": "/dev/shm/exp",
@ -339,12 +343,12 @@ CERT_SIGN_ALGS = [
"rsa2048", "rsa3072", "rsa4096", # widely used
]
IMPLS = [
#"aws-lc", # Amazon's crypto widely used in Rust stuff
#"boring", # Google's fork of OpenSSL used in Chrome and Android
"aws-lc", # Amazon's crypto widely used in Rust stuff
"boring", # Google's fork of OpenSSL used in Chrome and Android
#"graviola", # New crypto in Rust
"openssl", # widely used
#"openssl-static",
#"ring", # used in most Rust stuff
"ring", # used in most Rust stuff
#"symcrypt", # Microsoft's crypto
#"wolfcrypt" # used in embedded (won't build with rpxy for now)
]
@ -398,9 +402,9 @@ EXPERIMENTS = {
"kexes": ["X25519"],
"cert": [
"prime256v1",
"secp384r1",
#"secp384r1",
"rsa2048",
"rsa3072",
#"rsa3072",
"rsa4096",
],
"earlydata": ["0"],
@ -415,7 +419,7 @@ EXPERIMENTS = {
"kexes": [
"X25519",
"SECP256R1",
"SECP384R1",
#"SECP384R1",
"X25519MLKEM768",
"SECP256R1MLKEM768",
"MLKEM768",
@ -452,11 +456,11 @@ EXPERIMENTS = {
"AES_256_GCM_SHA384",
#"CHACHA20_POLY1305_SHA256",
#"ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,ECDHE_RSA_WITH_AES_128_GCM_SHA256",
#"ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,ECDHE_RSA_WITH_AES_256_GCM_SHA384",
#"ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
],
"kexes": [
#"X25519",
"X25519",
#"SECP256R1",
#"SECP384R1",
"X25519MLKEM768",
@ -466,9 +470,10 @@ EXPERIMENTS = {
"cert": [
#"prime256v1",
#"secp384r1",
"rsa2048",
#"rsa2048",
#"rsa3072",
#"rsa4096",
"realistic",
],
"earlydata": ["0"],
},
@ -951,17 +956,12 @@ def run_exp(config, only_record=None, idle=False, shutdown=False, debug=False):
new_energy_rapl = get_rapl_energy(ssh, remote_path)
new_remote_bytes_in, new_remote_bytes_out = get_net_stat(ssh)
# Kill server
if side == "client":
try:
ssh_run(None, "killall netreplay")
except invoke.exceptions.UnexpectedExit as e:
pass
else:
try:
ssh_run(ssh, "killall netreplay-"+impl)
except invoke.exceptions.UnexpectedExit as e:
pass
# Kill netreplay
sh("killall netreplay")
try:
ssh_run(ssh, "killall netreplay-"+impl)
except invoke.exceptions.UnexpectedExit as e:
pass
# Measure CPU after (as it may update only after the process is killed)
new_cpu = 0