Commit 9c5ce931 authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Alexei Starovoitov
Browse files

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: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210825093722.10219-7-magnus.karlsson@gmail.com
parent 1314c353

tools/testing/selftests/bpf/xdpxceiver.c

+12 −30
Original line number Original line Diff line number Diff line
@@ -600,7 +600,7 @@ static void worker_pkt_dump(void) 
	void *ptr;

	void *ptr;





	fprintf(stdout, "---------------------------------------\n");

	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;

		ptr = pkt_buf[iter]->payload;

		ethhdr = ptr;

		ethhdr = ptr;

		iphdr = ptr + sizeof(*ethhdr);

		iphdr = ptr + sizeof(*ethhdr);
@@ -627,11 +627,6 @@ static void worker_pkt_dump(void) 
		/*extract L5 frame */

		/*extract L5 frame */

		payload = *((uint32_t *)(ptr + PKT_HDR_SIZE));

		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, "DEBUG>> L5: payload: %d\n", payload);

		fprintf(stdout, "---------------------------------------\n");

		fprintf(stdout, "---------------------------------------\n");

	}

	}
@@ -694,28 +689,24 @@ static void worker_pkt_validate(void) 
		/*do not increment pktcounter if !(tos=0x9 and ipv4) */

		/*do not increment pktcounter if !(tos=0x9 and ipv4) */

		if (iphdr->version == IP_PKT_VER && iphdr->tos == IP_PKT_TOS) {

		if (iphdr->version == IP_PKT_VER && iphdr->tos == IP_PKT_TOS) {

			payloadseqnum = *((uint32_t *)(pkt_node_rx_q->pkt_frame + PKT_HDR_SIZE));

			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 = malloc(sizeof(*pkt_obj));

				pkt_obj->payload = malloc(PKT_SIZE);

				pkt_obj->payload = malloc(PKT_SIZE);

				memcpy(pkt_obj->payload, pkt_node_rx_q->pkt_frame, PKT_SIZE);

				memcpy(pkt_obj->payload, pkt_node_rx_q->pkt_frame, PKT_SIZE);

				pkt_buf[payloadseqnum] = pkt_obj;

				pkt_buf[payloadseqnum] = pkt_obj;

			}

			}





			if (payloadseqnum == EOT) {

			if (pkt_counter % num_frames != payloadseqnum) {

				print_verbose("End-of-transmission frame received: PASS\n");

				sigvar = 1;

				break;

			}



			if (prev_pkt + 1 != payloadseqnum) {

				ksft_test_result_fail

				ksft_test_result_fail

				    ("ERROR: [%s] prev_pkt [%d], payloadseqnum [%d]\n",

				    ("ERROR: [%s] expected counter [%d], payloadseqnum [%d]\n",

				     __func__, prev_pkt, payloadseqnum);

				     __func__, pkt_counter, payloadseqnum);

				ksft_exit_xfail();

				ksft_exit_xfail();

			}

			}





			prev_pkt = payloadseqnum;

			if (++pkt_counter == opt_pkt_count) {

			pkt_counter++;

				sigvar = 1;

				break;

			}

		} else {

		} else {

			ksft_print_msg("Invalid frame received: ");

			ksft_print_msg("Invalid frame received: ");

			ksft_print_msg("[IP_PKT_VER: %02X], [IP_PKT_TOS: %02X]\n", iphdr->version,

			ksft_print_msg("[IP_PKT_VER: %02X], [IP_PKT_TOS: %02X]\n", iphdr->version,
@@ -800,10 +791,6 @@ static void *worker_testapp_validate_tx(void *arg) 
		thread_common_ops(ifobject, bufs);

		thread_common_ops(ifobject, bufs);





	for (int i = 0; i < num_frames; i++) {

	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_udp_hdr(&data, ifobject, udp_hdr);

		gen_ip_hdr(ifobject, ip_hdr);

		gen_ip_hdr(ifobject, 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);

		gen_eth_frame(ifobject->umem, i * XSK_UMEM__DEFAULT_FRAME_SIZE);

	}

	}





	print_verbose("Sending %d packets on interface %s\n",

	print_verbose("Sending %d packets on interface %s\n", opt_pkt_count, ifobject->ifname);

		      (opt_pkt_count - 1), ifobject->ifname);

	tx_only_all(ifobject);

	tx_only_all(ifobject);





	testapp_cleanup_xsk_res(ifobject);

	testapp_cleanup_xsk_res(ifobject);
@@ -888,7 +874,7 @@ static void testapp_validate(void) 




	if (debug_pkt_dump && test_type != TEST_TYPE_STATS) {

	if (debug_pkt_dump && test_type != TEST_TYPE_STATS) {

		worker_pkt_dump();

		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]->payload);

			free(pkt_buf[iter]);

			free(pkt_buf[iter]);

		}

		}
@@ -905,7 +891,6 @@ static void testapp_teardown(void) 




	for (i = 0; i < MAX_TEARDOWN_ITER; i++) {

	for (i = 0; i < MAX_TEARDOWN_ITER; i++) {

		pkt_counter = 0;

		pkt_counter = 0;

		prev_pkt = -1;

		sigvar = 0;

		sigvar = 0;

		print_verbose("Creating socket\n");

		print_verbose("Creating socket\n");

		testapp_validate();

		testapp_validate();
@@ -933,7 +918,6 @@ static void testapp_bidi(void) 
{

{

	for (int i = 0; i < MAX_BIDI_ITER; i++) {

	for (int i = 0; i < MAX_BIDI_ITER; i++) {

		pkt_counter = 0;

		pkt_counter = 0;

		prev_pkt = -1;

		sigvar = 0;

		sigvar = 0;

		print_verbose("Creating socket\n");

		print_verbose("Creating socket\n");

		testapp_validate();

		testapp_validate();
@@ -967,7 +951,6 @@ static void testapp_bpf_res(void) 




	for (i = 0; i < MAX_BPF_ITER; i++) {

	for (i = 0; i < MAX_BPF_ITER; i++) {

		pkt_counter = 0;

		pkt_counter = 0;

		prev_pkt = -1;

		sigvar = 0;

		sigvar = 0;

		print_verbose("Creating socket\n");

		print_verbose("Creating socket\n");

		testapp_validate();

		testapp_validate();
@@ -1043,7 +1026,6 @@ static void run_pkt_test(int mode, int type) 
	xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;

	xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;

	pkt_counter = 0;

	pkt_counter = 0;

	second_step = 0;

	second_step = 0;

	prev_pkt = -1;

	sigvar = 0;

	sigvar = 0;

	stat_test_type = -1;

	stat_test_type = -1;

	rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;

	rxqsize = XSK_RING_CONS__DEFAULT_NUM_DESCS;

tools/testing/selftests/bpf/xdpxceiver.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ 
#define IP_PKT_TOS 0x9

#define IP_PKT_TOS 0x9

#define UDP_PKT_SIZE (IP_PKT_SIZE - sizeof(struct iphdr))

#define UDP_PKT_SIZE (IP_PKT_SIZE - sizeof(struct iphdr))

#define UDP_PKT_DATA_SIZE (UDP_PKT_SIZE - sizeof(struct udphdr))

#define UDP_PKT_DATA_SIZE (UDP_PKT_SIZE - sizeof(struct udphdr))

#define EOT (-1)

#define USLEEP_MAX 10000

#define USLEEP_MAX 10000

#define SOCK_RECONF_CTR 10

#define SOCK_RECONF_CTR 10

#define BATCH_SIZE 64

#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 u32 xdp_bind_flags = XDP_USE_NEED_WAKEUP | XDP_COPY;

static u8 pkt_data[XSK_UMEM__DEFAULT_FRAME_SIZE];

static u8 pkt_data[XSK_UMEM__DEFAULT_FRAME_SIZE];

static u32 pkt_counter;

static u32 pkt_counter;

static long prev_pkt = -1;

static int sigvar;

static int sigvar;

static int stat_test_type;

static int stat_test_type;

static u32 rxqsize;

static u32 rxqsize;