Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f881503 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pktgen-new-parameters' 



Tariq Toukan says:

====================
pktgen new parameters

This patchset adds two parameters to the pktgen scripts.
* The first patch adds a parameter to control the number of
  packets sent by every pktgen thread.
* The second patch adds a parameter to control the index of
  first thread, instead of always starting from cpu 0.

Series generated against net-next commit:
f7aec129 rxrpc: Cache the congestion window setting

Thanks,
Tariq.

V2:
* rebased to latest net-next.
* per Jesper's comments on Patch 2, fixed $F_THREAD description
  and $L_THREAD evaluation.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cb7fbb64 e0e16672

samples/pktgen/README.rst

+2 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ across the sample scripts. Usage example is printed on errors:: 
  -d : ($DEST_IP)   destination IP

  -m : ($DST_MAC)   destination MAC-addr

  -t : ($THREADS)   threads to start

  -f : ($F_THREAD)  index of first thread (zero indexed CPU number)

  -c : ($SKB_CLONE) SKB clones send before alloc new SKB

  -n : ($COUNT)     num messages to send per thread, 0 means indefinitely

  -b : ($BURST)     HW level bursting of SKBs

  -v : ($VERBOSE)   verbose

  -x : ($DEBUG)     debug

samples/pktgen/parameters.sh

+19 −6
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ function usage() { 
    echo "  -d : (\$DEST_IP)   destination IP"

    echo "  -m : (\$DST_MAC)   destination MAC-addr"

    echo "  -t : (\$THREADS)   threads to start"

    echo "  -f : (\$F_THREAD)  index of first thread (zero indexed CPU number)"

    echo "  -c : (\$SKB_CLONE) SKB clones send before alloc new SKB"

    echo "  -n : (\$COUNT)     num messages to send per thread, 0 means indefinitely"

    echo "  -b : (\$BURST)     HW level bursting of SKBs"

    echo "  -v : (\$VERBOSE)   verbose"

    echo "  -x : (\$DEBUG)     debug"
@@ -20,7 +22,7 @@ function usage() { 


##  --- Parse command line arguments / parameters ---

## echo "Commandline options:"

while getopts "s:i:d:m:t:c:b:vxh6" option; do

while getopts "s:i:d:m:f:t:c:n:b:vxh6" option; do

    case $option in

        i) # interface

          export DEV=$OPTARG
@@ -38,16 +40,22 @@ while getopts "s:i:d:m:t:c:b:vxh6" option; do 
          export DST_MAC=$OPTARG

	  info "Destination MAC set to: DST_MAC=$DST_MAC"

          ;;

        f)

	  export F_THREAD=$OPTARG

	  info "Index of first thread (zero indexed CPU number): $F_THREAD"

          ;;

        t)

	  export THREADS=$OPTARG

          export CPU_THREADS=$OPTARG

	  let "CPU_THREADS -= 1"

	  info "Number of threads to start: $THREADS (0 to $CPU_THREADS)"

	  info "Number of threads to start: $THREADS"

          ;;

        c)

	  export CLONE_SKB=$OPTARG

	  info "CLONE_SKB=$CLONE_SKB"

          ;;

        n)

	  export COUNT=$OPTARG

	  info "COUNT=$COUNT"

          ;;

        b)

	  export BURST=$OPTARG

	  info "SKB bursting: BURST=$BURST"
@@ -77,12 +85,17 @@ if [ -z "$PKT_SIZE" ]; then 
    info "Default packet size set to: set to: $PKT_SIZE bytes"

fi



if [ -z "$F_THREAD" ]; then

    # First thread (F_THREAD) reference the zero indexed CPU number

    export F_THREAD=0

fi



if [ -z "$THREADS" ]; then

    # Zero CPU threads means one thread, because CPU numbers are zero indexed

    export CPU_THREADS=0

    export THREADS=1

fi



export L_THREAD=$(( THREADS + F_THREAD - 1 ))



if [ -z "$DEV" ]; then

    usage

    err 2 "Please specify output device"

samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh

+3 −3
Original line number Diff line number Diff line
@@ -39,16 +39,16 @@ if [ -z "$DEST_IP" ]; then 
fi

[ -z "$DST_MAC" ] && DST_MAC="90:e2:ba:ff:ff:ff"

[ -z "$BURST" ] && BURST=1024

[ -z "$COUNT" ] && COUNT="10000000" # Zero means indefinitely



# Base Config

DELAY="0"        # Zero means max speed

COUNT="10000000" # Zero means indefinitely



# General cleanup everything since last run

pg_ctrl "reset"



# Threads are specified with parameter -t value in $THREADS

for ((thread = 0; thread < $THREADS; thread++)); do

for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do

    # The device name is extended with @name, using thread number to

    # make then unique, but any name will do.

    dev=${DEV}@${thread}
@@ -81,7 +81,7 @@ pg_ctrl "start" 
echo "Done" >&2



# Print results

for ((thread = 0; thread < $THREADS; thread++)); do

for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do

    dev=${DEV}@${thread}

    echo "Device: $dev"

    cat /proc/net/pktgen/$dev | grep -A2 "Result:"

samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh

+3 −3
Original line number Diff line number Diff line
@@ -22,16 +22,16 @@ fi 
if [[ -n "$BURST" ]]; then

    err 1 "Bursting not supported for this mode"

fi

[ -z "$COUNT" ] && COUNT="10000000" # Zero means indefinitely



# Base Config

DELAY="0"        # Zero means max speed

COUNT="10000000" # Zero means indefinitely



# General cleanup everything since last run

pg_ctrl "reset"



# Threads are specified with parameter -t value in $THREADS

for ((thread = 0; thread < $THREADS; thread++)); do

for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do

    # The device name is extended with @name, using thread number to

    # make then unique, but any name will do.

    dev=${DEV}@${thread}
@@ -61,7 +61,7 @@ pg_ctrl "start" 
echo "Done" >&2



# Print results

for ((thread = 0; thread < $THREADS; thread++)); do

for ((thread = $F_THREAD; thread <= $L_THREAD; thread++)); do

    dev=${DEV}@${thread}

    echo "Device: $dev"

    cat /proc/net/pktgen/$dev | grep -A2 "Result:"

samples/pktgen/pktgen_sample01_simple.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ fi 
[ -z "$CLONE_SKB" ] && CLONE_SKB="0"

# 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



# Base Config

DELAY="0"        # Zero means max speed

COUNT="100000"   # Zero means indefinitely



# Flow variation random source port between min and max

UDP_MIN=9