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

Commit 65c959a3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'samples-pktgen-updates' 

Jesper Dangaard Brouer says:

====================
Updates for samples/pktgen

This patchset updates samples/pktgen and synchronize with changes
maintained in https://github.com/netoptimizer/network-testing/



Features wise Robert Hoo <robert.hu@intel.com> added support for
detecting and determining dev NUMA node IRQs, and added a new script
named pktgen_sample06_numa_awared_queue_irq_affinity.sh that use these
features.

Cleanup remove last of the old sample files, as IPv6 is covered by
existing sample code.
====================

Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents de218073 a4b6ade8

samples/pktgen/functions.sh

+43 −0
Original line number Diff line number Diff line
@@ -119,3 +119,46 @@ function root_check_run_with_sudo() { 
	err 4 "cannot perform sudo run of $0"

    fi

}



# Exact input device's NUMA node info

function get_iface_node()

{

    local node=$(</sys/class/net/$1/device/numa_node)

    if [[ $node == -1 ]]; then

        echo 0

    else

        echo $node

    fi

}



# Given an Dev/iface, get its queues' irq numbers

function get_iface_irqs()

{

	local IFACE=$1

	local queues="${IFACE}-.*TxRx"



	irqs=$(grep "$queues" /proc/interrupts | cut -f1 -d:)

	[ -z "$irqs" ] && irqs=$(grep $IFACE /proc/interrupts | cut -f1 -d:)

	[ -z "$irqs" ] && irqs=$(for i in `ls -Ux /sys/class/net/$IFACE/device/msi_irqs` ;\

	    do grep "$i:.*TxRx" /proc/interrupts | grep -v fdir | cut -f 1 -d : ;\

	    done)

	[ -z "$irqs" ] && err 3 "Could not find interrupts for $IFACE"



	echo $irqs

}



# Given a NUMA node, return cpu ids belonging to it.

function get_node_cpus()

{

	local node=$1

	local node_cpu_list

	local node_cpu_range_list=`cut -f1- -d, --output-delimiter=" " \

	                  /sys/devices/system/node/node$node/cpulist`



	for cpu_range in $node_cpu_range_list

	do

	    node_cpu_list="$node_cpu_list "`seq -s " " ${cpu_range//-/ }`

	done



	echo $node_cpu_list

}

samples/pktgen/pktgen.conf-1-1-ip6

deleted100755 → 0
+0 −60
Original line number Diff line number Diff line 
#!/bin/bash



#modprobe pktgen





function pgset() {

    local result



    echo $1 > $PGDEV



    result=`cat $PGDEV | fgrep "Result: OK:"`

    if [ "$result" = "" ]; then

         cat $PGDEV | fgrep Result:

    fi

}



# Config Start Here -----------------------------------------------------------





# thread config

# Each CPU has its own thread. One CPU example. We add eth1.

# IPv6. Note increase in minimal packet length



PGDEV=/proc/net/pktgen/kpktgend_0

  echo "Removing all devices"

 pgset "rem_device_all"

  echo "Adding eth1"

 pgset "add_device eth1"





# device config

# delay 0



CLONE_SKB="clone_skb 1000000"

# NIC adds 4 bytes CRC

PKT_SIZE="pkt_size 66"



# COUNT 0 means forever

#COUNT="count 0"

COUNT="count 10000000"

DELAY="delay 0"



PGDEV=/proc/net/pktgen/eth1

  echo "Configuring $PGDEV"

 pgset "$COUNT"

 pgset "$CLONE_SKB"

 pgset "$PKT_SIZE"

 pgset "$DELAY"

 pgset "dst6 fec0::1"

 pgset "src6 fec0::2"

 pgset "dst_mac  00:04:23:08:91:dc"



# Time to run

PGDEV=/proc/net/pktgen/pgctrl



 echo "Running... ctrl^C to stop"

 trap true INT

 pgset "start"

 echo "Done"

 cat /proc/net/pktgen/eth1

samples/pktgen/pktgen.conf-1-1-ip6-rdos

deleted100755 → 0
+0 −63
Original line number Diff line number Diff line 
#!/bin/bash



#modprobe pktgen





function pgset() {

    local result



    echo $1 > $PGDEV



    result=`cat $PGDEV | fgrep "Result: OK:"`

    if [ "$result" = "" ]; then

         cat $PGDEV | fgrep Result:

    fi

}



# Config Start Here -----------------------------------------------------------





# thread config

# Each CPU has its own thread. One CPU example. We add eth1.

# IPv6. Note increase in minimal packet length



PGDEV=/proc/net/pktgen/kpktgend_0

  echo "Removing all devices"

 pgset "rem_device_all"

  echo "Adding eth1"

 pgset "add_device eth1"





# device config

# delay 0 means maximum speed.



# We need to do alloc for every skb since we cannot clone here.

CLONE_SKB="clone_skb 0"



# NIC adds 4 bytes CRC

PKT_SIZE="pkt_size 66"



# COUNT 0 means forever

#COUNT="count 0"

COUNT="count 10000000"

DELAY="delay 0"



PGDEV=/proc/net/pktgen/eth1

  echo "Configuring $PGDEV"

 pgset "$COUNT"

 pgset "$CLONE_SKB"

 pgset "$PKT_SIZE"

 pgset "$DELAY"

 pgset "dst6_min fec0::1"

 pgset "dst6_max fec0::FFFF:FFFF"



 pgset "dst_mac  00:04:23:08:91:dc"



# Time to run

PGDEV=/proc/net/pktgen/pgctrl



 echo "Running... ctrl^C to stop"

 trap true INT

 pgset "start"

 echo "Done"

 cat /proc/net/pktgen/eth1

samples/pktgen/pktgen.conf-1-2

deleted100755 → 0
+0 −69
Original line number Diff line number Diff line 
#!/bin/bash



#modprobe pktgen





function pgset() {

    local result



    echo $1 > $PGDEV



    result=`cat $PGDEV | fgrep "Result: OK:"`

    if [ "$result" = "" ]; then

         cat $PGDEV | fgrep Result:

    fi

}



# Config Start Here -----------------------------------------------------------





# thread config

# One CPU means one thread. One CPU example. We add eth1, eth2 respectivly.



PGDEV=/proc/net/pktgen/kpktgend_0

  echo "Removing all devices"

 pgset "rem_device_all"

  echo "Adding eth1"

 pgset "add_device eth1"

  echo "Adding eth2"

 pgset "add_device eth2"





# device config

# delay 0 means maximum speed.



CLONE_SKB="clone_skb 1000000"

# NIC adds 4 bytes CRC

PKT_SIZE="pkt_size 60"



# COUNT 0 means forever

#COUNT="count 0"

COUNT="count 10000000"

DELAY="delay 0"



PGDEV=/proc/net/pktgen/eth1

  echo "Configuring $PGDEV"

 pgset "$COUNT"

 pgset "$CLONE_SKB"

 pgset "$PKT_SIZE"

 pgset "$DELAY"

 pgset "dst 10.10.11.2"

 pgset "dst_mac  00:04:23:08:91:dc"



PGDEV=/proc/net/pktgen/eth2

  echo "Configuring $PGDEV"

 pgset "$COUNT"

 pgset "$CLONE_SKB"

 pgset "$PKT_SIZE"

 pgset "$DELAY"

 pgset "dst 192.168.2.2"

 pgset "dst_mac  00:04:23:08:91:de"



# Time to run

PGDEV=/proc/net/pktgen/pgctrl



 echo "Running... ctrl^C to stop"

 trap true INT

 pgset "start"

 echo "Done"

 cat /proc/net/pktgen/eth1 /proc/net/pktgen/eth2

samples/pktgen/pktgen_sample03_burst_single_flow.sh

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ if [ -z "$DEST_IP" ]; then 
fi

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

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

[ -z "$CLONE_SKB" ] && CLONE_SKB="100000"

[ -z "$CLONE_SKB" ] && CLONE_SKB="0" # No need for clones when bursting

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



# Base Config