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

Commit e0e16672 authored by Tariq Toukan's avatar Tariq Toukan Committed by David S. Miller
Browse files

pktgen: Specify the index of first thread 



Use "-f <num>", to specify the index of the first
sender thread.
In default first thread is #0.

Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69137ea6

samples/pktgen/README.rst

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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

samples/pktgen/parameters.sh

+14 −6
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 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"
@@ -21,7 +22,7 @@ function usage() { 


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

## echo "Commandline options:"

while getopts "s:i:d:m:t:c:n: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
@@ -39,11 +40,13 @@ while getopts "s:i:d:m:t:c:n: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
@@ -82,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

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ DELAY="0" # Zero means max speed 
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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ DELAY="0" # Zero means max speed 
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_sample02_multiqueue.sh

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ fi 
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}
@@ -71,7 +71,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:"