From 09071915358ce5c427de64a1e50e7917a9c3e7eb Mon Sep 17 00:00:00 2001
From: Siyuan Chai <siyuanc3@illinois.edu>
Date: Sat, 15 Nov 2025 17:36:37 -0600
Subject: [PATCH 1/2] automatically detects host & guest IOMMU config

---
 scripts/sosp24-experiments/vm_flows_exp.sh | 72 ++++++++++++++++------
 1 file changed, 52 insertions(+), 20 deletions(-)

diff --git a/scripts/sosp24-experiments/vm_flows_exp.sh b/scripts/sosp24-experiments/vm_flows_exp.sh
index 72311c4c4..aeb374320 100755
--- a/scripts/sosp24-experiments/vm_flows_exp.sh
+++ b/scripts/sosp24-experiments/vm_flows_exp.sh
@@ -36,7 +36,7 @@ CLIENT_USE_PASS_AUTH=0 # 1 to use password, 0 to use identity file
 CLIENT_SSH_IDENTITY_FILE="/home/schai/.ssh/id_rsa"
 
 # off, shadow or nested
-VIRT_TECH="off"
+VIRT_TECH="nested"
 
 function verify_virt_tech() {
     local tech="$1"
@@ -62,6 +62,49 @@ function verify_virt_tech() {
     fi
 }
 
+parse_iommu_mode() {
+	local cmdline="${1:-$(</proc/cmdline)}"
+	local cl
+	cl="$(printf '%s' "$cmdline" | tr '[:upper:]' '[:lower:]')"
+
+	# Passthrough (separate case)
+	if [[ "$cl" =~ (^|[[:space:]])(iommu=pt|iommu\.passthrough=(1|on|y|yes|true))($|[[:space:]]) ]]; then
+		echo passthrough
+		return
+	fi
+
+	# Off
+	if [[ "$cl" =~ (^|[[:space:]])(noiommu|iommu=off|intel_iommu=off|amd_iommu=off)($|[[:space:]]) ]]; then
+		echo off
+		return
+	fi
+
+	# Strict
+	if [[ "$cl" =~ (^|[[:space:]])iommu\.strict=(1|on|y|yes|true)($|[[:space:]]) ]] || \
+	   [[ "$cl" =~ (^|[[:space:]])intel_iommu=([^[:space:]]*,)?strict([^[:space:]]*)($|[[:space:]]) ]] || \
+	   [[ "$cl" =~ (^|[[:space:]])amd_iommu=([^[:space:]]*,)?strict([^[:space:]]*)($|[[:space:]]) ]]; then
+		echo strict
+		return
+	fi
+
+	# Lazy (non-strict)
+	if [[ "$cl" =~ (^|[[:space:]])iommu\.strict=(0|off|n|no|false)($|[[:space:]]) ]] || \
+	   [[ "$cl" =~ (^|[[:space:]])intel_iommu=([^[:space:]]*,)?nonstrict([^[:space:]]*)($|[[:space:]]) ]] || \
+	   [[ "$cl" =~ (^|[[:space:]])amd_iommu=([^[:space:]]*,)?nonstrict([^[:space:]]*)($|[[:space:]]) ]]; then
+		echo lazy
+		return
+	fi
+
+	# Explicitly enabled but no strictness specified → assume strict
+	if [[ "$cl" =~ (^|[[:space:]])(iommu=on|intel_iommu=on|amd_iommu=on)($|[[:space:]]) ]]; then
+		echo strict
+		return
+	fi
+
+	# Default if unspecified
+	echo strict
+}
+
 verify_virt_tech $VIRT_TECH
 
 if [ "$CLIENT_USE_PASS_AUTH" -eq 1 ]; then
@@ -70,26 +113,15 @@ else
 	SSH_CLIENT_CMD="ssh -i $CLIENT_SSH_IDENTITY_FILE ${CLIENT_SSH_UNAME}@${CLIENT_SSH_HOST}"
 fi
 
-iommu_on=$(grep -o intel_iommu=on /proc/cmdline)
-iommu_mode=$(sudo dmesg | grep -o 'iommu\.strict=[0-9]' | tail -n1 | cut -d= -f2)
-iommu_config=""
-
-if [ -z $iommu_on ]; then
-    iommu_config="host-strict-guest-off"
-else
-    if [ "$iommu_mode" == "1" ]; then
-	echo "IOMMU is in STRICT mode, assuming the same for host"
-        iommu_config="host-strict-guest-on-$VIRT_TECH"
-    elif [ "$iommu_mode" == "0" ]; then
-	echo "IOMMU is in LAZY mode, assuming the same for host"
-        iommu_config="host-lazy-guest-on-$VIRT_TECH"
-    else
-	echo "IOMMU strictness could not be determined"
-	iommu_config="guest-on-$VIRT_TECH"
-    fi
-fi
+guest_cmdline=$(cat /proc/cmdline)
+guest_iommu_config=$(parse_iommu_mode $guest_cmdline)
+host_cmdline=$(ssh -i "$CLIENT_SSH_IDENTITY_FILE" "${HOST_UNAME}@${HOST_IP}" 'cat /proc/cmdline')
+host_iommu_config=$(parse_iommu_mode $host_cmdline)
 
+iommu_config="host-${guest_iommu_config}-guest-${host_iommu_config}-$VIRT_TECH"
 
+echo "iommu_config: $iommu_config"
+# exit 0
 # pause the frame
 sudo ethtool --pause $GUEST_INTF tx off rx off
 $SSH_CLIENT_CMD "sudo ethtool --pause $CLIENT_INTF tx off rx off"
@@ -110,7 +142,7 @@ for socket_buf in 1; do
             server_cores_mask=($(echo $server_cores | tr ',' '\n' | head -n $num_cores | tr '\n' ','))
 
       	    format_i=$(printf "%02d\n" $i)
-            exp_name="${timestamp}-$(uname -r)-flow${format_i}-${iommu_config}-ringbuf-${ring_buffer}_sokcetbuf${socket_buf}_${num_cores}cores"
+            exp_name="${timestamp}-$(uname -r)-flow${format_i}-${iommu_config}-ringbuf-${ring_buffer}_sokcetbuf1_${num_cores}cores"
             echo $exp_name
 
             if [ "$DRY_RUN" -eq 1 ]; then

From 6721566b056264c5493abef01db0dd39e32fa4c8 Mon Sep 17 00:00:00 2001
From: Siyuan Chai <siyuanc3@illinois.edu>
Date: Sat, 15 Nov 2025 17:38:13 -0600
Subject: [PATCH 2/2] Remove the ftrace setup before warmup. We should do it
 after warmup

---
 scripts/vm-run-dctcp-tput-experiment.sh | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/scripts/vm-run-dctcp-tput-experiment.sh b/scripts/vm-run-dctcp-tput-experiment.sh
index 191a1f2e1..ab582cd0c 100755
--- a/scripts/vm-run-dctcp-tput-experiment.sh
+++ b/scripts/vm-run-dctcp-tput-experiment.sh
@@ -378,23 +378,7 @@ for ((j = 0; j < NUM_RUNS; j += 1)); do
     sudo bash run-netapp-tput.sh --mode server -n "$GUEST_NUM_SERVERS" -N "$CLIENT_NUM_CLIENTS" -o "${EXP_NAME}-RUN-${j}" \
         -p "$INIT_PORT" -c "$GUEST_CPU_MASK" &> "$guest_server_app_log_file" &
     sleep 2 # Allow server app to initialize
-    cd - > /dev/null
-   
-    # --- Ftrace Setup (Guest & Host) ---
-    log_info "Configuring GUEST ftrace for IOVA logging (Buffer: ${FTRACE_BUFFER_SIZE_KB}KB, Overwrite: ${FTRACE_OVERWRITE_ON_FULL})..."
-    sudo echo "$FTRACE_BUFFER_SIZE_KB" > /sys/kernel/debug/tracing/buffer_size_kb
-    sudo echo "$FTRACE_OVERWRITE_ON_FULL" > /sys/kernel/debug/tracing/options/overwrite
-    sudo echo > /sys/kernel/debug/tracing/trace # Clear buffer
-    sudo echo 1 > /sys/kernel/debug/tracing/tracing_on
-    log_info "GUEST IOVA ftrace is ON."
-
-    log_info "Configuring HOST ftrace for IOVA logging on $HOST_IP..."
-    $SSH_HOST_CMD \
-    "sudo bash -c 'sudo echo '$FTRACE_BUFFER_SIZE_KB' > /sys/kernel/debug/tracing/buffer_size_kb; \
-         sudo echo '$FTRACE_OVERWRITE_ON_FULL' > /sys/kernel/debug/tracing/options/overwrite; \
-         sudo echo > /sys/kernel/debug/tracing/trace; \
-         sudo echo 1 > /sys/kernel/debug/tracing/tracing_on'"
-    log_info "HOST IOVA ftrace is ON."
+    cd - > /dev/null   
 
     # --- Setup and Start Clients ---
     log_info "Setting up and starting CLIENTS on $CLIENT_SSH_HOST..."