aboutsummaryrefslogtreecommitdiffstats
path: root/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2020-04-17 12:38:09 +0000
committerPeter Mikus <pmikus@cisco.com>2020-04-23 12:36:54 +0000
commit54beb458703ff91e9f522f8af0a57722966f093e (patch)
tree5aa977fe9149e2d870ac87a35256783aeac60761 /tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
parent5dc176ab31af5dff73be6dd5266169a7be19dd13 (diff)
Performance: DPDK refactor
+ Rework BASH scripts (more code to python). + Move BASH into libraries. + Allows RDMA usage. + Fix 9000B tests. + Rename confusing l2fwd -> testpmd. + Fix suite setup. + Fix PCI whitelist to not accidentally pickup wrong interface. + Fix deprecated DPDK cli arguments. - MLX5 jumbo are disabled on NIC (i will increase separately). https://jenkins.fd.io/job/csit-dpdk-perf-verify-master-2n-clx/6/console (l3fwd still broken) - MLX5 IMIX seems to be some TRex issue with IMIX for mlx5 (i will handle separately) Signed-off-by: Peter Mikus <pmikus@cisco.com> Change-Id: I31d1b67305fa247cb5e1f57e739d3ef30dc1a04b
Diffstat (limited to 'tests/dpdk/dpdk_scripts/cleanup_dpdk.sh')
-rwxr-xr-xtests/dpdk/dpdk_scripts/cleanup_dpdk.sh86
1 files changed, 0 insertions, 86 deletions
diff --git a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
deleted file mode 100755
index a97b4ba121..0000000000
--- a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-set -x
-
-# Setting variables
-DPDK_DIR=dpdk
-ROOTDIR=/tmp/openvpp-testing
-TESTPMDLOG=screenlog.0
-PWDDIR=$(pwd)
-
-# Setting command line arguments
-port1_driver=$1
-port1_pci=$2
-port2_driver=$3
-port2_pci=$4
-
-# Try to kill the testpmd
-sudo pgrep testpmd
-if [ $? -eq "0" ]; then
- success=false
- sudo pkill testpmd
- echo "RC = $?"
- for attempt in {1..60}; do
- echo "Checking if testpmd is still alive, attempt nr ${attempt}"
- sudo pgrep testpmd
- if [ $? -eq "1" ]; then
- echo "testpmd is dead"
- success=true
- break
- fi
- echo "testpmd is still alive, waiting 1 second"
- sleep 1
- done
- if [ "$success" = false ]; then
- echo "The command sudo pkill testpmd failed"
- sudo pkill -9 testpmd
- echo "RC = $?"
- exit 1
- fi
-else
- echo "testpmd is not running"
-fi
-
-#also kill the l3fwd
-sudo pgrep l3fwd
-if [ $? -eq "0" ]; then
- success=false
- sudo pkill l3fwd
- echo "RC = $?"
- for attempt in {1..60}; do
- echo "Checking if l3fwd is still alive, attempt nr ${attempt}"
- sudo pgrep l3fwd
- if [ $? -eq "1" ]; then
- echo "l3fwd is dead"
- success=true
- break
- fi
- echo "l3fwd is still alive, waiting 1 second"
- sleep 1
- done
- if [ "$success" = false ]; then
- echo "The command sudo pkill l3fwd failed"
- sudo pkill -9 l3fwd
- echo "RC = $?"
- exit 1
- fi
-else
- echo "l3fwd is not running"
-fi
-
-# Remove hugepages
-sudo rm -f /dev/hugepages/*
-
-# Unbind interfaces
-cd ${ROOTDIR}/${DPDK_DIR}/
-sudo ./usertools/dpdk-devbind.py -b ${port1_driver} ${port1_pci} || \
- { echo "Unbind ${port1_pci} failed"; exit 1; }
-sudo ./usertools/dpdk-devbind.py -b ${port2_driver} ${port2_pci} || \
- { echo "Unbind ${port1_pci} failed"; exit 1; }
-
-sleep 2
-
-if1_name=`./usertools/dpdk-devbind.py --s | grep "${port1_pci}" | sed -n 's/.*if=\(\S\)/\1/p' | awk -F' ' '{print $1}'`
-if2_name=`./usertools/dpdk-devbind.py --s | grep "${port2_pci}" | sed -n 's/.*if=\(\S\)/\1/p' | awk -F' ' '{print $1}'`
-
-cd ${PWDDIR}