selftests/xsk: print per packet info in verbose mode

Print info about every packet in verbose mode, both for Tx and
Rx. This is useful to have when a test fails or to validate that a
test is really doing what it was designed to do. Info on what is
supposed to be received and sent is also printed for the custom packet
streams since they differ from the base line. Here is an example:

Tx addr: 37e0 len: 64 options: 0 pkt_nb: 8
Tx addr: 4000 len: 64 options: 0 pkt_nb: 9
Rx: addr: 100 len: 64 options: 0 pkt_nb: 0 valid: 1
Rx: addr: 1100 len: 64 options: 0 pkt_nb: 1 valid: 1
Rx: addr: 2100 len: 64 options: 0 pkt_nb: 4 valid: 1
Rx: addr: 3100 len: 64 options: 0 pkt_nb: 8 valid: 1
Rx: addr: 4100 len: 64 options: 0 pkt_nb: 9 valid: 1

One pointless verbose print statement is also deleted and another one
is made clearer.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/r/20230914084900.492-2-magnus.karlsson@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/xskxceiver.c b/tools/testing/selftests/bpf/xskxceiver.c
index 2827f2d7cf30f543a75536296d529ead94ca3344..c595c0b6541773f807dc7ec45c039c1e0d729ec7 100644 (file)
--- a/tools/testing/selftests/bpf/xskxceiver.c
+++ b/tools/testing/selftests/bpf/xskxceiver.c
@@ -747,6 +747,9 @@ static struct pkt_stream *__pkt_stream_generate_custom(struct ifobject *ifobj, s
                        len = 0;
                }
 
+               print_verbose("offset: %d len: %u valid: %u options: %u pkt_nb: %u\n",
+                             pkt->offset, pkt->len, pkt->valid, pkt->options, pkt->pkt_nb);
+
                if (pkt->valid && pkt->len > pkt_stream->max_pkt_len)
                        pkt_stream->max_pkt_len = pkt->len;
                pkt_nb++;
@@ -1042,6 +1045,9 @@ static int receive_pkts(struct test_spec *test, struct pollfd *fds)
                                return TEST_FAILURE;
                        }
 
+                       print_verbose("Rx: addr: %lx len: %u options: %u pkt_nb: %u valid: %u\n",
+                                     addr, desc->len, desc->options, pkt->pkt_nb, pkt->valid);
+
                        if (!is_frag_valid(umem, addr, desc->len, pkt->pkt_nb, pkt_len) ||
                            !is_offset_correct(umem, pkt, addr) ||
                            (ifobj->use_metadata && !is_metadata_correct(pkt, umem->buffer, addr)))
@@ -1165,6 +1171,9 @@ static int __send_pkts(struct ifobject *ifobject, struct pollfd *fds, bool timeo
                                             bytes_written);
                        bytes_written += tx_desc->len;
 
+                       print_verbose("Tx addr: %llx len: %u options: %u pkt_nb: %u\n",
+                                     tx_desc->addr, tx_desc->len, tx_desc->options, pkt->pkt_nb);
+
                        if (nb_frags_left) {
                                i++;
                                if (pkt_stream->verbatim)
@@ -1475,8 +1484,6 @@ static void *worker_testapp_validate_tx(void *arg)
                        thread_common_ops_tx(test, ifobject);
        }
 
-       print_verbose("Sending %d packets on interface %s\n", ifobject->pkt_stream->nb_pkts,
-                     ifobject->ifname);
        err = send_pkts(test, ifobject);
 
        if (!err && ifobject->validation_func)
@@ -1715,7 +1722,7 @@ static int testapp_bidi(struct test_spec *test)
        if (testapp_validate_traffic(test))
                return TEST_FAILURE;
 
-       print_verbose("Switching Tx/Rx vectors\n");
+       print_verbose("Switching Tx/Rx direction\n");
        swap_directions(&test->ifobj_rx, &test->ifobj_tx);
        res = __testapp_validate_traffic(test, test->ifobj_rx, test->ifobj_tx);