| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <ffb237e32f2d725eb782f541681b05a0319b591b.1633520807.git.cdleonard@gmail.com>
Date: Wed, 6 Oct 2021 14:47:26 +0300
From: Leonard Crestez <cdleonard@...il.com>
To: Jakub Kicinski <kuba@...nel.org>, Shuah Khan <shuah@...nel.org>,
David Ahern <dsahern@...nel.org>
Cc: "David S. Miller" <davem@...emloft.net>,
Ido Schimmel <idosch@...dia.com>,
Seth David Schoen <schoen@...alty.org>,
netdev@...r.kernel.org, linux-kselftest@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH 10/11] selftests: nettest: Add NETTEST_CLIENT,SERVER}_TIMEOUT envvars
Move the single "prog_timeout_ms" into sock_args and split into client
and server timeouts.
Add NETTEST_CLIENT_TIMEOUT and NETTEST_SERVER_TIMEOUT which can set a
default value different than the default of 5 seconds.
This allows exporting NETTEST_CLIENT_TIMEOUT=0.1 and running all of
fcnal-test.sh quickly.
A reduced server timeout is less useful, most tests would work fine with
an infinite timeout because nettest is launched in the background and
killed explicitly.
Signed-off-by: Leonard Crestez <cdleonard@...il.com>
---
tools/testing/selftests/net/nettest.c | 66 ++++++++++++++++++++++-----
1 file changed, 54 insertions(+), 12 deletions(-)
diff --git a/tools/testing/selftests/net/nettest.c b/tools/testing/selftests/net/nettest.c
index eb6c8cf69a74..bc5976f842f9 100644
--- a/tools/testing/selftests/net/nettest.c
+++ b/tools/testing/selftests/net/nettest.c
@@ -122,14 +122,16 @@ struct sock_args {
struct in6_addr in6;
} expected_raddr;
/* ESP in UDP encap test */
int use_xfrm;
+
+ unsigned int client_timeout_ms;
+ unsigned int server_timeout_ms;
};
static int server_mode;
-static unsigned int prog_timeout_ms = 5000;
static unsigned int interactive;
static int iter = 1;
static char *msg = "Hello world!";
static int msglen;
static int quiet;
@@ -1207,14 +1209,21 @@ static int msg_loop(int client, int sd, void *addr, socklen_t alen,
if (client) {
if (send_msg(sd, addr, alen, args))
return 1;
}
if (!interactive) {
- if (!prog_timeout_ms)
+ unsigned int timeout_ms;
+
+ if (client)
+ timeout_ms = args->client_timeout_ms;
+ else
+ timeout_ms = args->server_timeout_ms;
+
+ if (!timeout_ms)
set_timeval_ms(&timeout, 5000);
else
- set_timeval_ms(&timeout, prog_timeout_ms);
+ set_timeval_ms(&timeout, timeout_ms);
ptval = &timeout;
}
}
nfds = interactive ? MAX(fileno(stdin), sd) + 1 : sd + 1;
@@ -1528,12 +1537,12 @@ static int do_server(struct sock_args *args, int ipc_fd)
args->dev = args->server_dev;
args->expected_dev = args->expected_server_dev;
if (resolve_devices(args) || validate_addresses(args))
goto err_exit;
- if (prog_timeout_ms) {
- set_timeval_ms(&timeout, prog_timeout_ms);
+ if (args->server_timeout_ms) {
+ set_timeval_ms(&timeout, args->server_timeout_ms);
ptval = &timeout;
}
if (args->has_grp)
lsd = msock_server(args);
@@ -1611,22 +1620,22 @@ static int do_server(struct sock_args *args, int ipc_fd)
err_exit:
ipc_write(ipc_fd, 0);
return 1;
}
-static int wait_for_connect(int sd)
+static int wait_for_connect(int sd, struct sock_args *args)
{
struct timeval _tv, *tv = NULL;
fd_set wfd;
int val = 0, sz = sizeof(val);
int rc;
FD_ZERO(&wfd);
FD_SET(sd, &wfd);
- if (prog_timeout_ms) {
- set_timeval_ms(&_tv, prog_timeout_ms);
+ if (args->client_timeout_ms) {
+ set_timeval_ms(&_tv, args->client_timeout_ms);
tv = &_tv;
}
rc = select(FD_SETSIZE, NULL, &wfd, NULL, tv);
if (rc == 0) {
@@ -1692,11 +1701,11 @@ static int connectsock(void *addr, socklen_t alen, struct sock_args *args)
if (errno != EINPROGRESS) {
log_err_errno("Failed to connect to remote host");
rc = -1;
goto err;
}
- rc = wait_for_connect(sd);
+ rc = wait_for_connect(sd, args);
if (rc < 0)
goto err;
}
out:
return sd;
@@ -1883,11 +1892,11 @@ static void print_usage(char *prog)
"Required:\n"
" -r addr remote address to connect to (client mode only)\n"
" -p port port to connect to (client mode)/listen on (server mode)\n"
" (default: %d)\n"
" -s server mode (default: client mode)\n"
- " -t timeout seconds (default: none)\n"
+ " -t seconds timeout seconds for both client and server (default: 5.000)\n"
"\n"
"Optional:\n"
" -B do both client and server via fork and IPC\n"
" -N ns set client to network namespace ns (requires root)\n"
" -O ns set server to network namespace ns (requires root)\n"
@@ -1920,19 +1929,46 @@ static void print_usage(char *prog)
" -3 dev Expected device name (or index) to receive packets - server mode\n"
"\n"
" -b Bind test only.\n"
" -q Be quiet. Run test without printing anything.\n"
" -k Fork server in background after bind or listen.\n"
+ "\n"
+ "Environment Variables:"
+ "\n"
+ "NETTEST_CLIENT_TIMEOUT: timeouts in seconds for client"
+ "NETTEST_SERVER_TIMEOUT: timeouts in seconds for server"
, prog, DEFAULT_PORT);
}
+int parse_env(struct sock_args *args)
+{
+ const char *str;
+
+ if ((str = getenv("NETTEST_CLIENT_TIMEOUT"))) {
+ if (str_to_msec(str, &args->client_timeout_ms) != 0) {
+ fprintf(stderr, "Invalid NETTEST_CLIENT_TIMEOUT\n");
+ return 1;
+ }
+ }
+ if ((str = getenv("NETTEST_SERVER_TIMEOUT"))) {
+ if (str_to_msec(str, &args->server_timeout_ms) != 0) {
+ fprintf(stderr, "Invalid NETTEST_SERVER_TIMEOUT\n");
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
int main(int argc, char *argv[])
{
struct sock_args args = {
.version = AF_INET,
.type = SOCK_STREAM,
.port = DEFAULT_PORT,
+ .client_timeout_ms = 5000,
+ .server_timeout_ms = 5000,
};
struct protoent *pe;
int both_mode = 0;
unsigned int tmp;
int forever = 0;
@@ -1941,10 +1977,14 @@ int main(int argc, char *argv[])
/* process inputs */
extern char *optarg;
int rc = 0;
+ rc = parse_env(&args);
+ if (rc)
+ return rc;
+
/*
* process input args
*/
while ((rc = getopt(argc, argv, GETOPT_STR)) != -1) {
@@ -1976,14 +2016,15 @@ int main(int argc, char *argv[])
return 1;
}
args.port = (unsigned short) tmp;
break;
case 't':
- if (str_to_msec(optarg, &prog_timeout_ms) != 0) {
+ if (str_to_msec(optarg, &args.client_timeout_ms) != 0) {
fprintf(stderr, "Invalid timeout\n");
return 1;
}
+ args.server_timeout_ms = args.client_timeout_ms;
break;
case 'D':
args.type = SOCK_DGRAM;
break;
case 'R':
@@ -2121,11 +2162,12 @@ int main(int argc, char *argv[])
"Fork after listen only supported for server mode\n");
return 1;
}
if (interactive) {
- prog_timeout_ms = 0;
+ args.client_timeout_ms = 0;
+ args.server_timeout_ms = 0;
msg = NULL;
}
if (both_mode) {
if (pipe(fd) < 0) {
--
2.25.1
Powered by blists - more mailing lists