Commit c53dab7d authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Alexei Starovoitov

selftests/xsk: add option that lists all tests

Add a command line option (-l) that lists all the tests. The number
before the test will be used in the next commit for specifying a
single test to run. Here is an example of the output:

Tests:
0: SEND_RECEIVE
1: SEND_RECEIVE_2K_FRAME
2: SEND_RECEIVE_SINGLE_PKT
3: POLL_RX
4: POLL_TX
5: POLL_RXQ_FULL
6: POLL_TXQ_FULL
7: SEND_RECEIVE_UNALIGNED
:
:
Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/r/20230914084900.492-7-magnus.karlsson@gmail.comSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent f20fbcd0
...@@ -76,18 +76,22 @@ ...@@ -76,18 +76,22 @@
# #
# Run test suite in a specific mode only [skb,drv,zc] # Run test suite in a specific mode only [skb,drv,zc]
# sudo ./test_xsk.sh -m MODE # sudo ./test_xsk.sh -m MODE
#
# List available tests
# ./test_xsk.sh -l
. xsk_prereqs.sh . xsk_prereqs.sh
ETH="" ETH=""
while getopts "vi:dm:" flag while getopts "vi:dm:l" flag
do do
case "${flag}" in case "${flag}" in
v) verbose=1;; v) verbose=1;;
d) debug=1;; d) debug=1;;
i) ETH=${OPTARG};; i) ETH=${OPTARG};;
m) MODE=${OPTARG};; m) MODE=${OPTARG};;
l) list=1;;
esac esac
done done
...@@ -135,6 +139,11 @@ setup_vethPairs() { ...@@ -135,6 +139,11 @@ setup_vethPairs() {
ip link set ${VETH0} up ip link set ${VETH0} up
} }
if [[ $list -eq 1 ]]; then
./${XSKOBJ} -l
exit
fi
if [ ! -z $ETH ]; then if [ ! -z $ETH ]; then
VETH0=${ETH} VETH0=${ETH}
VETH1=${ETH} VETH1=${ETH}
...@@ -183,6 +192,10 @@ else ...@@ -183,6 +192,10 @@ else
cleanup_iface ${ETH} ${MTU} cleanup_iface ${ETH} ${MTU}
fi fi
if [[ $list -eq 1 ]]; then
exit
fi
TEST_NAME="XSK_SELFTESTS_${VETH0}_BUSY_POLL" TEST_NAME="XSK_SELFTESTS_${VETH0}_BUSY_POLL"
busy_poll=1 busy_poll=1
......
...@@ -83,9 +83,11 @@ exec_xskxceiver() ...@@ -83,9 +83,11 @@ exec_xskxceiver()
fi fi
./${XSKOBJ} -i ${VETH0} -i ${VETH1} ${ARGS} ./${XSKOBJ} -i ${VETH0} -i ${VETH1} ${ARGS}
retval=$? retval=$?
if [[ $list -ne 1 ]]; then
test_status $retval "${TEST_NAME}" test_status $retval "${TEST_NAME}"
statusList+=($retval) statusList+=($retval)
nameList+=(${TEST_NAME}) nameList+=(${TEST_NAME})
fi
} }
...@@ -108,6 +108,7 @@ static const char *MAC1 = "\x00\x0A\x56\x9E\xEE\x62"; ...@@ -108,6 +108,7 @@ static const char *MAC1 = "\x00\x0A\x56\x9E\xEE\x62";
static const char *MAC2 = "\x00\x0A\x56\x9E\xEE\x61"; static const char *MAC2 = "\x00\x0A\x56\x9E\xEE\x61";
static bool opt_verbose; static bool opt_verbose;
static bool opt_print_tests;
static enum test_mode opt_mode = TEST_MODE_ALL; static enum test_mode opt_mode = TEST_MODE_ALL;
static void __exit_with_error(int error, const char *file, const char *func, int line) static void __exit_with_error(int error, const char *file, const char *func, int line)
...@@ -314,6 +315,7 @@ static struct option long_options[] = { ...@@ -314,6 +315,7 @@ static struct option long_options[] = {
{"busy-poll", no_argument, 0, 'b'}, {"busy-poll", no_argument, 0, 'b'},
{"verbose", no_argument, 0, 'v'}, {"verbose", no_argument, 0, 'v'},
{"mode", required_argument, 0, 'm'}, {"mode", required_argument, 0, 'm'},
{"list", no_argument, 0, 'l'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
...@@ -325,7 +327,8 @@ static void usage(const char *prog) ...@@ -325,7 +327,8 @@ static void usage(const char *prog)
" -i, --interface Use interface\n" " -i, --interface Use interface\n"
" -v, --verbose Verbose output\n" " -v, --verbose Verbose output\n"
" -b, --busy-poll Enable busy poll\n" " -b, --busy-poll Enable busy poll\n"
" -m, --mode Run only mode skb, drv, or zc\n"; " -m, --mode Run only mode skb, drv, or zc\n"
" -l, --list List all available tests\n";
ksft_print_msg(str, prog); ksft_print_msg(str, prog);
} }
...@@ -347,7 +350,7 @@ static void parse_command_line(struct ifobject *ifobj_tx, struct ifobject *ifobj ...@@ -347,7 +350,7 @@ static void parse_command_line(struct ifobject *ifobj_tx, struct ifobject *ifobj
opterr = 0; opterr = 0;
for (;;) { for (;;) {
c = getopt_long(argc, argv, "i:vbm:", long_options, &option_index); c = getopt_long(argc, argv, "i:vbm:l", long_options, &option_index);
if (c == -1) if (c == -1)
break; break;
...@@ -388,6 +391,9 @@ static void parse_command_line(struct ifobject *ifobj_tx, struct ifobject *ifobj ...@@ -388,6 +391,9 @@ static void parse_command_line(struct ifobject *ifobj_tx, struct ifobject *ifobj
ksft_exit_xfail(); ksft_exit_xfail();
} }
break; break;
case 'l':
opt_print_tests = true;
break;
default: default:
usage(basename(argv[0])); usage(basename(argv[0]));
ksft_exit_xfail(); ksft_exit_xfail();
...@@ -2307,6 +2313,15 @@ static const struct test_spec tests[] = { ...@@ -2307,6 +2313,15 @@ static const struct test_spec tests[] = {
{.name = "TOO_MANY_FRAGS", .test_func = testapp_too_many_frags}, {.name = "TOO_MANY_FRAGS", .test_func = testapp_too_many_frags},
}; };
static void print_tests(void)
{
u32 i;
printf("Tests:\n");
for (i = 0; i < ARRAY_SIZE(tests); i++)
printf("%u: %s\n", i, tests[i].name);
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct pkt_stream *rx_pkt_stream_default; struct pkt_stream *rx_pkt_stream_default;
...@@ -2331,6 +2346,11 @@ int main(int argc, char **argv) ...@@ -2331,6 +2346,11 @@ int main(int argc, char **argv)
parse_command_line(ifobj_tx, ifobj_rx, argc, argv); parse_command_line(ifobj_tx, ifobj_rx, argc, argv);
if (opt_print_tests) {
print_tests();
ksft_exit_xpass();
}
shared_netdev = (ifobj_tx->ifindex == ifobj_rx->ifindex); shared_netdev = (ifobj_tx->ifindex == ifobj_rx->ifindex);
ifobj_tx->shared_umem = shared_netdev; ifobj_tx->shared_umem = shared_netdev;
ifobj_rx->shared_umem = shared_netdev; ifobj_rx->shared_umem = shared_netdev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment