selftests: xsk: Remove end-of-test packet

Get rid of the end-of-test packet and just count the number of packets
received and quit when the expected number as been
received. Simplifies the code.

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

diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
index b7d193a96083b0ab92e06024e45e86153c682b5b..b0fee71355bf2cb9ccd74caf7efef128d441ef98 100644 (file)
--- a/tools/testing/selftests/bpf/xdpxceiver.c
+++ b/tools/testing/selftests/bpf/xdpxceiver.c
@@ -600,7 +600,7 @@ static void worker_pkt_dump(void)
        void *ptr;
 
        fprintf(stdout, "---------------------------------------\n");
-       for (int iter = 0; iter < num_frames - 1; iter++) {
+       for (int iter = 0; iter < num_frames; iter++) {
                ptr = pkt_buf[iter]->payload;
                ethhdr = ptr;
                iphdr = ptr + sizeof(*ethhdr);
@@ -627,11 +627,6 @@ static void worker_pkt_dump(void)
                /*extract L5 frame */
                payload = *((uint32_t *)(ptr + PKT_HDR_SIZE));
 
-               if (payload == EOT) {
-                       print_verbose("End-of-transmission frame received\n");
-                       fprintf(stdout, "---------------------------------------\n");
-                       break;
-               }
                fprintf(stdout, "DEBUG>> L5: payload: %d\n", payload);
                fprintf(stdout, "---------------------------------------\n");
        }
@@ -694,28 +689,24 @@ static void worker_pkt_validate(void)
                /*do not increment pktcounter if !(tos=0x9 and ipv4) */
                if (iphdr->version == IP_PKT_VER && iphdr->tos == IP_PKT_TOS) {
                        payloadseqnum = *((uint32_t *)(pkt_node_rx_q->pkt_frame + PKT_HDR_SIZE));
-                       if (debug_pkt_dump && payloadseqnum != EOT) {
+                       if (debug_pkt_dump) {
                                pkt_obj = malloc(sizeof(*pkt_obj));
                                pkt_obj->payload = malloc(PKT_SIZE);
                                memcpy(pkt_obj->payload, pkt_node_rx_q->pkt_frame, PKT_SIZE);
                                pkt_buf[payloadseqnum] = pkt_obj;
                        }
 
-                       if (payloadseqnum == EOT) {
-                               print_verbose("End-of-transmission frame received: PASS\n");
-                               sigvar = 1;
-                               break;
-                       }
-
-                       if (prev_pkt + 1 != payloadseqnum) {
+                       if (pkt_counter % num_frames != payloadseqnum) {
                                ksft_test_result_fail
-                                   ("ERROR: [%s] prev_pkt [%d], payloadseqnum [%d]\n",
-                                    __func__, prev_pkt, payloadseqnum);
+                                   ("ERROR: [%s] expected counter [%d], payloadseqnum [%d]\n",
+                                    __func__, pkt_counter, payloadseqnum);
                                ksft_exit_xfail();
                        }
 
-                       prev_pkt = payloadseqnum;
-                       pkt_counter++;
+                       if (++pkt_counter == opt_pkt_count) {
+                               sigvar = 1;
+                               break;
+                       }
                } else {
                        ksft_print_msg("Invalid frame received: ");
                        ksft_print_msg("[IP_PKT_VER: %02X], [IP_PKT_TOS: %02X]\n", iphdr->version,
@@ -800,11 +791,7 @@ static void *worker_testapp_validate_tx(void *arg)
                thread_common_ops(ifobject, bufs);
 
        for (int i = 0; i < num_frames; i++) {
-               /*send EOT frame */
-               if (i == (num_frames - 1))
-                       data.seqnum = -1;
-               else
-                       data.seqnum = i;
+               data.seqnum = i;
                gen_udp_hdr(&data, ifobject, udp_hdr);
                gen_ip_hdr(ifobject, ip_hdr);
                gen_udp_csum(udp_hdr, ip_hdr);
@@ -812,8 +799,7 @@ static void *worker_testapp_validate_tx(void *arg)
                gen_eth_frame(ifobject->umem, i * XSK_UMEM__DEFAULT_FRAME_SIZE);
        }
 
-       print_verbose("Sending %d packets on interface %s\n",
-                     (opt_pkt_count - 1), ifobject->ifname);
+       print_verbose("Sending %d packets on interface %s\n", opt_pkt_count, ifobject->ifname);
        tx_only_all(ifobject);
 
        testapp_cleanup_xsk_res(ifobject);
@@ -888,7 +874,7 @@ static void testapp_validate(void)
 
        if (debug_pkt_dump && test_type != TEST_TYPE_STATS) {
                worker_pkt_dump();
-               for (int iter = 0; iter < num_frames - 1; iter++) {
+               for (int iter = 0; iter < num_frames; iter++) {
                        free(pkt_buf[iter]->payload);
                        free(pkt_buf[iter]);
                }
@@ -905,7 +891,6 @@ static void testapp_teardown(void)
 
        for (i = 0; i < MAX_TEARDOWN_ITER; i++) {
                pkt_counter = 0;
-               prev_pkt = -1;
                sigvar = 0;
                print_verbose("Creating socket\n");
                testapp_validate();
@@ -933,7 +918,6 @@ static void testapp_bidi(void)
 {
        for (int i = 0; i < MAX_BIDI_ITER; i++) {
                pkt_counter = 0;
-               prev_pkt = -1;
                sigvar = 0;
                print_verbose("Creating socket\n");
                testapp_validate();
@@ -967,7 +951,6 @@ static void testapp_bpf_res(void)
 
        for (i = 0; i < MAX_BPF_ITER; i++) {
                pkt_counter = 0;
-               prev_pkt = -1;
                sigvar = 0;
                print_verbose("Creating socket\n");
                testapp_validate();
@@ -1043,7 +1026,6 @@ static void run_pkt_test(int mode, int type)
        xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;
        pkt_counter = 0;
        second_step = 0;
-       prev_pkt = -1;
        sigvar = 0;
        stat_test_type = -1;
        rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;

diff --git a/tools/testing/selftests/bpf/xdpxceiver.h b/tools/testing/selftests/bpf/xdpxceiver.h
index 1c94230c351ac2cf821a4ad279cd764ae96b2fb5..a4371d9e27983a6a087cf7853538a2a28ab61eeb 100644 (file)
--- a/tools/testing/selftests/bpf/xdpxceiver.h
+++ b/tools/testing/selftests/bpf/xdpxceiver.h
@@ -34,7 +34,6 @@
 #define IP_PKT_TOS 0x9
 #define UDP_PKT_SIZE (IP_PKT_SIZE - sizeof(struct iphdr))
 #define UDP_PKT_DATA_SIZE (UDP_PKT_SIZE - sizeof(struct udphdr))
-#define EOT (-1)
 #define USLEEP_MAX 10000
 #define SOCK_RECONF_CTR 10
 #define BATCH_SIZE 64
@@ -82,7 +81,6 @@ static u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;
 static u32 xdp_bind_flags = XDP_USE_NEED_WAKEUP | XDP_COPY;
 static u8 pkt_data[XSK_UMEM__DEFAULT_FRAME_SIZE];
 static u32 pkt_counter;
-static long prev_pkt = -1;
 static int sigvar;
 static int stat_test_type;
 static u32 rxqsize;