Commit 40f843ee authored by Daniel T. Lee's avatar Daniel T. Lee Committed by David S. Miller
Browse files

samples: pktgen: allow to specify destination IP range (CIDR) 



Currently, 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

Signed-off-by: default avatarDaniel T. Lee <danieltimlee@gmail.com>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0681d95

samples/pktgen/README.rst

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE