[bpf-next,06/17] selftests: xsk: simplify the retry code

Message ID	20210727131753.10924-7-magnus.karlsson@gmail.com
State	Superseded
Headers	show Return-Path: <netdev-owner@kernel.org> From: Magnus Karlsson <magnus.karlsson@gmail.com> To: magnus.karlsson@intel.com, bjorn@kernel.org, ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org, maciej.fijalkowski@intel.com Cc: jonathan.lemon@gmail.com, ciara.loftus@intel.com, joamaki@gmail.com, bpf@vger.kernel.org, yhs@fb.com, andrii@kernel.org Subject: [PATCH bpf-next 06/17] selftests: xsk: simplify the retry code Date: Tue, 27 Jul 2021 15:17:42 +0200 Message-Id: <20210727131753.10924-7-magnus.karlsson@gmail.com> In-Reply-To: <20210727131753.10924-1-magnus.karlsson@gmail.com> References: <20210727131753.10924-1-magnus.karlsson@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	selftests: xsk: various simplifications \| expand [bpf-next,00/17] selftests: xsk: various simplifications [bpf-next,01/17] selftests: xsk: remove color mode [bpf-next,02/17] selftests: xsk: remove the num_tx_packets option [bpf-next,03/17] selftests: xsk: remove unused variables [bpf-next,04/17] selftests: xsk: set rlimit per thread [bpf-next,05/17] selftests: xsk: return correct error codes [bpf-next,06/17] selftests: xsk: simplify the retry code [bpf-next,07/17] selftests: xsk: remove end-of-test packet [bpf-next,08/17] selftests: xsk: disassociate umem size with packets sent [bpf-next,09/17] selftests: xsk: rename worker_* functions that are not thred entry points [bpf-next,10/17] selftests: xsk: simplify packet validation in xsk tests [bpf-next,11/17] selftests: xsk: validate tx stats on tx thread [bpf-next,12/17] selftests: xsk: decrease batch size [bpf-next,13/17] selftests: xsk: remove cleanup at end of program [bpf-next,14/17] selftests: xsk: generate packet directly in umem [bpf-next,15/17] selftests: xsk: generate packets from specification [bpf-next,16/17] selftests: xsk: make enums lower case [bpf-next,17/17] selftests: xsk: preface options with opt

Message ID

20210727131753.10924-7-magnus.karlsson@gmail.com

State

Superseded

Headers

From: Magnus Karlsson <magnus.karlsson@gmail.com>
To: magnus.karlsson@intel.com, bjorn@kernel.org, ast@kernel.org,
	daniel@iogearbox.net, netdev@vger.kernel.org,
	maciej.fijalkowski@intel.com
Cc: jonathan.lemon@gmail.com, ciara.loftus@intel.com,
	joamaki@gmail.com, bpf@vger.kernel.org, yhs@fb.com, andrii@kernel.org
Subject: [PATCH bpf-next 06/17] selftests: xsk: simplify the retry code
Date: Tue, 27 Jul 2021 15:17:42 +0200
Message-Id: <20210727131753.10924-7-magnus.karlsson@gmail.com>
In-Reply-To: <20210727131753.10924-1-magnus.karlsson@gmail.com>
References: <20210727131753.10924-1-magnus.karlsson@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

selftests: xsk: various simplifications | expand

Commit Message

Magnus Karlsson July 27, 2021, 1:17 p.m. UTC

From: Magnus Karlsson <magnus.karlsson@intel.com>

Simplify the retry code and make it more efficient by waiting first,
instead of trying immediately which always fails due to the
asynchronous nature of xsk socket close. Also decrease the wait time
to significantly lower the run-time of the test suite.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
---
 tools/testing/selftests/bpf/xdpxceiver.c | 23 ++++++++++-------------
 tools/testing/selftests/bpf/xdpxceiver.h |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
index 2ae83b9a1ff4..dcde73db7b29 100644
--- a/tools/testing/selftests/bpf/xdpxceiver.c
+++ b/tools/testing/selftests/bpf/xdpxceiver.c
@@ -750,24 +750,19 @@  static void thread_common_ops(struct ifobject *ifobject, void *bufs)
 	if (bufs == MAP_FAILED)
 		exit_with_error(errno);
 
-	xsk_configure_umem(ifobject, bufs, 0);
-	ifobject->umem = ifobject->umem_arr[0];
-	ret = xsk_configure_socket(ifobject, 0);
-
-	/* Retry Create Socket if it fails as xsk_socket__create()
-	 * is asynchronous
-	 */
-	while (ret && ctr < SOCK_RECONF_CTR) {
+	while (ctr++ < SOCK_RECONF_CTR) {
 		xsk_configure_umem(ifobject, bufs, 0);
 		ifobject->umem = ifobject->umem_arr[0];
 		ret = xsk_configure_socket(ifobject, 0);
+		if (!ret)
+			break;
+
+		/* Retry Create Socket if it fails as xsk_socket__create() is asynchronous */
 		usleep(USLEEP_MAX);
-		ctr++;
+		if (ctr >= SOCK_RECONF_CTR)
+			exit_with_error(-ret);
 	}
 
-	if (ctr >= SOCK_RECONF_CTR)
-		exit_with_error(ret);
-
 	ifobject->umem = ifobject->umem_arr[0];
 	ifobject->xsk = ifobject->xsk_arr[0];
 
@@ -1126,8 +1121,10 @@  int main(int argc, char **argv)
 	ksft_set_plan(TEST_MODE_MAX * TEST_TYPE_MAX);
 
 	for (i = 0; i < TEST_MODE_MAX; i++) {
-		for (j = 0; j < TEST_TYPE_MAX; j++)
+		for (j = 0; j < TEST_TYPE_MAX; j++) {
 			run_pkt_test(i, j);
+			usleep(USLEEP_MAX);
+		}
 	}
 
 cleanup:
diff --git a/tools/testing/selftests/bpf/xdpxceiver.h b/tools/testing/selftests/bpf/xdpxceiver.h
index 02b7d0d6f45d..1c94230c351a 100644
--- a/tools/testing/selftests/bpf/xdpxceiver.h
+++ b/tools/testing/selftests/bpf/xdpxceiver.h
@@ -35,7 +35,7 @@ 
 #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 200000
+#define USLEEP_MAX 10000
 #define SOCK_RECONF_CTR 10
 #define BATCH_SIZE 64
 #define POLL_TMOUT 1000

[bpf-next,06/17] selftests: xsk: simplify the retry code

Commit Message

Patch