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: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>hifive-unleashed-5.1
David S. Miller
commit
65c959a39b
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
#!/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
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
#!/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
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
#!/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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,97 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Multiqueue: Using pktgen threads for sending on multiple CPUs
|
||||
# * adding devices to kernel threads which are in the same NUMA node
|
||||
# * bound devices queue's irq affinity to the threads, 1:1 mapping
|
||||
# * notice the naming scheme for keeping device names unique
|
||||
# * nameing scheme: dev@thread_number
|
||||
# * flow variation via random UDP source port
|
||||
#
|
||||
basedir=`dirname $0`
|
||||
source ${basedir}/functions.sh
|
||||
root_check_run_with_sudo "$@"
|
||||
#
|
||||
# Required param: -i dev in $DEV
|
||||
source ${basedir}/parameters.sh
|
||||
|
||||
# Base Config
|
||||
DELAY="0" # Zero means max speed
|
||||
[ -z "$COUNT" ] && COUNT="20000000" # Zero means indefinitely
|
||||
[ -z "$CLONE_SKB" ] && CLONE_SKB="0"
|
||||
|
||||
# Flow variation random source port between min and max
|
||||
UDP_MIN=9
|
||||
UDP_MAX=109
|
||||
|
||||
node=`get_iface_node $DEV`
|
||||
irq_array=(`get_iface_irqs $DEV`)
|
||||
cpu_array=(`get_node_cpus $node`)
|
||||
|
||||
[ $THREADS -gt ${#irq_array[*]} -o $THREADS -gt ${#cpu_array[*]} ] && \
|
||||
err 1 "Thread number $THREADS exceeds: min (${#irq_array[*]},${#cpu_array[*]})"
|
||||
|
||||
# (example of setting default params in your script)
|
||||
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"
|
||||
|
||||
# General cleanup everything since last run
|
||||
pg_ctrl "reset"
|
||||
|
||||
# Threads are specified with parameter -t value in $THREADS
|
||||
for ((i = 0; i < $THREADS; i++)); do
|
||||
# The device name is extended with @name, using thread number to
|
||||
# make then unique, but any name will do.
|
||||
# Set the queue's irq affinity to this $thread (processor)
|
||||
# if '-f' is designated, offset cpu id
|
||||
thread=${cpu_array[$((i+F_THREAD))]}
|
||||
dev=${DEV}@${thread}
|
||||
echo $thread > /proc/irq/${irq_array[$i]}/smp_affinity_list
|
||||
info "irq ${irq_array[$i]} is set affinity to `cat /proc/irq/${irq_array[$i]}/smp_affinity_list`"
|
||||
|
||||
# Add remove all other devices and add_device $dev to thread
|
||||
pg_thread $thread "rem_device_all"
|
||||
pg_thread $thread "add_device" $dev
|
||||
|
||||
# select queue and bind the queue and $dev in 1:1 relationship
|
||||
queue_num=$i
|
||||
info "queue number is $queue_num"
|
||||
pg_set $dev "queue_map_min $queue_num"
|
||||
pg_set $dev "queue_map_max $queue_num"
|
||||
|
||||
# Notice config queue to map to cpu (mirrors smp_processor_id())
|
||||
# It is beneficial to map IRQ /proc/irq/*/smp_affinity 1:1 to CPU number
|
||||
pg_set $dev "flag QUEUE_MAP_CPU"
|
||||
|
||||
# Base config of dev
|
||||
pg_set $dev "count $COUNT"
|
||||
pg_set $dev "clone_skb $CLONE_SKB"
|
||||
pg_set $dev "pkt_size $PKT_SIZE"
|
||||
pg_set $dev "delay $DELAY"
|
||||
|
||||
# Flag example disabling timestamping
|
||||
pg_set $dev "flag NO_TIMESTAMP"
|
||||
|
||||
# Destination
|
||||
pg_set $dev "dst_mac $DST_MAC"
|
||||
pg_set $dev "dst$IP6 $DEST_IP"
|
||||
|
||||
# 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"
|
||||
done
|
||||
|
||||
# start_run
|
||||
echo "Running... ctrl^C to stop" >&2
|
||||
pg_ctrl "start"
|
||||
echo "Done" >&2
|
||||
|
||||
# Print results
|
||||
for ((i = 0; i < $THREADS; i++)); do
|
||||
thread=${cpu_array[$((i+F_THREAD))]}
|
||||
dev=${DEV}@${thread}
|
||||
echo "Device: $dev"
|
||||
cat /proc/net/pktgen/$dev | grep -A2 "Result:"
|
||||
done
|
||||
Loading…
Reference in New Issue