[bpf-next,16/17] selftests: xsk: make enums lower case

Message ID	20210727131753.10924-17-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 16/17] selftests: xsk: make enums lower case Date: Tue, 27 Jul 2021 15:17:52 +0200 Message-Id: <20210727131753.10924-17-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-17-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 16/17] selftests: xsk: make enums lower case
Date: Tue, 27 Jul 2021 15:17:52 +0200
Message-Id: <20210727131753.10924-17-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>

Make enums lower case as that is the standard. Also drop the
unnecessary TEST_MODE_UNCONFIGURED mode.

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

diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
index 422b34b5afcc..f0616200d5b5 100644
--- a/tools/testing/selftests/bpf/xdpxceiver.c
+++ b/tools/testing/selftests/bpf/xdpxceiver.c
@@ -105,14 +105,9 @@  static const u16 UDP_PORT2 = 2121;
 
 static void __exit_with_error(int error, const char *file, const char *func, int line)
 {
-	if (configured_mode == TEST_MODE_UNCONFIGURED) {
-		ksft_exit_fail_msg
-		("[%s:%s:%i]: ERROR: %d/\"%s\"\n", file, func, line, error, strerror(error));
-	} else {
-		ksft_test_result_fail
-		("[%s:%s:%i]: ERROR: %d/\"%s\"\n", file, func, line, error, strerror(error));
-		ksft_exit_xfail();
-	}
+	ksft_test_result_fail("[%s:%s:%i]: ERROR: %d/\"%s\"\n", file, func, line, error,
+			      strerror(error));
+	ksft_exit_xfail();
 }
 
 #define exit_with_error(error) __exit_with_error(error, __FILE__, __func__, __LINE__)
diff --git a/tools/testing/selftests/bpf/xdpxceiver.h b/tools/testing/selftests/bpf/xdpxceiver.h
index f5b46cd3d8df..309a580fd1c5 100644
--- a/tools/testing/selftests/bpf/xdpxceiver.h
+++ b/tools/testing/selftests/bpf/xdpxceiver.h
@@ -43,14 +43,13 @@ 
 
 #define print_verbose(x...) do { if (opt_verbose) ksft_print_msg(x); } while (0)
 
-enum TEST_MODES {
-	TEST_MODE_UNCONFIGURED = -1,
+enum test_mode {
 	TEST_MODE_SKB,
 	TEST_MODE_DRV,
 	TEST_MODE_MAX
 };
 
-enum TEST_TYPES {
+enum test_type {
 	TEST_TYPE_NOPOLL,
 	TEST_TYPE_POLL,
 	TEST_TYPE_TEARDOWN,
@@ -60,7 +59,7 @@  enum TEST_TYPES {
 	TEST_TYPE_MAX
 };
 
-enum STAT_TEST_TYPES {
+enum stat_test_type {
 	STAT_TEST_RX_DROPPED,
 	STAT_TEST_TX_INVALID,
 	STAT_TEST_RX_FULL,
@@ -68,7 +67,7 @@  enum STAT_TEST_TYPES {
 	STAT_TEST_TYPE_MAX
 };
 
-static int configured_mode = TEST_MODE_UNCONFIGURED;
+static int configured_mode;
 static u8 debug_pkt_dump;
 static u32 num_frames = DEFAULT_PKT_CNT / 4;
 static bool second_step;

[bpf-next,16/17] selftests: xsk: make enums lower case

Commit Message

Patch