From: Allison Henderson <[email protected]> This patch adds a new rds stress test to the rds selftests suite. rds_stress is available through the rds-tools package, and can be run in the selftests infrastructure if it is installed on the host. We also add new test flags --rds_stress and --rds_basic to the calling test.py script to run one or both of the tests.
Signed-off-by: Allison Henderson <[email protected]> --- tools/testing/selftests/net/rds/rds_stress.py | 58 +++++++++++++++++++ tools/testing/selftests/net/rds/run.sh | 42 ++++++++++++-- tools/testing/selftests/net/rds/test.py | 27 ++++++++- 3 files changed, 122 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/rds/rds_stress.py b/tools/testing/selftests/net/rds/rds_stress.py new file mode 100644 index 0000000000000..8a86fa0b050de --- /dev/null +++ b/tools/testing/selftests/net/rds/rds_stress.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import subprocess +import time + +def run_test(env): + """Run RDS stress selftest. + + env is a dictionary provided by test.py and is expected to contain: + - 'addrs': list of (ip, port) tuples matching the sockets + - 'netns': list of network namespace names (for sysctl exercises) + """ + addrs = env['addrs'] # [('10.0.0.1', 10000), ('10.0.0.2', 20000)] + netns_list = env['netns'] # ['net0', 'net1'] + + a0, a1 = addrs + recv_addr = a0[0] + send_addr = a1[0] + port = a0[1] + + nr_tasks = 1 # max child tasks created + q_depth = 1 # max outstanding messages + duration = 60 # duration of test in seconds + + # server side + p0 = subprocess.Popen([ + 'ip', 'netns', 'exec', netns_list[0], + 'rds-stress', + '-r', str(recv_addr), + '-p', str(port), + '-t', str(nr_tasks), + '-d', str(q_depth), + '-T', str(duration+5) # add some extra time to let the client finish + ]) + + time.sleep(1) # delay to allow server time to come up + + # client side + p1 = subprocess.Popen([ + 'ip', 'netns', 'exec', netns_list[1], + 'rds-stress', + '-r', str(send_addr), '-s', str(recv_addr), + '-p', str(port), + '-t', str(nr_tasks), + '-d', str(q_depth), + '-T', str(duration) + ]) + + rc1 = p1.wait() # wait for client + rc0 = p0.wait() # then wait for the server + + if rc0 != 0 or rc1 != 0: + print(f"rds-stress failed: server={rc0} client={rc1}") + return 1 + + print("Success") + return 0 diff --git a/tools/testing/selftests/net/rds/run.sh b/tools/testing/selftests/net/rds/run.sh index 8aee244f582a3..5917c32222372 100755 --- a/tools/testing/selftests/net/rds/run.sh +++ b/tools/testing/selftests/net/rds/run.sh @@ -152,7 +152,34 @@ PLOSS=0 PCORRUPT=0 PDUP=0 GENERATE_GCOV_REPORT=1 -while getopts "d:l:c:u:" opt; do +RDS_BASIC=0 +RDS_STRESS=0 +FLAGS="" + +check_flags() +{ + if [ "$RDS_STRESS" -ne 0 ] && ! which rds-stress > /dev/null 2>&1; then + echo "selftests: Could not run rds-stress. Disabling rds-stress." + RDS_STRESS=0 + fi + if [ "$RDS_STRESS" -eq 0 ] && [ "$RDS_BASIC" -eq 0 ]; then + echo "selftests: Default to rds basic tests" + RDS_BASIC=1 + fi +} + +set_flags() +{ + if [ "$RDS_STRESS" -ne 0 ];then + FLAGS="$FLAGS -s" + fi + + if [ "$RDS_BASIC" -ne 0 ]; then + FLAGS="$FLAGS -b" + fi +} + +while getopts "d:l:c:u:bs" opt; do case ${opt} in d) LOG_DIR=${OPTARG} @@ -166,9 +193,15 @@ while getopts "d:l:c:u:" opt; do u) PDUP=${OPTARG} ;; + b) + RDS_BASIC=1 + ;; + s) + RDS_STRESS=1 + ;; :) echo "USAGE: run.sh [-d logdir] [-l packet_loss] [-c packet_corruption]" \ - "[-u packet_duplcate] [-g]" + "[-u packet_duplcate] [-g] [-b] [-s]" exit 1 ;; ?) @@ -182,7 +215,8 @@ done check_env check_conf check_gcov_conf - +check_flags +set_flags rm -fr "$LOG_DIR" TRACE_FILE="${LOG_DIR}/rds-strace.txt" @@ -195,7 +229,7 @@ echo running RDS tests... echo Traces will be logged to "$TRACE_FILE" rm -f "$TRACE_FILE" strace -T -tt -o "$TRACE_FILE" python3 "$(dirname "$0")/test.py" --timeout 400 -d "$LOG_DIR" \ - -l "$PLOSS" -c "$PCORRUPT" -u "$PDUP" + -l "$PLOSS" -c "$PCORRUPT" -u "$PDUP" $FLAGS test_rc=$? dmesg > "${LOG_DIR}/dmesg.out" diff --git a/tools/testing/selftests/net/rds/test.py b/tools/testing/selftests/net/rds/test.py index 1ac52e9c7aaa8..1bb6f5b306141 100755 --- a/tools/testing/selftests/net/rds/test.py +++ b/tools/testing/selftests/net/rds/test.py @@ -9,6 +9,7 @@ import sys from pwd import getpwuid from os import stat import rds_basic +import rds_stress # Allow utils module to be imported from different directory this_dir = os.path.dirname(os.path.realpath(__file__)) @@ -21,6 +22,20 @@ net1 = 'net1' veth0 = 'veth0' veth1 = 'veth1' +def increment_ports(addrs, inc): + """Increment port numbers in the addrs list by inc. + Use between tests to make the port numbers unique + + addrs: list of (ip, port) tuples + inc: int + """ + new_addrs = [] + + for ip, port in addrs: + new_addrs.append((ip, port + inc)) + + return new_addrs + def signal_handler(sig, frame): print('Test timed out') sys.exit(1) @@ -31,6 +46,10 @@ parser = argparse.ArgumentParser(description="init script args", formatter_class=argparse.ArgumentDefaultsHelpFormatter) parser.add_argument("-d", "--logdir", action="store", help="directory to store logs", default="/tmp") +parser.add_argument("-b", "--rds_basic", action="store_true", + help="Run rds basic tests") +parser.add_argument("-s", "--rds_stress", action="store_true", + help="Run rds stress tests") parser.add_argument('--timeout', help="timeout to terminate hung test", type=int, default=0) parser.add_argument('-l', '--loss', help="Simulate tcp packet loss", @@ -102,7 +121,13 @@ env = { 'netns': [net0, net1], } -ret = rds_basic.run_test(env) +ret = 0 +if args.rds_basic: + ret = rds_basic.run_test(env) + +if ret == 0 and args.rds_stress: + env['addrs'] = increment_ports(env['addrs'], 1000) + ret = rds_stress.run_test(env) print("Stopping network packet captures") subprocess.check_call(['killall', '-q', 'tcpdump']) -- 2.43.0
