Merge zizzer:/bk/m5
into zed.eecs.umich.edu:/z/hsul/work/m5/intel --HG-- extra : convert_revision : 729be2b6686f46f70440d258383180078c6b046c
This commit is contained in:
Lisa Hsu
commit
6e192b5704
|
|
@ -33,25 +33,43 @@ echo "10" > /proc/sys/vm/dirty_writeback_centisecs
|
|||
echo "done."
|
||||
|
||||
cat > /etc/initiatorname.iscsi <<EOF
|
||||
InitiatorName=iqn.1987-05.com.cisco:01.fdb170a0a01b
|
||||
InitiatorName=iqn.1987-05.10.0.168.192
|
||||
EOF
|
||||
|
||||
cat > /etc/iscsi.conf <<EOF
|
||||
DiscoveryAddress=192.168.0.1
|
||||
TargetName=iqn.2005-05.edu.umich:storage.m5
|
||||
OutgoingUsername=test
|
||||
OutgoingPassword=secret
|
||||
cat > /etc/iscsid.conf <<EOF
|
||||
node.active_cnx = 1
|
||||
node.startup = manual
|
||||
#node.session.auth.username = dima
|
||||
#node.session.auth.password = aloha
|
||||
node.session.timeo.replacement_timeout = 0
|
||||
node.session.err_timeo.abort_timeout = 10
|
||||
node.session.err_timeo.reset_timeout = 30
|
||||
node.session.iscsi.InitialR2T = No
|
||||
node.session.iscsi.ImmediateData = Yes
|
||||
node.session.iscsi.FirstBurstLength = 262144
|
||||
node.session.iscsi.MaxBurstLength = 16776192
|
||||
node.session.iscsi.DefaultTime2Wait = 0
|
||||
node.session.iscsi.DefaultTime2Retain = 0
|
||||
node.session.iscsi.MaxConnections = 0
|
||||
node.cnx[0].iscsi.HeaderDigest = None
|
||||
node.cnx[0].iscsi.DataDigest = None
|
||||
node.cnx[0].iscsi.MaxRecvDataSegmentLength = 65536
|
||||
#discovery.sendtargets.auth.authmethod = CHAP
|
||||
#discovery.sendtargets.auth.username = dima
|
||||
#discovery.sendtargets.auth.password = aloha
|
||||
EOF
|
||||
|
||||
mount -t sysfs none /sys
|
||||
|
||||
echo "" > /var/log/iscsi.log
|
||||
chmod 0600 /var/log/iscsi.log
|
||||
chmod 0666 -R /var/db/iscsi
|
||||
|
||||
# Required for udev to activate/deactivate devices.
|
||||
echo "/sbin/hotplug" > /proc/sys/kernel/hotplug
|
||||
|
||||
/sbin/insmod /modules/iscsi_sfnet.ko
|
||||
/sbin/insmod /modules/scsi_transport_iscsi.ko
|
||||
/sbin/insmod /modules/iscsi_tcp.ko
|
||||
|
||||
# Create /dev/iscsictl
|
||||
if [ ! -f /dev/iscsictl ]; then
|
||||
|
|
@ -63,27 +81,27 @@ if [ ! -f /dev/iscsictl ]; then
|
|||
done < /proc/devices
|
||||
fi
|
||||
|
||||
echo -n "waiting for server..."
|
||||
echo -n "Starting iscsid..."
|
||||
/iscsi/iscsid -f &
|
||||
|
||||
echo -n "Waiting for server..."
|
||||
/usr/bin/netcat -c -l -p 8000
|
||||
|
||||
echo -n "Starting iscsid..."
|
||||
/iscsi/iscsid
|
||||
echo -n "Attaching target..."
|
||||
/iscsi/iscsiadm -m discovery -t st -p 192.168.0.1
|
||||
/iscsi/iscsiadm -m node -r a0c049 --login
|
||||
echo "done."
|
||||
|
||||
sleep 5
|
||||
|
||||
mount /dev/sda /mnt
|
||||
cd /mnt
|
||||
|
||||
initparam=`m5 initparam`
|
||||
|
||||
if test X$initparam == X0; then
|
||||
/sbin/m5 checkpoint 100000000 2000000000
|
||||
dd if=/dev/zero of=foo bs=1024k count=512
|
||||
else
|
||||
/sbin/m5 checkpoint 1000000000 2000000000
|
||||
/benchmarks/dbench/dbench $initparam
|
||||
fi
|
||||
echo -n "Starting aio benchmark..."
|
||||
/benchmarks/aio_bench/aio-bench -n 8 -s 8 -r .666 -c 8 -i 4000 -C 500 /dev/sda
|
||||
# very unstable /benchmarks/aio_bench/aio-bench -n 8 -s 5120 -r .666 -c 20 -i 3000 /dev/sda
|
||||
# very unstable /benchmarks/aio_bench/aio-bench -n 8 -s 8 -r 0 -c 20 -i 3000 /dev/sda
|
||||
# stable 960 Mbps /benchmarks/aio_bench/aio-bench -n 8 -s 8 -r 1 -c 20 -i 3000 /dev/sda
|
||||
# very unstable /benchmarks/aio_bench/aio-bench -n 8 -s 1024 -r 1 -c 20 -i 3000 /dev/sda
|
||||
# stable ~1.5 Gbps /benchmarks/aio_bench/aio-bench -n 16 -s 32 -r 1 -c 50 -i 3000 /dev/sda
|
||||
# stable ~1.5 Gbps /benchmarks/aio_bench/aio-bench -n 50 -s 32 -r 1 -c 50 -i 3000 /dev/sda
|
||||
|
||||
echo "starting bash shell..."
|
||||
/bin/bash
|
||||
|
|
|
|||
|
|
@ -20,34 +20,33 @@ 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 "10" > /proc/sys/vm/dirty_writeback_centisecs
|
||||
echo "done."
|
||||
|
||||
/sbin/insmod /modules/scsi_debug.ko dev_size_mb=768
|
||||
# specific for iscsi-target
|
||||
MEM_SIZE=1048576
|
||||
echo ${MEM_SIZE} > /proc/sys/net/core/wmem_max
|
||||
echo ${MEM_SIZE} > /proc/sys/net/core/rmem_max
|
||||
echo ${MEM_SIZE} > /proc/sys/net/core/wmem_default
|
||||
echo ${MEM_SIZE} > /proc/sys/net/core/rmem_default
|
||||
echo "${MEM_SIZE} ${MEM_SIZE} ${MEM_SIZE}" > /proc/sys/net/ipv4/tcp_mem
|
||||
echo "${MEM_SIZE} ${MEM_SIZE} ${MEM_SIZE}" > /proc/sys/net/ipv4/tcp_rmem
|
||||
echo "${MEM_SIZE} ${MEM_SIZE} ${MEM_SIZE}" > /proc/sys/net/ipv4/tcp_wmem
|
||||
|
||||
mke2fs -F /dev/sda
|
||||
|
||||
cat > /etc/ietd.conf <<EOF
|
||||
User test secret
|
||||
Target iqn.2005-05.edu.umich:storage.m5
|
||||
User test secret
|
||||
Lun 0 /dev/sda fileio
|
||||
Alias Test
|
||||
Target iqn.2005-05.1.0.168.192
|
||||
Lun 0 Sectors=8000000,Type=nullio
|
||||
EOF
|
||||
|
||||
/sbin/insmod /modules/iscsi_trgt.ko
|
||||
|
||||
echo -n "start enterprise target..."
|
||||
/iscsi/ietd
|
||||
/iscsi/ietd -f &
|
||||
echo "done."
|
||||
|
||||
echo "notifying client..."
|
||||
|
|
|
|||
Loading…
Reference in a new issue