From: Shuah Khan <skhan@linuxfoundation.org>
To: catalin.marinas@arm.com, will@kernel.org, shuah@kernel.org,
keescook@chromium.org, mic@digikod.net, davem@davemloft.net,
kuba@kernel.org, peterz@infradead.org, paulmck@kernel.org,
boqun.feng@gmail.com, akpm@linux-foundation.org
Cc: Shuah Khan <skhan@linuxfoundation.org>,
linux-kselftest@vger.kernel.org,
linux-security-module@vger.kernel.org, netdev@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 07/12] selftests/net: remove ARRAY_SIZE define from individual tests
Date: Fri, 10 Dec 2021 10:33:17 -0700 [thread overview]
Message-ID: <1356c830b8155ddd37a6330c1f5d4df7a1bdb86a.1639156389.git.skhan@linuxfoundation.org> (raw)
In-Reply-To: <cover.1639156389.git.skhan@linuxfoundation.org>
ARRAY_SIZE is defined in several selftests. Remove definitions from
individual test files and include header file for the define instead.
ARRAY_SIZE define is added in a separate patch to prepare for this
change.
Remove ARRAY_SIZE from net tests and pickup the one defined in
kselftest.h.
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
---
tools/testing/selftests/net/gro.c | 3 ++-
tools/testing/selftests/net/ipsec.c | 1 -
tools/testing/selftests/net/reuseport_bpf.c | 4 +---
tools/testing/selftests/net/rxtimestamp.c | 2 +-
tools/testing/selftests/net/socket.c | 3 ++-
tools/testing/selftests/net/tcp_fastopen_backup_key.c | 6 ++----
6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/net/gro.c
index cf37ce86b0fd..221525ccbe1d 100644
--- a/tools/testing/selftests/net/gro.c
+++ b/tools/testing/selftests/net/gro.c
@@ -57,10 +57,11 @@
#include <string.h>
#include <unistd.h>
+#include "../kselftest.h"
+
#define DPORT 8000
#define SPORT 1500
#define PAYLOAD_LEN 100
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#define NUM_PACKETS 4
#define START_SEQ 100
#define START_ACK 100
diff --git a/tools/testing/selftests/net/ipsec.c b/tools/testing/selftests/net/ipsec.c
index 3d7dde2c321b..cc10c10c5ed9 100644
--- a/tools/testing/selftests/net/ipsec.c
+++ b/tools/testing/selftests/net/ipsec.c
@@ -41,7 +41,6 @@
#define pr_err(fmt, ...) printk(fmt ": %m", ##__VA_ARGS__)
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
#define IPV4_STR_SZ 16 /* xxx.xxx.xxx.xxx is longest + \0 */
diff --git a/tools/testing/selftests/net/reuseport_bpf.c b/tools/testing/selftests/net/reuseport_bpf.c
index b5277106df1f..072d709c96b4 100644
--- a/tools/testing/selftests/net/reuseport_bpf.c
+++ b/tools/testing/selftests/net/reuseport_bpf.c
@@ -24,9 +24,7 @@
#include <sys/resource.h>
#include <unistd.h>
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#endif
+#include "../kselftest.h"
struct test_params {
int recv_family;
diff --git a/tools/testing/selftests/net/rxtimestamp.c b/tools/testing/selftests/net/rxtimestamp.c
index e4613ce4ed69..9eb42570294d 100644
--- a/tools/testing/selftests/net/rxtimestamp.c
+++ b/tools/testing/selftests/net/rxtimestamp.c
@@ -18,7 +18,7 @@
#include <linux/net_tstamp.h>
#include <linux/errqueue.h>
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#include "../kselftest.h"
struct options {
int so_timestamp;
diff --git a/tools/testing/selftests/net/socket.c b/tools/testing/selftests/net/socket.c
index afca1ead677f..db1aeb8c5d1e 100644
--- a/tools/testing/selftests/net/socket.c
+++ b/tools/testing/selftests/net/socket.c
@@ -7,6 +7,8 @@
#include <sys/socket.h>
#include <netinet/in.h>
+#include "../kselftest.h"
+
struct socket_testcase {
int domain;
int type;
@@ -31,7 +33,6 @@ static struct socket_testcase tests[] = {
{ AF_INET, SOCK_STREAM, IPPROTO_UDP, -EPROTONOSUPPORT, 1 },
};
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#define ERR_STRING_SZ 64
static int run_tests(void)
diff --git a/tools/testing/selftests/net/tcp_fastopen_backup_key.c b/tools/testing/selftests/net/tcp_fastopen_backup_key.c
index 9c55ec44fc43..c1cb0c75156a 100644
--- a/tools/testing/selftests/net/tcp_fastopen_backup_key.c
+++ b/tools/testing/selftests/net/tcp_fastopen_backup_key.c
@@ -26,6 +26,8 @@
#include <fcntl.h>
#include <time.h>
+#include "../kselftest.h"
+
#ifndef TCP_FASTOPEN_KEY
#define TCP_FASTOPEN_KEY 33
#endif
@@ -34,10 +36,6 @@
#define PROC_FASTOPEN_KEY "/proc/sys/net/ipv4/tcp_fastopen_key"
#define KEY_LENGTH 16
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#endif
-
static bool do_ipv6;
static bool do_sockopt;
static bool do_rotate;
--
2.32.0
next prev parent reply other threads:[~2021-12-10 17:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 17:33 [PATCH 00/12] selftests: Remove ARRAY_SIZE duplicate defines Shuah Khan
2021-12-10 17:33 ` [PATCH 01/12] tools: fix ARRAY_SIZE defines in tools and selftests hdrs Shuah Khan
2021-12-13 20:38 ` Kees Cook
2021-12-10 17:33 ` [PATCH 02/12] selftests/arm64: remove ARRAY_SIZE define from vec-syscfg.c Shuah Khan
2021-12-13 15:45 ` Will Deacon
2021-12-10 17:33 ` [PATCH 03/12] selftests/cgroup: remove ARRAY_SIZE define from cgroup_util.h Shuah Khan
2021-12-10 17:33 ` [PATCH 04/12] selftests/core: remove ARRAY_SIZE define from close_range_test.c Shuah Khan
2021-12-10 17:33 ` [PATCH 05/12] selftests/ir: remove ARRAY_SIZE define from ir_loopback.c Shuah Khan
2021-12-10 17:33 ` [PATCH 06/12] selftests/landlock: remove ARRAY_SIZE define from common.h Shuah Khan
2021-12-13 15:36 ` Mickaël Salaün
2021-12-10 17:33 ` Shuah Khan [this message]
2021-12-11 3:03 ` [PATCH 07/12] selftests/net: remove ARRAY_SIZE define from individual tests Jakub Kicinski
2021-12-10 17:33 ` [PATCH 08/12] selftests/rseq: " Shuah Khan
2021-12-10 17:33 ` [PATCH 09/12] selftests/seccomp: remove ARRAY_SIZE define from seccomp_benchmark Shuah Khan
2021-12-13 20:38 ` Kees Cook
2021-12-10 17:33 ` [PATCH 10/12] selftests/sparc64: remove ARRAY_SIZE define from adi-test Shuah Khan
2021-12-10 17:33 ` [PATCH 11/12] selftests/timens: remove ARRAY_SIZE define from individual tests Shuah Khan
2021-12-10 17:33 ` [PATCH 12/12] selftests/vm: " Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356c830b8155ddd37a6330c1f5d4df7a1bdb86a.1639156389.git.skhan@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=boqun.feng@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mic@digikod.net \
--cc=netdev@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=shuah@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).