[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220902005825.2484023-8-ammar.faizi@intel.com>
Date: Fri, 2 Sep 2022 07:59:41 +0700
From: Ammar Faizi <ammarfaizi2@...weeb.org>
To: Jens Axboe <axboe@...nel.dk>
Cc: Ammar Faizi <ammarfaizi2@...weeb.org>,
Dylan Yudaken <dylany@...com>,
Facebook Kernel Team <kernel-team@...com>,
Pavel Begunkov <asml.silence@...il.com>,
Kanna Scarlet <knscarlet@...weeb.org>,
Muhammad Rizki <kiizuha@...weeb.org>,
GNU/Weeb Mailing List <gwml@...r.gnuweeb.org>,
io-uring Mailing List <io-uring@...r.gnuweeb.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: [PATCH liburing v1 07/12] t/socket: Don't use a static port number
From: Ammar Faizi <ammarfaizi2@...weeb.org>
Don't use a static port number. It might already be in use, resulting
in a test failure. Use an ephemeral port to make this test reliable.
Cc: Dylan Yudaken <dylany@...com>
Cc: Facebook Kernel Team <kernel-team@...com>
Cc: Pavel Begunkov <asml.silence@...il.com>
Signed-off-by: Ammar Faizi <ammarfaizi2@...weeb.org>
---
test/socket.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/test/socket.c b/test/socket.c
index 6a3ea09..94c8e9f 100644
--- a/test/socket.c
+++ b/test/socket.c
@@ -1,65 +1,65 @@
/* SPDX-License-Identifier: MIT */
/*
* Simple test case using the socket op
*/
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <arpa/inet.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <pthread.h>
+#include <assert.h>
#include "liburing.h"
#include "helpers.h"
static char str[] = "This is a test of send and recv over io_uring!";
#define MAX_MSG 128
-#define PORT 10202
#define HOST "127.0.0.1"
static int no_socket;
+static __be32 g_port;
static int recv_prep(struct io_uring *ring, struct iovec *iov, int *sock,
int registerfiles)
{
struct sockaddr_in saddr;
struct io_uring_sqe *sqe;
int sockfd, ret, val, use_fd;
memset(&saddr, 0, sizeof(saddr));
saddr.sin_family = AF_INET;
saddr.sin_addr.s_addr = htonl(INADDR_ANY);
- saddr.sin_port = htons(PORT);
sockfd = socket(AF_INET, SOCK_DGRAM, 0);
if (sockfd < 0) {
perror("socket");
return 1;
}
val = 1;
setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
- ret = bind(sockfd, (struct sockaddr *)&saddr, sizeof(saddr));
- if (ret < 0) {
+ if (t_bind_ephemeral_port(sockfd, &saddr)) {
perror("bind");
goto err;
}
+ g_port = saddr.sin_port;
if (registerfiles) {
ret = io_uring_register_files(ring, &sockfd, 1);
if (ret) {
fprintf(stderr, "file reg failed\n");
goto err;
}
use_fd = 0;
} else {
use_fd = sockfd;
}
sqe = io_uring_get_sqe(ring);
@@ -234,29 +234,30 @@ static int do_send(int socket_direct, int alloc)
if (ret) {
fprintf(stderr, "queue init failed: %d\n", ret);
return 1;
}
if (socket_direct) {
ret = io_uring_register_files(&ring, &fd, 1);
if (ret) {
fprintf(stderr, "file register %d\n", ret);
return 1;
}
}
+ assert(g_port != 0);
memset(&saddr, 0, sizeof(saddr));
saddr.sin_family = AF_INET;
- saddr.sin_port = htons(PORT);
+ saddr.sin_port = g_port;
inet_pton(AF_INET, HOST, &saddr.sin_addr);
sqe = io_uring_get_sqe(&ring);
if (socket_direct) {
unsigned file_index = 0;
if (alloc)
file_index = IORING_FILE_INDEX_ALLOC - 1;
io_uring_prep_socket_direct(sqe, AF_INET, SOCK_DGRAM, 0,
file_index, 0);
} else {
io_uring_prep_socket(sqe, AF_INET, SOCK_DGRAM, 0, 0);
}
ret = io_uring_submit(&ring);
--
Ammar Faizi
Powered by blists - more mailing lists