Commit 119d4b02 authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Daniel Borkmann
Browse files

selftests: xsk: Add use_poll to ifobject 



Add a use_poll option to the ifobject so that we do not need to use a
test specific if-statement in the test runner.

Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/bpf/20210907071928.9750-9-magnus.karlsson@gmail.com
parent 53cb3cec

tools/testing/selftests/bpf/xdpxceiver.c

+4 −1
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ static void __test_spec_init(struct test_spec *test, struct ifobject *ifobj_tx, 


		ifobj->umem = &ifobj->umem_arr[0];

		ifobj->xsk = &ifobj->xsk_arr[0];

		ifobj->use_poll = false;



		if (i == tx)

			ifobj->fv.vector = tx;
@@ -684,7 +685,7 @@ static void send_pkts(struct ifobject *ifobject) 
	while (pkt_cnt < ifobject->pkt_stream->nb_pkts) {

		u32 sent;



		if (test_type == TEST_TYPE_POLL) {

		if (ifobject->use_poll) {

			int ret;



			ret = poll(fds, 1, POLL_TMOUT);
@@ -1071,6 +1072,8 @@ static void run_pkt_test(struct test_spec *test, int mode, int type) 
		testapp_validate_traffic(test);

		break;

	case TEST_TYPE_POLL:

		test->ifobj_tx->use_poll = true;

		test->ifobj_rx->use_poll = true;

		test_spec_set_name(test, "POLL");

		testapp_validate_traffic(test);

		break;

tools/testing/selftests/bpf/xdpxceiver.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct ifobject { 
	u32 src_ip;

	u16 src_port;

	u16 dst_port;

	bool use_poll;

	u8 dst_mac[ETH_ALEN];

	u8 src_mac[ETH_ALEN];

};