Merge pull request #115 from CESNET/dpdkinit

init: add DPDK variables and improve ipfixprobed script

Author: cejkato2

init/ipfixprobed

@@ -5,6 +5,14 @@ CONFFILE="/etc/ipfixprobe/$1.conf"
 if [ -e "$CONFFILE" ]; then
    source "$CONFFILE"
    input=""
+   dpdkinput=""
+   if [ "$USE_DPDK" = "1" ]; then
+      # set up DPDK interface(s)
+      dpdkinput=("-i" "dpdk;p=$DPDK_PORT;q=$DPDK_QUEUES_COUNT;e=-c $DPDK_CPUMASK -a $DPDK_DEVICE")
+      for ((ifc=1; ifc<$DPDK_QUEUES_COUNT;ifc++)); do
+         dpdkinput+=("-i" "dpdk")
+      done
+   fi
    if `declare -p INPUT > /dev/null 2>/dev/null`; then
       # list of input plugins
       for ifc in "${!INPUT[@]}"; do
@@ -37,11 +45,7 @@ if [ -e "$CONFFILE" ]; then
    fi
    output="-o ipfix;host=${HOST:-127.0.0.1};port=${PORT:-4739};id=${LINK:-0};dir=${DIR:-0};${UDP_PARAM}"
 
-   if [ -n "$DPDKARGS" ]; then
-      exec /usr/bin/ipfixprobe $DPDKARGS -- $input $storage $process $output
-   else
-      exec /usr/bin/ipfixprobe $input $storage $process $output
-   fi
+   exec /usr/bin/ipfixprobe "${dpdkinput[@]}" $input $storage $process $output
 else
    echo "Configuration file '$CONFFILE' does not exist, exitting." >&2
    exit 1

init/link0.conf.example

@@ -1,16 +1,39 @@
-# set up shell-like variables
+# Set up shell-like variables
+# Lines starting with '#' are comments.
 
-# Use DPDKARGS to specify DPDK related arguments (other ipfixprobe arguments
-# are passed after  "--")
-# WARNING - this does not work with non-DPDK version of ipfixprobe,
-# which does not know such arguments! So this should be commented out.
+# $$$$$$\                                 $$\
+# \_$$  _|                                $$ |
+#   $$ |  $$$$$$$\   $$$$$$\  $$\   $$\ $$$$$$\
+#   $$ |  $$  __$$\ $$  __$$\ $$ |  $$ |\_$$  _|
+#   $$ |  $$ |  $$ |$$ /  $$ |$$ |  $$ |  $$ |
+#   $$ |  $$ |  $$ |$$ |  $$ |$$ |  $$ |  $$ |$$\
+# $$$$$$\ $$ |  $$ |$$$$$$$  |\$$$$$$  |  \$$$$  |
+# \______|\__|  \__|$$  ____/  \______/    \____/
+#                   $$ |
+#                   $$ |
+#                   \__|
+#
+# Settings depend on type of input plugin.
+# For DPDK, skip to the related section and leave INPUT[*] array commented.
+#
+# For PCAP / NDP / raw, create a list of activated input plugins (arguments for -i parameter).
+#
+#   Specify the array of input plugins with arguments using INPUT[], indexes (subscripts) must be unique.
+#
+# See `ipfixprobe --help input` for more information
 
-# DDPKARGS="-c 0x1 -a 0000:00:06.1"
+# Example of PCAP:
+#
+#INPUT[0]="pcap;ifc=eno2"
 
-# List of activated input plugins (arguments for -i parameter)
-#   Specify array of input plugins with arguments using INPUT[], indexes (subscripts) must be unique
-INPUT[0]="ndp;dev=/dev/nfb0:0"
-INPUT[1]="ndp;dev=/dev/nfb0:1"
+# Example of NDP:
+#
+#INPUT[0]="ndp;dev=/dev/nfb0:0"
+#INPUT[1]="ndp;dev=/dev/nfb0:1"
+
+# Example of raw:
+#
+#INPUT[0]="raw;ifc=eno2"
 
 # Other examples:
 #
@@ -25,11 +48,86 @@ INPUT[1]="ndp;dev=/dev/nfb0:1"
 # INPUT[$i]="ndp;dev=/dev/nfb0:$i"
 # done
 
+#===================================================
+# DPDK input plugin settings
+# --------------------------------------------------
+#
+# It is recommended to use either DPDK or NDP.
+#
+# Enable USE_DPDK input by setting USE_DPDK=1:
+
+#USE_DPDK=1
+
+# Set PCIe address in the format <[domain:]bus:devid.func> for example:
+
+#DPDK_DEVICE=0000:43:00.0
+
+# Set CPU mask:
+
+#DPDK_CPUMASK=0x1
+
+# Set network device port:
+
+#DPDK_PORT=0
+
+# Set number of parallel queues (RSS feature)
+
+#DPDK_QUEUES_COUNT=8
+
+#===================================================
+
+# $$$$$$$\                                                              $$\
+# $$  __$$\                                                             \__|
+# $$ |  $$ | $$$$$$\   $$$$$$\   $$$$$$$\  $$$$$$\   $$$$$$$\  $$$$$$$\ $$\ $$$$$$$\   $$$$$$\
+# $$$$$$$  |$$  __$$\ $$  __$$\ $$  _____|$$  __$$\ $$  _____|$$  _____|$$ |$$  __$$\ $$  __$$\
+# $$  ____/ $$ |  \__|$$ /  $$ |$$ /      $$$$$$$$ |\$$$$$$\  \$$$$$$\  $$ |$$ |  $$ |$$ /  $$ |
+# $$ |      $$ |      $$ |  $$ |$$ |      $$   ____| \____$$\  \____$$\ $$ |$$ |  $$ |$$ |  $$ |
+# $$ |      $$ |      \$$$$$$  |\$$$$$$$\ \$$$$$$$\ $$$$$$$  |$$$$$$$  |$$ |$$ |  $$ |\$$$$$$$ |
+# \__|      \__|       \______/  \_______| \_______|\_______/ \_______/ \__|\__|  \__| \____$$ |
+#                                                                                     $$\   $$ |
+#                                                                                     \$$$$$$  |
+#                                                                                      \______/
+#
 # List of activated process plugins (arguments for -p parameter), to skip plugins, use "basic" only:
 # PROCESS=(basic)
+#
+# See `ipfixprobe -h process` for the list of available plugins.
+#
 PROCESS=(pstats tls http ssdp "dnssd;txt")
 
+#
+# $$$$$$$$\ $$\                                $$$$$$\                      $$\
+# $$  _____|$$ |                              $$  __$$\                     $$ |
+# $$ |      $$ | $$$$$$\  $$\  $$\  $$\       $$ /  \__| $$$$$$\   $$$$$$$\ $$$$$$$\   $$$$$$\
+# $$$$$\    $$ |$$  __$$\ $$ | $$ | $$ |      $$ |       \____$$\ $$  _____|$$  __$$\ $$  __$$\
+# $$  __|   $$ |$$ /  $$ |$$ | $$ | $$ |      $$ |       $$$$$$$ |$$ /      $$ |  $$ |$$$$$$$$ |
+# $$ |      $$ |$$ |  $$ |$$ | $$ | $$ |      $$ |  $$\ $$  __$$ |$$ |      $$ |  $$ |$$   ____|
+# $$ |      $$ |\$$$$$$  |\$$$$$\$$$$  |      \$$$$$$  |\$$$$$$$ |\$$$$$$$\ $$ |  $$ |\$$$$$$$\
+# \__|      \__| \______/  \_____\____/        \______/  \_______| \_______|\__|  \__| \_______|
+#
+#
+# Size of flow cache, exponent to the power of two
+CACHE_SIZE=17
 
+# Active and inactive timeout in seconds
+ACTIVE_TIMEOUT=300
+INACTIVE_TIMEOUT=65
+
+#
+#  $$$$$$\              $$\                           $$\
+# $$  __$$\             $$ |                          $$ |
+# $$ /  $$ |$$\   $$\ $$$$$$\    $$$$$$\  $$\   $$\ $$$$$$\
+# $$ |  $$ |$$ |  $$ |\_$$  _|  $$  __$$\ $$ |  $$ |\_$$  _|
+# $$ |  $$ |$$ |  $$ |  $$ |    $$ /  $$ |$$ |  $$ |  $$ |
+# $$ |  $$ |$$ |  $$ |  $$ |$$\ $$ |  $$ |$$ |  $$ |  $$ |$$\
+#  $$$$$$  |\$$$$$$  |  \$$$$  |$$$$$$$  |\$$$$$$  |  \$$$$  |
+#  \______/  \______/    \____/ $$  ____/  \______/    \____/
+#                               $$ |
+#                               $$ |
+#                               \__|
+#
+# The following variables set IPFIX output.
+#
 # Link / ODID identifier
 LINK=0
 
@@ -43,9 +141,3 @@ PORT=4739
 # Use UDP yes/no? (instead of TCP)
 UDP=yes
 
-# Size of flow cache, exponent to the power of two
-CACHE_SIZE=17
-
-# Active and inactive timeout in seconds
-ACTIVE_TIMEOUT=300
-INACTIVE_TIMEOUT=65