nfvbenchvm: refactor wait for VPP service

[nfvbench.git] / nfvbenchvm / dib / elements / nfvbenchvm / static / etc / rc.d / rc.local.loopvm

diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm
index a83e7ba..181ff2a 100644 (file)
--- a/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/static/etc/rc.d/rc.local.loopvm
@@ -137,6 +137,24 @@ if [ $INTF_MGMT_CIDR ] && [ $INTF_MGMT_IP_GW ]; then
     else
         ETH_PORT="eth0"
     fi
+
+    # By default, configure the MTU of the management interface to the
+    # conservative value of 1500: this will reduce the risk to get an
+    # unmanageable VM in some setups.
+    #
+    # To set the MTU to a different value, configure the INTF_MGMT_MTU variable
+    # in /etc/nfvbenchvm.conf.  If INTF_MGMT_MTU is set to the special value
+    # "auto", the MTU will not be configured and it will keep the value set by
+    # the hypervisor ("legacy" nfvbenchvm behavior).  If INTF_MGMT_MTU is unset,
+    # the MTU will be set to 1500.  In other cases, the MTU will be set to the
+    # value of INTF_MGMT_MTU.
+    #
+    if [[ -z "$INTF_MGMT_MTU" ]]; then
+        ip link set $ETH_PORT mtu 1500
+    elif [[ "$INTF_MGMT_MTU" != "auto" ]]; then
+        ip link set $ETH_PORT mtu $INTF_MGMT_MTU
+    fi
+
     ip addr add $INTF_MGMT_CIDR dev $ETH_PORT
     ip link set $ETH_PORT up
     ip route add default via $INTF_MGMT_IP_GW dev $ETH_PORT
@@ -164,20 +182,43 @@ else
     logger "NFVBENCHVM ERROR: VM MAC Addresses missing in $NFVBENCH_CONF"
 fi
 
+wait_vpp_service() {
+    # Wait for at most wait_max=$1 seconds until VPP service is ready.  Exit
+    # with code 1 if timeout is reached.
+    # 
+    # Because VPP systemd unit has Type=simple, systemctl will report the
+    # service to be active has soon as it is forked.  This does not mean that
+    # the service is ready, and actually it takes some times before vppctl can
+    # succesfully connect to VPP client socket /run/vpp/cli.sock.
+    local wait_max=$1
+
+    local wait_time=0
+    while ! vppctl show int; do
+        if [[ $wait_time -ge $wait_max ]]; then
+            # Log error to both system log and standard error output
+            logger -s "NFVBENCHVM ERROR: VPP service still not ready after $wait_max seconds." \
+                      "Exiting $(basename $0)."
+            exit 1
+        fi
+        sleep 1
+        wait_time=$(( wait_time + 1 ))
+    done
+}
+
 if [ $PCI_ADDRESS_1 ] && [ $PCI_ADDRESS_2 ]; then
     logger "NFVBENCHVM: Using pci $PCI_ADDRESS_1 ($INTF_MAC1)"
     logger "NFVBENCHVM: Using pci $PCI_ADDRESS_2 ($INTF_MAC2)"
+    # active uio_pci_generic driver
+    modprobe uio_pci_generic
     # Configure the forwarder
-    if [ -z "`lsmod | grep igb_uio`" ]; then
-        modprobe uio
-        insmod /dpdk/igb_uio.ko
-    fi
     if [ "$FORWARDER" == "testpmd" ]; then
         echo "Configuring testpmd..."
-        # Binding ports to DPDK
-        dpdk-devbind -b igb_uio $PCI_ADDRESS_1
-        dpdk-devbind -b igb_uio $PCI_ADDRESS_2
-        screen -dmSL testpmd /dpdk/testpmd \
+        mkdir /dpdk
+        echo "set promisc all off" > /dpdk/testpmd_cmd.txt
+        # Binding ports to DPDK VFIO or UIO
+        dpdk-devbind -b vfio-pci $PCI_ADDRESS_1 || dpdk-devbind -b uio_pci_generic $PCI_ADDRESS_1
+        dpdk-devbind -b vfio-pci $PCI_ADDRESS_2 || dpdk-devbind -b uio_pci_generic $PCI_ADDRESS_2
+        screen -dmSL testpmd testpmd \
                             -c $CORE_MASK \
                             -n 4 \
                             -- \
@@ -205,12 +246,22 @@ if [ $PCI_ADDRESS_1 ] && [ $PCI_ADDRESS_2 ]; then
         sed -i "s/{{WORKER_CORES}}/$WORKER_CORES/g" /etc/vpp/startup.conf
         sed -i "s/{{VIF_MQ_SIZE}}/${VIF_MQ_SIZE}/g" /etc/vpp/startup.conf
         sed -i "s/{{NUM_MBUFS}}/${NUM_MBUFS}/g" /etc/vpp/startup.conf
-        service vpp start
-        sleep 10
+        systemctl start vpp
+        # Wait until VPP service is ready for at most 30 seconds
+        wait_vpp_service 30
 
-        INTFS=`vppctl show int | grep Ethernet | xargs`
-        INTF_1=`echo $INTFS | awk '{ print $1 }'`
-        INTF_2=`echo $INTFS | awk '{ print $4 }'`
+        VPPCTL_OUTPUT=$(vppctl show int)
+        INTFS=$(echo "$VPPCTL_OUTPUT" | grep Ethernet | xargs)
+        INTF_1=$(echo $INTFS | awk '{ print $1 }')
+        INTF_2=$(echo $INTFS | awk '{ print $4 }')
+        if [[ -z "$INTF_1" ]] || [[ -z "$INTF_2" ]]; then
+            # Log error to both system log and standard error output
+            logger -s "NFVBENCHVM DEBUG: \"vppctl show int\" output:"
+            logger -s "NFVBENCHVM DEBUG: $VPPCTL_OUTPUT"
+            logger -s "NFVBENCHVM ERROR: vppctl does not show the two Ethernet interfaces we expect." \
+                      "Exiting $(basename $0)."
+            exit 1
+        fi
         if [ -z "${TG_MAC1}" ]; then
             # vm.conf does not support lines commented with #, so
             # we need to remove the line to set the static ARP entry.
@@ -231,7 +282,7 @@ if [ $PCI_ADDRESS_1 ] && [ $PCI_ADDRESS_2 ]; then
         sed -i "s/{{TG_NET2}}/${TG_NET2//\//\/}/g" /etc/vpp/vm.conf
         sed -i "s/{{TG_GATEWAY1_IP}}/${TG_GATEWAY1_IP}/g" /etc/vpp/vm.conf
         sed -i "s/{{TG_GATEWAY2_IP}}/${TG_GATEWAY2_IP}/g" /etc/vpp/vm.conf
-        service vpp restart
+        systemctl restart vpp
         logger "NFVBENCHVM: vpp service restarted"
     else
         echo "ERROR: Unknown forwarder value. Accepted values: testpmd or vpp"
@@ -244,4 +295,4 @@ else
     logger "NFVBENCHVM ERROR: Cannot find PCI Address from MAC"
 fi
 
-exit 0
\ No newline at end of file
+exit 0