samples: pktgen: make variable consistent with option
Subsystems (2)
PATCH v4 1/4 samples: pktgen: make variable consistent with option
This commit changes variable names that can cause confusion.
For example, variable DST_MIN is quite confusing since the keyword 'udp_dst_min' and keyword 'dst_min' is used with pg_ctrl.
On the following commit, 'dst_min' will be used to set destination IP, and the existing variable name DST_MIN should be changed.
Variable names are matched to the exact keyword used with pg_ctrl.
--- .../pktgen_bench_xmit_mode_netif_receive.sh | 8 ++++---- .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh | 8 ++++---- samples/pktgen/pktgen_sample01_simple.sh | 16 ++++++++-------- samples/pktgen/pktgen_sample02_multiqueue.sh | 16 ++++++++-------- .../pktgen/pktgen_sample03_burst_single_flow.sh | 8 ++++---- samples/pktgen/pktgen_sample04_many_flows.sh | 8 ++++---- .../pktgen/pktgen_sample05_flow_per_thread.sh | 8 ++++---- ...en_sample06_numa_awared_queue_irq_affinity.sh | 16 ++++++++-------- 8 files changed, 44 insertions(+), 44 deletions(-)
samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh +4 -4
@@ -42,8 +42,8 @@ fi [ -z "$BURST" ] && BURST=1024 [ -z "$COUNT" ] && COUNT="10000000" # Zero means indefinitely if [ -n "$DST_PORT" ]; then - read -r DST_MIN DST_MAX <<< $(parse_ports $DST_PORT) - validate_ports $DST_MIN $DST_MAX + read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) + validate_ports $UDP_DST_MIN $UDP_DST_MAX fi # Base Config
@@ -76,8 +76,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do if [ -n "$DST_PORT" ]; then # Single destination port or random port range pg_set $dev "flag UDPDST_RND" - pg_set $dev "udp_dst_min $DST_MIN" - pg_set $dev "udp_dst_max $DST_MAX" + pg_set $dev "udp_dst_min $UDP_DST_MIN" + pg_set $dev "udp_dst_max $UDP_DST_MAX" fi # Inject packet into RX path of stack
samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh +4 -4
@@ -25,8 +25,8 @@ if [[ -n "$BURST" ]]; then fi [ -z "$COUNT" ] && COUNT="10000000" # Zero means indefinitely if [ -n "$DST_PORT" ]; then - read -r DST_MIN DST_MAX <<< $(parse_ports $DST_PORT) - validate_ports $DST_MIN $DST_MAX + read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) + validate_ports $UDP_DST_MIN $UDP_DST_MAX fi # Base Config
@@ -59,8 +59,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do if [ -n "$DST_PORT" ]; then # Single destination port or random port range pg_set $dev "flag UDPDST_RND" - pg_set $dev "udp_dst_min $DST_MIN" - pg_set $dev "udp_dst_max $DST_MAX" + pg_set $dev "udp_dst_min $UDP_DST_MIN" + pg_set $dev "udp_dst_max $UDP_DST_MAX" fi # Inject packet into TX qdisc egress path of stack
samples/pktgen/pktgen_sample01_simple.sh +8 -8
@@ -23,16 +23,16 @@ fi [ -z "$DST_MAC" ] && usage && err 2 "Must specify -m dst_mac" [ -z "$COUNT" ] && COUNT="100000" # Zero means indefinitely if [ -n "$DST_PORT" ]; then - read -r DST_MIN DST_MAX <<< $(parse_ports $DST_PORT) - validate_ports $DST_MIN $DST_MAX + read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) + validate_ports $UDP_DST_MIN $UDP_DST_MAX fi # Base Config DELAY="0" # Zero means max speed # Flow variation random source port between min and max -UDP_MIN=9 -UDP_MAX=109 +UDP_SRC_MIN=9 +UDP_SRC_MAX=109 # General cleanup everything since last run # (especially important if other threads were configured by other scripts)
@@ -66,14 +66,14 @@ pg_set $DEV "dst$IP6 $DEST_IP" if [ -n "$DST_PORT" ]; then # Single destination port or random port range pg_set $DEV "flag UDPDST_RND" - pg_set $DEV "udp_dst_min $DST_MIN" - pg_set $DEV "udp_dst_max $DST_MAX" + pg_set $DEV "udp_dst_min $UDP_DST_MIN" + pg_set $DEV "udp_dst_max $UDP_DST_MAX" fi # Setup random UDP port src range pg_set $DEV "flag UDPSRC_RND" -pg_set $DEV "udp_src_min $UDP_MIN" -pg_set $DEV "udp_src_max $UDP_MAX" +pg_set $DEV "udp_src_min $UDP_SRC_MIN" +pg_set $DEV "udp_src_max $UDP_SRC_MAX" # start_run echo "Running... ctrl^C to stop" >&2
samples/pktgen/pktgen_sample02_multiqueue.sh +8 -8
@@ -21,8 +21,8 @@ DELAY="0" # Zero means max speed [ -z "$CLONE_SKB" ] && CLONE_SKB="0" # Flow variation random source port between min and max -UDP_MIN=9 -UDP_MAX=109 +UDP_SRC_MIN=9 +UDP_SRC_MAX=109 # (example of setting default params in your script) if [ -z "$DEST_IP" ]; then
@@ -30,8 +30,8 @@ if [ -z "$DEST_IP" ]; then fi [ -z "$DST_MAC" ] && DST_MAC="90:e2:ba:ff:ff:ff" if [ -n "$DST_PORT" ]; then - read -r DST_MIN DST_MAX <<< $(parse_ports $DST_PORT) - validate_ports $DST_MIN $DST_MAX + read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) + validate_ports $UDP_DST_MIN $UDP_DST_MAX fi # General cleanup everything since last run
@@ -67,14 +67,14 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do if [ -n "$DST_PORT" ]; then # Single destination port or random port range pg_set $dev "flag UDPDST_RND" - pg_set $dev "udp_dst_min $DST_MIN" - pg_set $dev "udp_dst_max $DST_MAX" + pg_set $dev "udp_dst_min $UDP_DST_MIN" + pg_set $dev "udp_dst_max $UDP_DST_MAX" fi # Setup random UDP port src range pg_set $dev "flag UDPSRC_RND" - pg_set $dev "udp_src_min $UDP_MIN" - pg_set $dev "udp_src_max $UDP_MAX" + pg_set $dev "udp_src_min $UDP_SRC_MIN" + pg_set $dev "udp_src_max $UDP_SRC_MAX" done # start_run
samples/pktgen/pktgen_sample03_burst_single_flow.sh +4 -4
@@ -34,8 +34,8 @@ fi [ -z "$CLONE_SKB" ] && CLONE_SKB="0" # No need for clones when bursting [ -z "$COUNT" ] && COUNT="0" # Zero means indefinitely if [ -n "$DST_PORT" ]; then - read -r DST_MIN DST_MAX <<< $(parse_ports $DST_PORT) - validate_ports $DST_MIN $DST_MAX + read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) + validate_ports $UDP_DST_MIN $UDP_DST_MAX fi # Base Config
@@ -67,8 +67,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do if [ -n "$DST_PORT" ]; then # Single destination port or random port range pg_set $dev "flag UDPDST_RND" - pg_set $dev "udp_dst_min $DST_MIN" - pg_set $dev "udp_dst_max $DST_MAX" + pg_set $dev "udp_dst_min $UDP_DST_MIN" + pg_set $dev "udp_dst_max $UDP_DST_MAX" fi # Setup burst, for easy testing -b 0 disable bursting
samples/pktgen/pktgen_sample04_many_flows.sh +4 -4
@@ -18,8 +18,8 @@ source ${basedir}/parameters.sh [ -z "$CLONE_SKB" ] && CLONE_SKB="0" [ -z "$COUNT" ] && COUNT="0" # Zero means indefinitely if [ -n "$DST_PORT" ]; then - read -r DST_MIN DST_MAX <<< $(parse_ports $DST_PORT) - validate_ports $DST_MIN $DST_MAX + read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) + validate_ports $UDP_DST_MIN $UDP_DST_MAX fi # NOTICE: Script specific settings
@@ -63,8 +63,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do if [ -n "$DST_PORT" ]; then # Single destination port or random port range pg_set $dev "flag UDPDST_RND" - pg_set $dev "udp_dst_min $DST_MIN" - pg_set $dev "udp_dst_max $DST_MAX" + pg_set $dev "udp_dst_min $UDP_DST_MIN" + pg_set $dev "udp_dst_max $UDP_DST_MAX" fi # Randomize source IP-addresses
samples/pktgen/pktgen_sample05_flow_per_thread.sh +4 -4
@@ -23,8 +23,8 @@ source ${basedir}/parameters.sh [ -z "$BURST" ] && BURST=32 [ -z "$COUNT" ] && COUNT="0" # Zero means indefinitely if [ -n "$DST_PORT" ]; then - read -r DST_MIN DST_MAX <<< $(parse_ports $DST_PORT) - validate_ports $DST_MIN $DST_MAX + read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) + validate_ports $UDP_DST_MIN $UDP_DST_MAX fi # Base Config
@@ -56,8 +56,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do if [ -n "$DST_PORT" ]; then # Single destination port or random port range pg_set $dev "flag UDPDST_RND" - pg_set $dev "udp_dst_min $DST_MIN" - pg_set $dev "udp_dst_max $DST_MAX" + pg_set $dev "udp_dst_min $UDP_DST_MIN" + pg_set $dev "udp_dst_max $UDP_DST_MAX" fi # Setup source IP-addresses based on thread number
samples/pktgen/pktgen_sample06_numa_awared_queue_irq_affinity.sh +8 -8
@@ -20,8 +20,8 @@ DELAY="0" # Zero means max speed [ -z "$CLONE_SKB" ] && CLONE_SKB="0" # Flow variation random source port between min and max -UDP_MIN=9 -UDP_MAX=109 +UDP_SRC_MIN=9 +UDP_SRC_MAX=109 node=`get_iface_node $DEV` irq_array=(`get_iface_irqs $DEV`)
@@ -36,8 +36,8 @@ if [ -z "$DEST_IP" ]; then fi [ -z "$DST_MAC" ] && DST_MAC="90:e2:ba:ff:ff:ff" if [ -n "$DST_PORT" ]; then - read -r DST_MIN DST_MAX <<< $(parse_ports $DST_PORT) - validate_ports $DST_MIN $DST_MAX + read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) + validate_ports $UDP_DST_MIN $UDP_DST_MAX fi # General cleanup everything since last run
@@ -84,14 +84,14 @@ for ((i = 0; i < $THREADS; i++)); do if [ -n "$DST_PORT" ]; then # Single destination port or random port range pg_set $dev "flag UDPDST_RND" - pg_set $dev "udp_dst_min $DST_MIN" - pg_set $dev "udp_dst_max $DST_MAX" + pg_set $dev "udp_dst_min $UDP_DST_MIN" + pg_set $dev "udp_dst_max $UDP_DST_MAX" fi # Setup random UDP port src range pg_set $dev "flag UDPSRC_RND" - pg_set $dev "udp_src_min $UDP_MIN" - pg_set $dev "udp_src_max $UDP_MAX" + pg_set $dev "udp_src_min $UDP_SRC_MIN" + pg_set $dev "udp_src_max $UDP_SRC_MAX" done # start_run
Signature · 1 line
2.20.1
PATCH v4 2/4 samples: pktgen: fix proc_cmd command result check logic
Currently, proc_cmd is used to dispatch command to 'pg_ctrl', 'pg_thread', 'pg_set'. proc_cmd is designed to check command result with grep the "Result:", but this might fail since this string is only shown in 'pg_thread' and 'pg_set'.
This commit fixes this logic by grep-ing the "Result:" string only when the command is not for 'pg_ctrl'.
For clarity of an execution flow, 'errexit' flag has been set.
To cleanup pktgen on exit, trap has been added for EXIT signal.
--- samples/pktgen/functions.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
samples/pktgen/functions.sh +13 -7
@@ -5,6 +5,8 @@ # Author: Jesper Dangaaard Brouer # License: GPL +set -o errexit + ## -- General shell logging cmds -- function err() { local exitcode=$1
@@ -58,6 +60,7 @@ function pg_set() { function proc_cmd() { local result local proc_file=$1 + local status=0 # after shift, the remaining args are contained in $@ shift local proc_ctrl=${PROC_DIR}/$proc_file
@@ -73,13 +76,14 @@ function proc_cmd() { echo "cmd: $@ > $proc_ctrl" fi # Quoting of "$@" is important for space expansion - echo "$@" > "$proc_ctrl" - local status=$? - - result=$(grep "Result: OK:" $proc_ctrl) - # Due to pgctrl, cannot use exit code $? from grep - if [[ "$result" == "" ]]; then - grep "Result:" $proc_ctrl >&2 + echo "$@" > "$proc_ctrl" || status=$? + + if [[ "$proc_file" != "pgctrl" ]]; then + result=$(grep "Result: OK:" $proc_ctrl) || true + # Due to pgctrl, cannot use exit code $? from grep + if [[ "$result" == "" ]]; then + grep "Result:" $proc_ctrl >&2 + fi fi if (( $status != 0 )); then err 5 "Write error($status) occurred cmd: \"$@ > $proc_ctrl\""
@@ -105,6 +109,8 @@ function pgset() { fi } +trap 'pg_ctrl "reset"' EXIT + ## -- General shell tricks -- function root_check_run_with_sudo() {
Signature · 1 line
2.20.1
PATCH v4 3/4 samples: pktgen: add helper functions for IP(v4/v6) CIDR parsing
In reply to Daniel T. LeeThis commit adds CIDR parsing and IP validate helper function to parse single IP or range of IP with CIDR. (e.g. 198.18.0.0/15)
Validating the address should be preceded prior to the parsing. Helpers will be used in prior to set target address in samples/pktgen.
---
Changes since v3:
* Set errexit option to stop script execution on error
Changes since v4:
* Set errexit option moved to previous commit
* previously, the reason 'parse_addr' won't exit on error was using here-string which runs on subshell.
* to avoid this, 'validate_addr' is removed from the 'parse_addr' flow.
* to remove duplicated comparison, added 'in_between' helper func
samples/pktgen/functions.sh | 137 +++++++++++++++++++++++++++++++++++-
1 file changed, 134 insertions(+), 3 deletions(-)
samples/pktgen/functions.sh +134 -3
@@ -169,6 +169,137 @@ function get_node_cpus() echo $node_cpu_list } +# Check $1 is in between $2, $3 ($2 <= $1 <= $3) +function in_between() { [[ ($1 -ge $2) && ($1 -le $3) ]] ; } + +# Extend shrunken IPv6 address. +# fe80::42:bcff:fe84:e10a => fe80:0:0:0:42:bcff:fe84:e10a +function extend_addr6() +{ + local addr=$1 + local sep=: sep2=:: + local sep_cnt=$(tr -cd $sep <<< $1 | wc -c) + local shrink + + # separator count should be (2 <= $sep_cnt <= 7) + if ! (in_between $sep_cnt 2 7); then + err 5 "Invalid IP6 address: $1" + fi + + # if shrink '::' occurs multiple, it's malformed. + shrink=( $(egrep -o "$sep{2,}" <<< $addr) ) + if [[ ${#shrink[@]} -ne 0 ]]; then + if [[ ${#shrink[@]} -gt 1 || ( ${shrink[0]} != $sep2 ) ]]; then + err 5 "Invalid IP6 address: $1" + fi + fi + + # add 0 at begin & end, and extend addr by adding :0 + [[ ${addr:0:1} == $sep ]] && addr=0${addr} + [[ ${addr: -1} == $sep ]] && addr=${addr}0 + echo "${addr/$sep2/$(printf ':0%.s' $(seq $[8-sep_cnt])):}" +} + +# Given a single IP(v4/v6) address, whether it is valid. +function validate_addr() +{ + # check function is called with (funcname)6 + [[ ${FUNCNAME[1]: -1} == 6 ]] && local IP6=6 + local bitlen=$[ IP6 ? 128 : 32 ] + local len=$[ IP6 ? 8 : 4 ] + local max=$[ 2**(len*2)-1 ] + local net prefix + local addr sep + + IFS='/' read net prefix <<< $1 + [[ $IP6 ]] && net=$(extend_addr6 $net) + + # if prefix exists, check (0 <= $prefix <= $bitlen) + if [[ -n $prefix ]]; then + if ! (in_between $prefix 0 $bitlen); then + err 5 "Invalid prefix: /$prefix" + fi + fi + + # set separator for each IP(v4/v6) + [[ $IP6 ]] && sep=: || sep=. + IFS=$sep read -a addr <<< $net + + # array length + if [[ ${#addr[@]} != $len ]]; then + err 5 "Invalid IP$IP6 address: $1" + fi + + # check each digit (0 <= $digit <= $max) + for digit in "${addr[@]}"; do + [[ $IP6 ]] && digit=$[ 16#$digit ] + if ! (in_between $digit 0 $max); then + err 5 "Invalid IP$IP6 address: $1" + fi + done + + return 0 +} + +function validate_addr6() { validate_addr $@ ; } + +# Given a single IP(v4/v6) or CIDR, return minimum and maximum IP addr. +function parse_addr() +{ + # check function is called with (funcname)6 + [[ ${FUNCNAME[1]: -1} == 6 ]] && local IP6=6 + local net prefix + local min_ip max_ip + + IFS='/' read net prefix <<< $1 + [[ $IP6 ]] && net=$(extend_addr6 $net) + + if [[ -z $prefix ]]; then + min_ip=$net + max_ip=$net + else + # defining array for converting Decimal 2 Binary + # 00000000 00000001 00000010 00000011 00000100 ... + local d2b='{0..1}{0..1}{0..1}{0..1}{0..1}{0..1}{0..1}{0..1}' + [[ $IP6 ]] && d2b+=$d2b + eval local D2B=($d2b) + + local bitlen=$[ IP6 ? 128 : 32 ] + local remain=$[ bitlen-prefix ] + local octet=$[ IP6 ? 16 : 8 ] + local min_mask max_mask + local min max + local ip_bit + local ip sep + + # set separator for each IP(v4/v6) + [[ $IP6 ]] && sep=: || sep=. + IFS=$sep read -ra ip <<< $net + + min_mask="$(printf '1%.s' $(seq $prefix))$(printf '0%.s' $(seq $remain))" + max_mask="$(printf '0%.s' $(seq $prefix))$(printf '1%.s' $(seq $remain))" + + # calculate min/max ip with &,| operator + for i in "${!ip[@]}"; do + digit=$[ IP6 ? 16#${ip[$i]} : ${ip[$i]} ] + ip_bit=${D2B[$digit]} + + idx=$[ octet*i ] + min[$i]=$[ 2#$ip_bit & 2#${min_mask:$idx:$octet} ] + max[$i]=$[ 2#$ip_bit | 2#${max_mask:$idx:$octet} ] + [[ $IP6 ]] && { min[$i]=$(printf '%X' ${min[$i]}); + max[$i]=$(printf '%X' ${max[$i]}); } + done + + min_ip=$(IFS=$sep; echo "${min[*]}") + max_ip=$(IFS=$sep; echo "${max[*]}") + fi + + echo $min_ip $max_ip +} + +function parse_addr6() { parse_addr $@ ; } + # Given a single or range of port(s), return minimum and maximum port number. function parse_ports() {
@@ -191,9 +322,9 @@ function validate_ports() local min_port=$1 local max_port=$2 - # 0 < port < 65536 - if [[ $min_port -gt 0 && $min_port -lt 65536 ]]; then - if [[ $max_port -gt 0 && $max_port -lt 65536 ]]; then + # 1 <= port <= 65535 + if (in_between $min_port 1 65535); then + if (in_between $max_port 1 65535); then if [[ $min_port -le $max_port ]]; then return 0 fi
Signature · 1 line
2.20.1
PATCH v4 4/4 samples: pktgen: allow to specify destination IP range (CIDR)
In reply to Daniel T. LeeCurrently, kernel pktgen has the feature to specify destination address range for sending packet. (e.g. pgset "dst_min/dst_max")
But on samples, each pktgen script doesn't have any option to achieve this.
This commit adds the feature to specify the destination address range with CIDR.
-d : ($DEST_IP) destination IP. CIDR (e.g. 198.18.0.0/15) is also allowed
# ./pktgen_sample01_simple.sh -6 -d fe80::20/126 -p 3000 -n 4
# tcpdump ip6 and udp
05:14:18.082285 IP6 fe80::99.71 > fe80::23.3000: UDP, length 16
05:14:18.082564 IP6 fe80::99.43 > fe80::23.3000: UDP, length 16
05:14:18.083366 IP6 fe80::99.107 > fe80::22.3000: UDP, length 16
05:14:18.083585 IP6 fe80::99.97 > fe80::21.3000: UDP, length 16---
Changes since v4:
* 'validate_addr' is called prior to 'parse_addr'
samples/pktgen/README.rst | 2 +- samples/pktgen/parameters.sh | 2 +- .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 7 ++++++- .../pktgen/pktgen_bench_xmit_mode_queue_xmit.sh | 7 ++++++- samples/pktgen/pktgen_sample01_simple.sh | 7 ++++++- samples/pktgen/pktgen_sample02_multiqueue.sh | 7 ++++++- .../pktgen/pktgen_sample03_burst_single_flow.sh | 7 ++++++- samples/pktgen/pktgen_sample04_many_flows.sh | 14 +++++++++++--- samples/pktgen/pktgen_sample05_flow_per_thread.sh | 7 ++++++- ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 7 ++++++- 10 files changed, 55 insertions(+), 12 deletions(-)
samples/pktgen/README.rst +1 -1
@@ -18,7 +18,7 @@ across the sample scripts. Usage example is printed on errors:: Usage: ./pktgen_sample01_simple.sh [-vx] -i ethX -i : ($DEV) output interface/device (required) -s : ($PKT_SIZE) packet size - -d : ($DEST_IP) destination IP + -d : ($DEST_IP) destination IP. CIDR (e.g. 198.18.0.0/15) is also allowed -m : ($DST_MAC) destination MAC-addr -p : ($DST_PORT) destination PORT range (e.g. 433-444) is also allowed -t : ($THREADS) threads to start
samples/pktgen/parameters.sh +1 -1
@@ -8,7 +8,7 @@ function usage() { echo "Usage: $0 [-vx] -i ethX" echo " -i : (\$DEV) output interface/device (required)" echo " -s : (\$PKT_SIZE) packet size" - echo " -d : (\$DEST_IP) destination IP" + echo " -d : (\$DEST_IP) destination IP. CIDR (e.g. 198.18.0.0/15) is also allowed" echo " -m : (\$DST_MAC) destination MAC-addr" echo " -p : (\$DST_PORT) destination PORT range (e.g. 433-444) is also allowed" echo " -t : (\$THREADS) threads to start"
samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh +6 -1
@@ -41,6 +41,10 @@ fi [ -z "$DST_MAC" ] && DST_MAC="90:e2:ba:ff:ff:ff" [ -z "$BURST" ] && BURST=1024 [ -z "$COUNT" ] && COUNT="10000000" # Zero means indefinitely +if [ -n "$DEST_IP" ]; then + validate_addr${IP6} $DEST_IP + read -r DST_MIN DST_MAX <<< $(parse_addr${IP6} $DEST_IP) +fi if [ -n "$DST_PORT" ]; then read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) validate_ports $UDP_DST_MIN $UDP_DST_MAX
@@ -71,7 +75,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do # Destination pg_set $dev "dst_mac $DST_MAC" - pg_set $dev "dst$IP6 $DEST_IP" + pg_set $dev "dst${IP6}_min $DST_MIN" + pg_set $dev "dst${IP6}_max $DST_MAX" if [ -n "$DST_PORT" ]; then # Single destination port or random port range
samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh +6 -1
@@ -24,6 +24,10 @@ if [[ -n "$BURST" ]]; then err 1 "Bursting not supported for this mode" fi [ -z "$COUNT" ] && COUNT="10000000" # Zero means indefinitely +if [ -n "$DEST_IP" ]; then + validate_addr${IP6} $DEST_IP + read -r DST_MIN DST_MAX <<< $(parse_addr${IP6} $DEST_IP) +fi if [ -n "$DST_PORT" ]; then read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) validate_ports $UDP_DST_MIN $UDP_DST_MAX
@@ -54,7 +58,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do # Destination pg_set $dev "dst_mac $DST_MAC" - pg_set $dev "dst$IP6 $DEST_IP" + pg_set $dev "dst${IP6}_min $DST_MIN" + pg_set $dev "dst${IP6}_max $DST_MAX" if [ -n "$DST_PORT" ]; then # Single destination port or random port range
samples/pktgen/pktgen_sample01_simple.sh +6 -1
@@ -22,6 +22,10 @@ fi # Example enforce param "-m" for dst_mac [ -z "$DST_MAC" ] && usage && err 2 "Must specify -m dst_mac" [ -z "$COUNT" ] && COUNT="100000" # Zero means indefinitely +if [ -n "$DEST_IP" ]; then + validate_addr${IP6} $DEST_IP + read -r DST_MIN DST_MAX <<< $(parse_addr${IP6} $DEST_IP) +fi if [ -n "$DST_PORT" ]; then read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) validate_ports $UDP_DST_MIN $UDP_DST_MAX
@@ -61,7 +65,8 @@ pg_set $DEV "flag NO_TIMESTAMP" # Destination pg_set $DEV "dst_mac $DST_MAC" -pg_set $DEV "dst$IP6 $DEST_IP" +pg_set $DEV "dst${IP6}_min $DST_MIN" +pg_set $DEV "dst${IP6}_max $DST_MAX" if [ -n "$DST_PORT" ]; then # Single destination port or random port range
samples/pktgen/pktgen_sample02_multiqueue.sh +6 -1
@@ -29,6 +29,10 @@ if [ -z "$DEST_IP" ]; then [ -z "$IP6" ] && DEST_IP="198.18.0.42" || DEST_IP="FD00::1" fi [ -z "$DST_MAC" ] && DST_MAC="90:e2:ba:ff:ff:ff" +if [ -n "$DEST_IP" ]; then + validate_addr${IP6} $DEST_IP + read -r DST_MIN DST_MAX <<< $(parse_addr${IP6} $DEST_IP) +fi if [ -n "$DST_PORT" ]; then read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) validate_ports $UDP_DST_MIN $UDP_DST_MAX
@@ -62,7 +66,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do # Destination pg_set $dev "dst_mac $DST_MAC" - pg_set $dev "dst$IP6 $DEST_IP" + pg_set $dev "dst${IP6}_min $DST_MIN" + pg_set $dev "dst${IP6}_max $DST_MAX" if [ -n "$DST_PORT" ]; then # Single destination port or random port range
samples/pktgen/pktgen_sample03_burst_single_flow.sh +6 -1
@@ -33,6 +33,10 @@ fi [ -z "$BURST" ] && BURST=32 [ -z "$CLONE_SKB" ] && CLONE_SKB="0" # No need for clones when bursting [ -z "$COUNT" ] && COUNT="0" # Zero means indefinitely +if [ -n "$DEST_IP" ]; then + validate_addr${IP6} $DEST_IP + read -r DST_MIN DST_MAX <<< $(parse_addr${IP6} $DEST_IP) +fi if [ -n "$DST_PORT" ]; then read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) validate_ports $UDP_DST_MIN $UDP_DST_MAX
@@ -62,7 +66,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do # Destination pg_set $dev "dst_mac $DST_MAC" - pg_set $dev "dst$IP6 $DEST_IP" + pg_set $dev "dst${IP6}_min $DST_MIN" + pg_set $dev "dst${IP6}_max $DST_MAX" if [ -n "$DST_PORT" ]; then # Single destination port or random port range
samples/pktgen/pktgen_sample04_many_flows.sh +11 -3
@@ -17,6 +17,10 @@ source ${basedir}/parameters.sh [ -z "$DST_MAC" ] && DST_MAC="90:e2:ba:ff:ff:ff" [ -z "$CLONE_SKB" ] && CLONE_SKB="0" [ -z "$COUNT" ] && COUNT="0" # Zero means indefinitely +if [ -n "$DEST_IP" ]; then + validate_addr $DEST_IP + read -r DST_MIN DST_MAX <<< $(parse_addr $DEST_IP) +fi if [ -n "$DST_PORT" ]; then read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) validate_ports $UDP_DST_MIN $UDP_DST_MAX
@@ -37,6 +41,9 @@ if [[ -n "$BURST" ]]; then err 1 "Bursting not supported for this mode" fi +# 198.18.0.0 / 198.19.255.255 +read -r SRC_MIN SRC_MAX <<< $(parse_addr 198.18.0.0/15) + # General cleanup everything since last run pg_ctrl "reset"
@@ -58,7 +65,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do # Single destination pg_set $dev "dst_mac $DST_MAC" - pg_set $dev "dst $DEST_IP" + pg_set $dev "dst_min $DST_MIN" + pg_set $dev "dst_max $DST_MAX" if [ -n "$DST_PORT" ]; then # Single destination port or random port range
@@ -69,8 +77,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do # Randomize source IP-addresses pg_set $dev "flag IPSRC_RND" - pg_set $dev "src_min 198.18.0.0" - pg_set $dev "src_max 198.19.255.255" + pg_set $dev "src_min $SRC_MIN" + pg_set $dev "src_max $SRC_MAX" # Limit number of flows (max 65535) pg_set $dev "flows $FLOWS"
samples/pktgen/pktgen_sample05_flow_per_thread.sh +6 -1
@@ -22,6 +22,10 @@ source ${basedir}/parameters.sh [ -z "$CLONE_SKB" ] && CLONE_SKB="0" [ -z "$BURST" ] && BURST=32 [ -z "$COUNT" ] && COUNT="0" # Zero means indefinitely +if [ -n "$DEST_IP" ]; then + validate_addr $DEST_IP + read -r DST_MIN DST_MAX <<< $(parse_addr $DEST_IP) +fi if [ -n "$DST_PORT" ]; then read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) validate_ports $UDP_DST_MIN $UDP_DST_MAX
@@ -51,7 +55,8 @@ for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do # Single destination pg_set $dev "dst_mac $DST_MAC" - pg_set $dev "dst $DEST_IP" + pg_set $dev "dst_min $DST_MIN" + pg_set $dev "dst_max $DST_MAX" if [ -n "$DST_PORT" ]; then # Single destination port or random port range
samples/pktgen/pktgen_sample06_numa_awared_queue_irq_affinity.sh +6 -1
@@ -35,6 +35,10 @@ if [ -z "$DEST_IP" ]; then [ -z "$IP6" ] && DEST_IP="198.18.0.42" || DEST_IP="FD00::1" fi [ -z "$DST_MAC" ] && DST_MAC="90:e2:ba:ff:ff:ff" +if [ -n "$DEST_IP" ]; then + validate_addr${IP6} $DEST_IP + read -r DST_MIN DST_MAX <<< $(parse_addr${IP6} $DEST_IP) +fi if [ -n "$DST_PORT" ]; then read -r UDP_DST_MIN UDP_DST_MAX <<< $(parse_ports $DST_PORT) validate_ports $UDP_DST_MIN $UDP_DST_MAX
@@ -79,7 +83,8 @@ for ((i = 0; i < $THREADS; i++)); do # Destination pg_set $dev "dst_mac $DST_MAC" - pg_set $dev "dst$IP6 $DEST_IP" + pg_set $dev "dst${IP6}_min $DST_MIN" + pg_set $dev "dst${IP6}_max $DST_MAX" if [ -n "$DST_PORT" ]; then # Single destination port or random port range
Signature · 1 line
2.20.1
Quoted 1 line · On Fri, 4 Oct 2019 10:32:58 +0900 "Daniel T. Lee" <[email protected]>…
[...]
A general comment, you forgot a cover letter for your patchset.
And also forgot the "PATCH" part of subj. but patchwork still found it:
https://patchwork.ozlabs.org/project/netdev/list/?series=134102&state=2a
Signature · 4 lines
Best regards, Jesper Dangaard Brouer MSc.CS, Principal Kernel Engineer at Red Hat LinkedIn: http://www.linkedin.com/in/brouer
Quoted 11 lines · On Fri, 4 Oct 2019 10:32:58 +0900 "Daniel T. Lee" <[email protected]>…
This commit changes variable names that can cause confusion.
For example, variable
DST_MINis quite confusing since the keyword 'udp_dst_min' and keyword 'dst_min' is used withpg_ctrl.On the following commit, '
dst_min' will be used to set destination IP, and the existing variable nameDST_MINshould be changed.Variable names are matched to the exact keyword used with
pg_ctrl.Signed-off-by Daniel T. Lee <[email protected]>
Signature · 4 lines
Best regards, Jesper Dangaard Brouer MSc.CS, Principal Kernel Engineer at Red Hat LinkedIn: http://www.linkedin.com/in/brouer
Re: [v4 2/4] samples: pktgen: fix proc_cmd command result check logic
In reply to Daniel T. LeeQuoted 44 lines · On Fri, 4 Oct 2019 10:32:59 +0900 "Daniel T. Lee" <[email protected]>…
Currently,
proc_cmdis used to dispatch command to 'pg_ctrl', 'pg_thread', 'pg_set'.proc_cmdis designed to check command result with grep the "Result:", but this might fail since this string is only shown in 'pg_thread' and 'pg_set'.This commit fixes this logic by grep-ing the "Result:" string only when the command is not for '
pg_ctrl'.For clarity of an execution flow, 'errexit' flag has been set.
To cleanup pktgen on exit, trap has been added for EXIT signal.
Signed-off-by Daniel T. Lee <[email protected]>--- samples/pktgen/functions.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)samples/pktgen/functions.sh +3
-2@@ -5,6 +5,8 @@ # Author: Jesper Dangaaard Brouer # License: GPL +set -o errexit + ## -- General shell logging cmds -- function err() { local exitcode=$1@@ -58,6 +60,7 @@ function pg_set() { function proc_cmd() { local result local proc_file=$1 + local status=0 # after shift, the remaining args are contained in $@ shift local proc_ctrl=${PROC_DIR}/$proc_file@@ -73,13 +76,14 @@ function proc_cmd() { echo "cmd: $@ > $proc_ctrl" fi # Quoting of "$@" is important for space expansion - echo "$@" > "$proc_ctrl" - local status=$?
samples/pktgen/functions.sh function proc_cmd() { · line 83
Quoted 10 lines
samples/pktgen/functions.sh +5
-5- - result=$(grep "Result: OK:" $proc_ctrl) - # Due to pgctrl, cannot use exit code $? from grep - if [[ "$result" == "" ]]; then - grep "Result:" $proc_ctrl >&2 + echo "$@" > "$proc_ctrl" || status=$? + + if [[ "$proc_file" != "pgctrl" ]]; then + result=$(grep "Result: OK:" $proc_ctrl) || true + # Due to pgctrl, cannot use exit code $? from grep
Is this comment still relevant? You just excluded "pgctrl" from getting into this section.
samples/pktgen/functions.sh function proc_cmd() { · line 85
Quoted 2 lines
samples/pktgen/functions.sh +2
-0+ if [[ "$result" == "" ]]; then + grep "Result:" $proc_ctrl >&2
Missing tap/indention?
samples/pktgen/functions.sh function pgset() { · line 113
Quoted 10 lines
samples/pktgen/functions.sh +3
-0+ fi fi if (( $status != 0 )); then err 5 "Write error($status) occurred cmd: \"$@ > $proc_ctrl\""@@ -105,6 +109,8 @@ function pgset() { fi } +trap 'pg_ctrl "reset"' EXIT +
This line is activated when I ctrl-C the scripts, but something weird happens, it reports:
ERROR: proc file:/proc/net/pktgen/pgctrl not writable, not root?!
Quoted 3 lines
samples/pktgen/functions.sh +0
-0## -- General shell tricks -- function root_check_run_with_sudo() {
Signature · 4 lines
Best regards, Jesper Dangaard Brouer MSc.CS, Principal Kernel Engineer at Red Hat LinkedIn: http://www.linkedin.com/in/brouer
Quoted 6 lines · Jesper Dangaard Brouer
Quoted 1 line · On Fri, 4 Oct 2019 10:32:58 +0900 "Daniel T. Lee" <[email protected]>…
[...]
Thanks for the review!
Quoted 2 lines
A general comment, you forgot a cover letter for your patchset.
At first, I thought the size of the patchset (the feature to enhance) was small so
I didn't include it with intent, but now it gets bigger and it seems necessary for cover letter.
When the next version is needed, I'll include it.
Quoted 3 lines
And also forgot the "PATCH" part of subj. but patchwork still found it:
https://patchwork.ozlabs.org/project/netdev/list/?series=134102&state=2a
I'm not sure I'm following.
Are you saying that the word "PATCH" should be included in prefix?
$ git format-patch --subject-prefix="PATCH,v5" like this?
And again, I really appreciate your time and effort for the review.
Thanks,
Daniel
Quoted 6 lines
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Principal Kernel Engineer at Red Hat
LinkedIn: http://www.linkedin.com/in/brouer
Quoted 20 lines · On Fri, 4 Oct 2019 22:28:26 +0900 "Daniel T. Lee" <[email protected]>…
Quoted 6 lines · Jesper Dangaard Brouer
Quoted 1 line · On Fri, 4 Oct 2019 10:32:58 +0900 "Daniel T. Lee" <[email protected]>…
[...]
Thanks for the review!
Quoted 2 lines
A general comment, you forgot a cover letter for your patchset.
At first, I thought the size of the patchset (the feature to enhance) was small so
I didn't include it with intent, but now it gets bigger and it seems necessary for cover letter.When the next version is needed, I'll include it.
Quoted 8 lines
Quoted 3 lines
And also forgot the "PATCH" part of subj. but patchwork still found it:
https://patchwork.ozlabs.org/project/netdev/list/?series=134102&state=2aI'm not sure I'm following.
Are you saying that the word "PATCH" should be included in prefix?$ git format-patch --subject-prefix="PATCH,v5" like this?
I would say "[PATCH net-next v5]" as you should also say which kernel tree, in this case net-next.
All the rules are documented here:
https://www.kernel.org/doc/html/latest/process/index.html
https://www.kernel.org/doc/html/latest/process/submitting-patches.html
This netdev list have it's own extra rules:
https://www.kernel.org/doc/html/latest/networking/netdev-FAQ.html
Signature · 4 lines
Best regards, Jesper Dangaard Brouer MSc.CS, Principal Kernel Engineer at Red Hat LinkedIn: http://www.linkedin.com/in/brouer
Quoted 36 lines · Jesper Dangaard Brouer
Quoted 20 lines · On Fri, 4 Oct 2019 22:28:26 +0900 "Daniel T. Lee" <[email protected]>…
Quoted 6 lines · Jesper Dangaard Brouer
Quoted 1 line · On Fri, 4 Oct 2019 10:32:58 +0900 "Daniel T. Lee" <[email protected]>…
[...]
Thanks for the review!
Quoted 2 lines
A general comment, you forgot a cover letter for your patchset.
At first, I thought the size of the patchset (the feature to enhance) was small so
I didn't include it with intent, but now it gets bigger and it seems necessary for cover letter.When the next version is needed, I'll include it.
Quoted 8 lines
Quoted 3 lines
And also forgot the "PATCH" part of subj. but patchwork still found it:
https://patchwork.ozlabs.org/project/netdev/list/?series=134102&state=2aI'm not sure I'm following.
Are you saying that the word "PATCH" should be included in prefix?$ git format-patch --subject-prefix="PATCH,v5" like this?I would say "[PATCH net-next v5]" as you should also say which kernel tree, in this case net-next.
Quoted 7 lines
All the rules are documented here:
https://www.kernel.org/doc/html/latest/process/index.html
https://www.kernel.org/doc/html/latest/process/submitting-patches.htmlThis netdev list have it's own extra rules:
https://www.kernel.org/doc/html/latest/networking/netdev-FAQ.html
Thanks for the confirmation and letting me know.
I'll stick to it!
Thanks,
Daniel
Quoted 5 lines
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Principal Kernel Engineer at Red Hat
LinkedIn: http://www.linkedin.com/in/brouer
Quoted 24 lines · Daniel T. Lee
Quoted 7 lines · Jesper Dangaard Brouer
Quoted 1 line · On Fri, 4 Oct 2019 10:32:58 +0900 "Daniel T. Lee" <[email protected]>…
[...]
Thanks for the review!
Quoted 3 lines
A general comment, you forgot a cover letter for your patchset.
At first, I thought the size of the patchset (the feature to enhance) was small so
I didn't include it with intent, but now it gets bigger and it seems necessary for cover letter.When the next version is needed, I'll include it.
Quoted 8 lines
Quoted 4 lines
And also forgot the "PATCH" part of subj. but patchwork still found it:
https://patchwork.ozlabs.org/project/netdev/list/?series=134102&state=2aI'm not sure I'm following.
Are you saying that the word "PATCH" should be included in prefix?$ git format-patch --subject-prefix="PATCH,v5" like this?
$ git format-patch --subject-prefix="PATCH bpf-next" -v5
would be the right incantation for this :)
-Toke
Re: [v4 2/4] samples: pktgen: fix proc_cmd command result check logic
In reply to Jesper Dangaard BrouerQuoted 6 lines · Jesper Dangaard Brouer
[...]
Is this comment still relevant? You just excluded "pgctrl" from getting into this section.
Oops, will fix it right away.
Quoted 13 lines
samples/pktgen/functions.sh function proc_cmd() { · line 85
Quoted 2 lines
samples/pktgen/functions.sh +2
-0+ if [[ "$result" == "" ]]; then + grep "Result:" $proc_ctrl >&2Missing tap/indention?
Quoted 8 lines
samples/pktgen/functions.sh +1
-0+ fi fi if (( $status != 0 )); then err 5 "Write error($status) occurred cmd: \"$@ > $proc_ctrl\""@@ -105,6 +109,8 @@ function pgset() { fi }
Quoted 8 lines
samples/pktgen/functions.sh function pgset() { · line 113
Quoted 2 lines
samples/pktgen/functions.sh +2
-0+trap 'pg_ctrl "reset"' EXIT +This line is activated when I ctrl-C the scripts, but something weird happens, it reports:
ERROR: proc file:/proc/net/pktgen/pgctrl not writable, not root?!
Seems, the error is shown when the script is executed without sudo. By grep-ing the debug info with 'set -x', you can find out that script elevate itself to sudo by 'root_check_run_with_sudo'.
As you can see, there are three 'pg_ctrl reset'.
First one is called as preparation for packet sending,
Second is called as trap EXIT when sudo elevated script is done and exit. Last one is also called as trap EXIT, but it is not executed as sudo.
$ ./pktgen_sample01_simple.sh 1>/dev/null 2>out $ cat out | egrep -A 2 -B 2 'trap|sudo|pg_ctrl reset' ... ++ trap 'pg_ctrl "reset"' EXIT + root_check_run_with_sudo + '[' 1000 -ne 0 ']' + '[' -x ./pktgen_sample01_simple.sh ']' + info 'Not root, running with sudo' + [[ -n '' ]] + sudo ./pktgen_sample01_simple.sh ++ export PROC_DIR=/proc/net/pktgen ++ PROC_DIR=/proc/net/pktgen ++ trap 'pg_ctrl "reset"' EXIT + root_check_run_with_sudo + '[' 0 -ne 0 ']' + source ./parameters.sh -- + UDP_SRC_MIN=9 + UDP_SRC_MAX=109 + pg_ctrl reset + local proc_file=pgctrl + proc_cmd pgctrl reset -- + echo 'Result device: wlp2s0' + cat /proc/net/pktgen/wlp2s0 + pg_ctrl reset + local proc_file=pgctrl + proc_cmd pgctrl reset -- + (( 0 != 0 )) + exit 0 + pg_ctrl reset + local proc_file=pgctrl + proc_cmd pgctrl reset
As for solution, only call 'pg_ctrl reset' when it's running as sudo will solve the problem.
-trap 'pg_ctrl "reset"' EXIT
+trap '[[ $EUID -eq 0 ]] && pg_ctrl "reset"' EXIT
Will apply this at next version of patch.
Thanks,
Daniel
Quoted 12 lines
samples/pktgen/functions.sh function pgset() { · line 116
Quoted 4 lines
samples/pktgen/functions.sh +0
-0## -- General shell tricks -- function root_check_run_with_sudo() {--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Principal Kernel Engineer at Red Hat
LinkedIn: http://www.linkedin.com/in/brouer