[PATCH bpf-next v4 6/6] selftests/bpf: XSK_TRACE_INVALID_DESC_TX test
From: Ciara Loftus <hidden>
Date: 2021-02-03 08:13:29
Also in:
netdev
Subsystem:
bpf [general] (safe dynamic programs and tools), bpf [selftests] (test runners & infrastructure), kernel selftest framework, the rest, xdp (express data path), xdp sockets (af_xdp) · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Shuah Khan, Linus Torvalds, David S. Miller, Jakub Kicinski, Jesper Dangaard Brouer, John Fastabend, Magnus Karlsson, Maciej Fijalkowski
This test sets the length of tx descriptors to an invalid value. When the kernel tries to transmit these descriptors, error traces are expected which look like so: xsk_packet_drop: netdev: ve9266 qid 0 reason: invalid tx desc: \ addr 258048 len 4097 options 0 The test validates that these traces were successfully generated. Signed-off-by: Ciara Loftus <redacted> --- tools/testing/selftests/bpf/test_xsk.sh | 24 ++++++++++++++++++++++++ tools/testing/selftests/bpf/xdpxceiver.c | 22 ++++++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh
index bc026da25d54..4e654eb0a595 100755
--- a/tools/testing/selftests/bpf/test_xsk.sh
+++ b/tools/testing/selftests/bpf/test_xsk.sh@@ -295,6 +295,30 @@ retval=$? test_status $retval "${TEST_NAME}" statusList+=($retval) +### TEST 14 +TEST_NAME="SKB TRACE INVALID_DESC_TX" + +vethXDPgeneric ${VETH0} ${VETH1} ${NS1} + +params=("-S" "-t" "2" "-C" "${TRACEPKTS}") +execxdpxceiver params + +retval=$? +test_status $retval "${TEST_NAME}" +statusList+=($retval) + +### TEST 15 +TEST_NAME="DRV TRACE INVALID_DESC_TX" + +vethXDPnative ${VETH0} ${VETH1} ${NS1} + +params=("-N" "-t" "2" "-C" "${TRACEPKTS}") +execxdpxceiver params + +retval=$? +test_status $retval "${TEST_NAME}" +statusList+=($retval) + ## END TESTS cleanup_exit ${VETH0} ${VETH1} ${NS1}
diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
index e63dc1c228ed..6cf824a33fdc 100644
--- a/tools/testing/selftests/bpf/xdpxceiver.c
+++ b/tools/testing/selftests/bpf/xdpxceiver.c@@ -37,6 +37,8 @@ * Increase the headroom size and send packets. Validate traces. * f. Tracing - XSK_TRACE_DROP_INVALID_FILLADDR * Populate the fill queue with invalid addresses. Validate traces. + * g. Tracing - XSK_TRACE_DROP_INVALID_TXD + * Populate the tx descriptors with invalid addresses. Validate traces. * * 2. AF_XDP DRV/Native mode * Works on any netdevice with XDP_REDIRECT support, driver dependent. Processes
@@ -50,8 +52,9 @@ * zero-copy mode * e. Tracing - XSK_TRACE_DROP_PKT_TOO_BIG * f. Tracing - XSK_TRACE_DROP_INVALID_FILLADDR + * g. Tracing - XSK_TRACE_DROP_INVALID_TXD * - * Total tests: 12 + * Total tests: 14 * * Flow: * -----
@@ -560,8 +563,11 @@ static inline void complete_tx_only(struct xsk_socket_info *xsk, int batch_size) if (!xsk->outstanding_tx) return; - if (!NEED_WAKEUP || xsk_ring_prod__needs_wakeup(&xsk->tx)) + if (!NEED_WAKEUP || xsk_ring_prod__needs_wakeup(&xsk->tx)) { kick_tx(xsk); + if (opt_trace_code == XSK_TRACE_DROP_INVALID_TXD) + xsk->outstanding_tx = 0; + } rcvd = xsk_ring_cons__peek(&xsk->umem->cq, batch_size, &idx); if (rcvd) {
@@ -632,6 +638,7 @@ static void tx_only(struct xsk_socket_info *xsk, u32 *frameptr, int batch_size) { u32 idx; unsigned int i; + bool invalid_tx_test = opt_trace_code == XSK_TRACE_DROP_INVALID_TXD; while (xsk_ring_prod__reserve(&xsk->tx, batch_size, &idx) < batch_size) complete_tx_only(xsk, batch_size);
@@ -640,7 +647,8 @@ static void tx_only(struct xsk_socket_info *xsk, u32 *frameptr, int batch_size) struct xdp_desc *tx_desc = xsk_ring_prod__tx_desc(&xsk->tx, idx + i); tx_desc->addr = (*frameptr + i) << XSK_UMEM__DEFAULT_FRAME_SHIFT; - tx_desc->len = PKT_SIZE; + tx_desc->len = invalid_tx_test ? XSK_UMEM__DEFAULT_FRAME_SIZE + 1 : PKT_SIZE; + } xsk_ring_prod__submit(&xsk->tx, batch_size);
@@ -1014,7 +1022,10 @@ static void *worker_testapp_validate(void *arg) rx_pkt(ifobject->xsk, fds); worker_pkt_validate(); } else { - worker_trace_validate(tr_fp, ifobject->ifname); + worker_trace_validate(tr_fp, + opt_trace_code == XSK_TRACE_DROP_INVALID_TXD ? + ifdict[!ifobject->ifdict_index]->ifname : + ifobject->ifname); } if (sigvar)
@@ -1187,6 +1198,9 @@ int main(int argc, char **argv) case XSK_TRACE_DROP_INVALID_FILLADDR: reason_str = "invalid fill addr"; break; + case XSK_TRACE_DROP_INVALID_TXD: + reason_str = "invalid tx desc"; + break; default: ksft_test_result_fail("ERROR: unsupported trace %i\n", opt_trace_code);
--
2.17.1