CSIT-518: Add testpmd numa awareness

Change-Id: I982834de1fbe71cf5303808ea58d4b58e530ffcb
Signed-off-by: Tibor Frank <tifrank@cisco.com>

2 files changed, 12 insertions, 15 deletions

diff --git a/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh b/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh
index 915d383bfa..c4d0828ac1 100755
--- a/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh
+++ b/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh
@@ -15,6 +15,7 @@ port2_pci=$4
 sudo pgrep testpmd
 if [ $? -eq "0" ]; then
     success=false
+    sudo pkill tail
     sudo pkill testpmd
     for attempt in {1..5}; do
         sudo pgrep testpmd
@@ -24,15 +25,16 @@ if [ $? -eq "0" ]; then
         fi
         sleep 1
     done
-    if [ ${success} -eq false ]; then
+    if [ "$success" = false ]; then
         echo "The command sudo pkill testpmd failed"
         exit 1
     fi
+    cat ${TESTPMD_LOG}
 fi
 
+sudo rm -f ${TESTPMD_LOG}
 sudo rm -f ${TESTPMD_PID}
 sudo rm -f /dev/hugepages/*
-cat ${TESTPMD_LOG}
 
 cd ${ROOTDIR}/dpdk-16.07/
 ./tools/dpdk-devbind.py -b ${port1_driver} ${port1_pci}
diff --git a/dpdk-tests/dpdk_scripts/run_l2fwd.sh b/dpdk-tests/dpdk_scripts/run_l2fwd.sh
index dedabe1872..3ddf4fd958 100755
--- a/dpdk-tests/dpdk_scripts/run_l2fwd.sh
+++ b/dpdk-tests/dpdk_scripts/run_l2fwd.sh
@@ -6,7 +6,7 @@ PWDDIR=$(pwd)
 TESTPMD_LOG=/tmp/testpmd.log
 TESTPMD_PID=/tmp/testpmd.pid
 
-cpu_coremask=$1
+cpu_corelist=$1
 nb_cores=$2
 queue_nums=$3
 jumbo_frames=$4
@@ -24,32 +24,27 @@ if [ $? -eq "0" ]; then
         fi
         sleep 1
     done
-    if [ ${success} -eq false ]; then
+    if [ "$success" = false ]; then
         echo "The command sudo pkill testpmd failed"
         exit 1
     fi
 fi
 
+sudo rm -f ${TESTPMD_LOG}
 sudo rm -f ${TESTPMD_PID}
+sudo rm -f /dev/hugepages/*
 
 #run the testpmd
 cd ${ROOTDIR}
 if [ "$jumbo_frames" = "yes" ]; then
-#sudo sh -c "screen -dmS DPDK-test ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -c ${cpu_coremask} \
-#    -n 4 -- --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
-#    --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=${queue_nums} \
-#    --txq=${queue_nums} --auto-start"
-tail -f /dev/null | nohup ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -c ${cpu_coremask} \
-    -n 4 -- --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
+tail -f /dev/null | nohup ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -l ${cpu_corelist} \
+    -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
     --max-pkt-len=9000 --txqflags=0 --forward-mode=io --rxq=${queue_nums} \
     --txq=${queue_nums} --auto-start > ${TESTPMD_LOG} 2>&1 &
 echo $! > ${TESTPMD_PID}
 else
-#sudo sh -c "screen -dmS DPDK-test ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -c ${cpu_coremask} \
-#    -n 4 -- --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
-#    --forward-mode=io --rxq=${queue_nums} --txq=${queue_nums} --auto-start"
-tail -f /dev/null | nohup ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -c ${cpu_coremask} \
-    -n 4 -- --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
+tail -f /dev/null | nohup ./dpdk-16.07/x86_64-native-linuxapp-gcc/app/testpmd -l ${cpu_corelist} \
+    -n 4 -- --numa --nb-ports=2 --portmask=0x3 --nb-cores=${nb_cores} \
     --forward-mode=io --rxq=${queue_nums} --txq=${queue_nums} --auto-start > ${TESTPMD_LOG} 2>&1 &
 echo $! > ${TESTPMD_PID}
 fi