Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : ac0788599c365b2d7fe0870f0fea4b62c3b3ef22

17 files changed, 26 insertions, 43 deletions

diff --git a/configs/boot/nat-netperf-server.rcS b/configs/boot/nat-netperf-server.rcS
index 69717b7ce..61b4bea7a 100644
--- a/configs/boot/nat-netperf-server.rcS
+++ b/configs/boot/nat-netperf-server.rcS
@@ -24,7 +24,7 @@ echo "running netserver..."
 /benchmarks/netperf/netserver
 
 echo -n "signal natbox to begin..."
-sleep 1
+sleep 5
 echo "server ready" | /usr/bin/netcat -c $NATBOX 8000
 echo "done."
 
diff --git a/configs/boot/nat-netperf-stream-client.rcS b/configs/boot/nat-netperf-stream-client.rcS
index d0213c265..e37b8e565 100644
--- a/configs/boot/nat-netperf-stream-client.rcS
+++ b/configs/boot/nat-netperf-stream-client.rcS
@@ -9,6 +9,7 @@ ifconfig eth0 $CLIENT txqueuelen 1000
 echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "1" > /proc/sys/net/ipv4/tcp_vegas_cong_avoid
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_mem
diff --git a/configs/boot/nat-spec-surge-client.rcS b/configs/boot/nat-spec-surge-client.rcS
index a3bc512db..67c831eb0 100644
--- a/configs/boot/nat-spec-surge-client.rcS
+++ b/configs/boot/nat-spec-surge-client.rcS
@@ -21,17 +21,16 @@ echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
 echo "1" > /proc/sys/net/ipv4/tcp_vegas_cong_avoid
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/nat-spec-surge-server.rcS b/configs/boot/nat-spec-surge-server.rcS
index 9b5674e63..279cd5652 100755
--- a/configs/boot/nat-spec-surge-server.rcS
+++ b/configs/boot/nat-spec-surge-server.rcS
@@ -24,17 +24,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
 echo "1" > /proc/sys/net/ipv4/tcp_vegas_cong_avoid
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
@@ -50,6 +48,7 @@ cat /benchmarks/apache2/logs/error_log
 echo "done."
 
 echo "notifying natbox..."
+sleep 5
 echo "server ready" | /usr/bin/netcat -c $NATBOX 8000
 echo "done"
 
diff --git a/configs/boot/natbox-netperf.rcS b/configs/boot/natbox-netperf.rcS
index 5ec08c1a2..32a7371a0 100644
--- a/configs/boot/natbox-netperf.rcS
+++ b/configs/boot/natbox-netperf.rcS
@@ -11,7 +11,7 @@ ifconfig eth1 $INTIF txqueuelen 1000
 echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "1" > /proc/sys/net/ipv4/tcp_vegas_cong_avoid
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_mem
@@ -21,7 +21,6 @@ echo "262143" > /proc/sys/net/core/rmem_default
 echo "262143" > /proc/sys/net/core/wmem_default
 echo "262143" > /proc/sys/net/core/optmem_max
 echo "100000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "1" > /proc/sys/net/ipv4/ip_forward
 
 echo "waiting for netserver..."
@@ -47,6 +46,7 @@ $IPTABLES -A FORWARD -j LOG
 $IPTABLES -t nat -A POSTROUTING -o $EXTIF -j MASQUERADE
 
 echo "informing client..."
+sleep 5
 echo "server ready" | /usr/bin/netcat -c $CLIENT 8000
 
 echo "starting bash..."
diff --git a/configs/boot/natbox-spec-surge.rcS b/configs/boot/natbox-spec-surge.rcS
index d612424d2..8b84b1a35 100644
--- a/configs/boot/natbox-spec-surge.rcS
+++ b/configs/boot/natbox-spec-surge.rcS
@@ -11,6 +11,7 @@ ifconfig eth1 $INTIF txqueuelen 1000
 echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "1" > /proc/sys/net/ipv4/tcp_vegas_cong_avoid
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_mem
@@ -23,6 +24,8 @@ echo "100000" > /proc/sys/net/core/netdev_max_backlog
 
 echo "1" > /proc/sys/net/ipv4/ip_forward
 
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
+
 echo "waiting for netserver..."
 /usr/bin/netcat -c -l -p 8000
 
@@ -46,6 +49,7 @@ $IPTABLES -A FORWARD -j LOG
 $IPTABLES -t nat -A POSTROUTING -o $EXTIF -j MASQUERADE
 
 echo "informing client..."
+sleep 5
 echo "server ready" | /usr/bin/netcat -c $CLIENT 8000
 
 echo "starting bash..."
diff --git a/configs/boot/nfs-client-nhfsstone.rcS b/configs/boot/nfs-client-nhfsstone.rcS
index 229e418d8..aa2903919 100755
--- a/configs/boot/nfs-client-nhfsstone.rcS
+++ b/configs/boot/nfs-client-nhfsstone.rcS
@@ -18,17 +18,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/nfs-client-smallb.rcS b/configs/boot/nfs-client-smallb.rcS
index 22e2107eb..375da1f59 100755
--- a/configs/boot/nfs-client-smallb.rcS
+++ b/configs/boot/nfs-client-smallb.rcS
@@ -18,17 +18,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/nfs-client-tcp-smallb.rcS b/configs/boot/nfs-client-tcp-smallb.rcS
index 2ee232158..eeb6aaadd 100755
--- a/configs/boot/nfs-client-tcp-smallb.rcS
+++ b/configs/boot/nfs-client-tcp-smallb.rcS
@@ -18,17 +18,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/nfs-client-tcp.rcS b/configs/boot/nfs-client-tcp.rcS
index a67facbb2..319281385 100755
--- a/configs/boot/nfs-client-tcp.rcS
+++ b/configs/boot/nfs-client-tcp.rcS
@@ -18,17 +18,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/nfs-client.rcS b/configs/boot/nfs-client.rcS
index 84d15439f..2d64f1999 100755
--- a/configs/boot/nfs-client.rcS
+++ b/configs/boot/nfs-client.rcS
@@ -18,17 +18,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/nfs-server-nhfsstone.rcS b/configs/boot/nfs-server-nhfsstone.rcS
index 564833cb1..222ba309e 100755
--- a/configs/boot/nfs-server-nhfsstone.rcS
+++ b/configs/boot/nfs-server-nhfsstone.rcS
@@ -18,17 +18,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
@@ -60,6 +58,7 @@ echo "Exporting shares..."
 /sbin/exportfs -r -v
 
 echo -n "signal client to mount..."
+sleep 5
 echo "server ready" | /usr/bin/netcat -c 10.0.0.2 8000
 echo "done."
 
diff --git a/configs/boot/nfs-server.rcS b/configs/boot/nfs-server.rcS
index 0cb489a9d..9e68597e6 100755
--- a/configs/boot/nfs-server.rcS
+++ b/configs/boot/nfs-server.rcS
@@ -18,17 +18,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/spec-surge-client.rcS b/configs/boot/spec-surge-client.rcS
index 6ce2ce9de..f42d6045f 100644
--- a/configs/boot/spec-surge-client.rcS
+++ b/configs/boot/spec-surge-client.rcS
@@ -18,17 +18,16 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/spec-surge-server.rcS b/configs/boot/spec-surge-server.rcS
index 12e31696b..e2d0a58d7 100755
--- a/configs/boot/spec-surge-server.rcS
+++ b/configs/boot/spec-surge-server.rcS
@@ -22,17 +22,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/surge-client.rcS b/configs/boot/surge-client.rcS
index 208524a9c..c63cc93f0 100755
--- a/configs/boot/surge-client.rcS
+++ b/configs/boot/surge-client.rcS
@@ -18,17 +18,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-                                                                                
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-                                                                                
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-                                                                                
 echo "131072" > /proc/sys/fs/file-max
 echo "done."
 
diff --git a/configs/boot/surge-server.rcS b/configs/boot/surge-server.rcS
index 3feb7b581..234514bd9 100755
--- a/configs/boot/surge-server.rcS
+++ b/configs/boot/surge-server.rcS
@@ -15,7 +15,7 @@ echo -n "setting up network..."
 /sbin/ifconfig eth0:3 192.168.0.4 txqueuelen 1000
 /sbin/ifconfig eth0:4 192.168.0.5 txqueuelen 1000
 /sbin/ifconfig lo 127.0.0.1
-                                                                                
+
 echo "1" > /proc/sys/net/ipv4/tcp_tw_recycle
 echo "1" > /proc/sys/net/ipv4/tcp_tw_reuse
 echo "1" > /proc/sys/net/ipv4/tcp_window_scaling
@@ -23,17 +23,15 @@ echo "0" > /proc/sys/net/ipv4/tcp_timestamps
 echo "0" > /proc/sys/net/ipv4/tcp_sack
 echo "15" > /proc/sys/net/ipv4/tcp_fin_timeout
 echo "16384" > /proc/sys/net/ipv4/tcp_max_syn_backlog
-                                                                                
+echo "262144" > /proc/sys/net/ipv4/ip_conntrack_max
 echo "1024 65535" > /proc/sys/net/ipv4/ip_local_port_range
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_rmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_wmem
 echo "10000000 10000000 10000000" > /proc/sys/net/ipv4/tcp_mem
-                                                                                
 echo "524287" > /proc/sys/net/core/rmem_max
 echo "524287" > /proc/sys/net/core/wmem_max
 echo "524287" > /proc/sys/net/core/optmem_max
 echo "300000" > /proc/sys/net/core/netdev_max_backlog
-                                                                                
 echo "131072" > /proc/sys/fs/file-max
 echo "done."