From patchwork Fri Sep 2 07:15:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ammar Faizi X-Patchwork-Id: 12963725 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB394C54EE9 for ; Fri, 2 Sep 2022 07:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235381AbiIBHQW (ORCPT ); Fri, 2 Sep 2022 03:16:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235371AbiIBHQW (ORCPT ); Fri, 2 Sep 2022 03:16:22 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 548335F11D for ; Fri, 2 Sep 2022 00:16:20 -0700 (PDT) Received: from localhost.localdomain (unknown [182.2.70.226]) by gnuweeb.org (Postfix) with ESMTPSA id 355BC80C74; Fri, 2 Sep 2022 07:16:14 +0000 (UTC) X-GW-Data: lPqxHiMPbJw1wb7CM9QUryAGzr0yq5atzVDdxTR0iA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1662102979; bh=xdxxEiXCVOGbUZCh1DJ5zBAf3MA/1dNBGI/518QX6L4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WKNzIM7/KbYFgrKmmbO6jUZN0no5sbkEXWWc2LoOsjX6x9LhNrDeum98SHLJvBHyR riOYp8boND1lw6KXvalF0VaKYeCUN7ZFhcnBv5J4E6qQy7NJnDFJwhT7/LHW2QbMM1 p9bxYBGC7PO3zQwep2vCc8CvypqsxVY3kUaEIZJXNHw0WWiiRZwHWBeDGZeQQK6xTr 6PrRyOLWtnTO2UJeP4Pb87LsKGMFllbJ6NqbXdKmhb0ksfWDgSaT5mJ4ypCQKy3L2t 68MnaSWzf56VpzxMYfDYA6n9j4UdUv6wFMUEGO/+rEvyYnGfO4e1P15jknJplul+B+ 61yWeP3K2HprQ== From: Ammar Faizi To: Jens Axboe Cc: Ammar Faizi , Dylan Yudaken , Facebook Kernel Team , Pavel Begunkov , io-uring Mailing List , GNU/Weeb Mailing List , Kanna Scarlet , Muhammad Rizki , Alviro Iskandar Setiawan Subject: [PATCH liburing v2 12/12] t/recv-msgall-stream: Don't use a static port number Date: Fri, 2 Sep 2022 14:15:05 +0700 Message-Id: <20220902071153.3168814-13-ammar.faizi@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220902071153.3168814-1-ammar.faizi@intel.com> References: <20220902071153.3168814-1-ammar.faizi@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org From: Ammar Faizi 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 Cc: Facebook Kernel Team Cc: Pavel Begunkov Reviewed-by: Alviro Iskandar Setiawan Tested-by: Alviro Iskandar Setiawan Signed-off-by: Ammar Faizi --- test/recv-msgall-stream.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/test/recv-msgall-stream.c b/test/recv-msgall-stream.c index a188cc1..65b4d22 100644 --- a/test/recv-msgall-stream.c +++ b/test/recv-msgall-stream.c @@ -1,12 +1,13 @@ /* SPDX-License-Identifier: MIT */ /* * Test MSG_WAITALL for recv/recvmsg and include normal sync versions just * for comparison. */ +#include #include #include #include #include #include #include #include @@ -15,48 +16,45 @@ #include #include "liburing.h" #include "helpers.h" #define MAX_MSG 128 -static int port = 31200; - struct recv_data { pthread_mutex_t mutex; int use_recvmsg; int use_sync; - int port; + __be16 port; }; static int get_conn_sock(struct recv_data *rd, int *sockout) { struct sockaddr_in saddr; int sockfd, ret, val; memset(&saddr, 0, sizeof(saddr)); saddr.sin_family = AF_INET; saddr.sin_addr.s_addr = htonl(INADDR_ANY); - saddr.sin_port = htons(rd->port); sockfd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP); if (sockfd < 0) { perror("socket"); goto err; } val = 1; setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &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; } + rd->port = saddr.sin_port; ret = listen(sockfd, 16); if (ret < 0) { perror("listen"); goto err; } @@ -275,26 +273,26 @@ static int do_send(struct recv_data *rd) return 1; } buf = malloc(MAX_MSG * sizeof(int)); for (i = 0; i < MAX_MSG; i++) buf[i] = i; - memset(&saddr, 0, sizeof(saddr)); - saddr.sin_family = AF_INET; - saddr.sin_port = htons(rd->port); - inet_pton(AF_INET, "127.0.0.1", &saddr.sin_addr); - sockfd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP); if (sockfd < 0) { perror("socket"); return 1; } pthread_mutex_lock(&rd->mutex); + assert(rd->port != 0); + memset(&saddr, 0, sizeof(saddr)); + saddr.sin_family = AF_INET; + saddr.sin_port = rd->port; + inet_pton(AF_INET, "127.0.0.1", &saddr.sin_addr); ret = connect(sockfd, (struct sockaddr *)&saddr, sizeof(saddr)); if (ret < 0) { perror("connect"); return 1; } @@ -347,15 +345,15 @@ static int test(int use_recvmsg, int use_sync) pthread_mutexattr_init(&attr); pthread_mutexattr_setpshared(&attr, 1); pthread_mutex_init(&rd.mutex, &attr); pthread_mutex_lock(&rd.mutex); rd.use_recvmsg = use_recvmsg; rd.use_sync = use_sync; - rd.port = port++; + rd.port = 0; ret = pthread_create(&recv_thread, NULL, recv_fn, &rd); if (ret) { fprintf(stderr, "Thread create failed: %d\n", ret); pthread_mutex_unlock(&rd.mutex); return 1; }