From: Ciara Loftus <ciara.loftus@intel.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org,
magnus.karlsson@intel.com, bjorn@kernel.org,
weqaar.a.janjua@intel.com, maciej.fijalkowski@intel.com
Cc: Ciara Loftus <ciara.loftus@intel.com>
Subject: [PATCH bpf-next v2 2/4] selftests/bpf: expose and rename debug argument
Date: Tue, 23 Feb 2021 10:35:05 +0000 [thread overview]
Message-ID: <20210223103507.10465-3-ciara.loftus@intel.com> (raw)
In-Reply-To: <20210223103507.10465-1-ciara.loftus@intel.com>
Launching xdpxceiver with -D enables what was formerly know as 'debug'
mode. Rename this mode to 'dump-pkts' as it better describes the
behavior enabled by the option. New usage:
./xdpxceiver .. -D
or
./xdpxceiver .. --dump-pkts
Also make it possible to pass this flag to the app via the test_xsk.sh
shell script like so:
./test_xsk.sh -D
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
---
tools/testing/selftests/bpf/test_xsk.sh | 7 ++++++-
tools/testing/selftests/bpf/xdpxceiver.c | 6 +++---
tools/testing/selftests/bpf/xsk_prereqs.sh | 3 ++-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh
index 91127a5be90d..870ae3f38818 100755
--- a/tools/testing/selftests/bpf/test_xsk.sh
+++ b/tools/testing/selftests/bpf/test_xsk.sh
@@ -74,11 +74,12 @@
. xsk_prereqs.sh
-while getopts "cv" flag
+while getopts "cvD" flag
do
case "${flag}" in
c) colorconsole=1;;
v) verbose=1;;
+ D) dump-pkts=1;;
esac
done
@@ -135,6 +136,10 @@ if [[ $verbose -eq 1 ]]; then
VERBOSE_ARG="-v"
fi
+if [[ $dump-pkts -eq 1 ]]; then
+ DUMP_PKTS_ARG="-D"
+fi
+
test_status $retval "${TEST_NAME}"
## START TESTS
diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
index 8af746c9a6b6..506423201197 100644
--- a/tools/testing/selftests/bpf/xdpxceiver.c
+++ b/tools/testing/selftests/bpf/xdpxceiver.c
@@ -58,7 +58,7 @@
* - Rx thread verifies if all 10k packets were received and delivered in-order,
* and have the right content
*
- * Enable/disable debug mode:
+ * Enable/disable packet dump mode:
* --------------------------
* To enable L2 - L4 headers and payload dump of each packet on STDOUT, add
* parameter -D to params array in test_xsk.sh, i.e. params=("-S" "-D")
@@ -340,7 +340,7 @@ static struct option long_options[] = {
{"copy", no_argument, 0, 'c'},
{"tear-down", no_argument, 0, 'T'},
{"bidi", optional_argument, 0, 'B'},
- {"debug", optional_argument, 0, 'D'},
+ {"dump-pkts", optional_argument, 0, 'D'},
{"verbose", no_argument, 0, 'v'},
{"tx-pkt-count", optional_argument, 0, 'C'},
{0, 0, 0, 0}
@@ -359,7 +359,7 @@ static void usage(const char *prog)
" -c, --copy Force copy mode\n"
" -T, --tear-down Tear down sockets by repeatedly recreating them\n"
" -B, --bidi Bi-directional sockets test\n"
- " -D, --debug Debug mode - dump packets L2 - L5\n"
+ " -D, --dump-pkts Dump packets L2 - L5\n"
" -v, --verbose Verbose output\n"
" -C, --tx-pkt-count=n Number of packets to send\n";
ksft_print_msg(str, prog);
diff --git a/tools/testing/selftests/bpf/xsk_prereqs.sh b/tools/testing/selftests/bpf/xsk_prereqs.sh
index ef8c5b31f4b6..da93575d757a 100755
--- a/tools/testing/selftests/bpf/xsk_prereqs.sh
+++ b/tools/testing/selftests/bpf/xsk_prereqs.sh
@@ -128,5 +128,6 @@ execxdpxceiver()
copy[$index]=${!current}
done
- ./${XSKOBJ} -i ${VETH0} -i ${VETH1},${NS1} ${copy[*]} -C ${NUMPKTS} ${VERBOSE_ARG}
+ ./${XSKOBJ} -i ${VETH0} -i ${VETH1},${NS1} ${copy[*]} -C ${NUMPKTS} ${VERBOSE_ARG} \
+ ${DUMP_PKTS_ARG}
}
--
2.17.1
next prev parent reply other threads:[~2021-02-23 11:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 10:35 [PATCH bpf-next v2 0/4] selftests/bpf: xsk improvements and new stats tests Ciara Loftus
2021-02-23 10:35 ` [PATCH bpf-next v2 1/4] selftest/bpf: make xsk tests less verbose Ciara Loftus
2021-02-23 10:35 ` Ciara Loftus [this message]
2021-02-23 14:39 ` [PATCH bpf-next v2 2/4] selftests/bpf: expose and rename debug argument Maciej Fijalkowski
2021-02-23 15:01 ` Loftus, Ciara
2021-02-23 10:35 ` [PATCH bpf-next v2 3/4] selftests/bpf: restructure xsk selftests Ciara Loftus
2021-02-23 10:35 ` [PATCH bpf-next v2 4/4] selftests/bpf: introduce xsk statistics tests Ciara Loftus
2021-02-23 14:41 ` Maciej Fijalkowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210223103507.10465-3-ciara.loftus@intel.com \
--to=ciara.loftus@intel.com \
--cc=bjorn@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
--cc=weqaar.a.janjua@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).