From mboxrd@z Thu Jan 1 00:00:00 1970 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 98557ECAAD2 for ; Fri, 2 Sep 2022 01:19:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235290AbiIBBTI (ORCPT ); Thu, 1 Sep 2022 21:19:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235184AbiIBBSw (ORCPT ); Thu, 1 Sep 2022 21:18:52 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0FA4A6AD3 for ; Thu, 1 Sep 2022 18:18:46 -0700 (PDT) Received: from localhost.localdomain (unknown [182.2.38.99]) by gnuweeb.org (Postfix) with ESMTPSA id 5BF7580927; Fri, 2 Sep 2022 01:18:42 +0000 (UTC) X-GW-Data: lPqxHiMPbJw1wb7CM9QUryAGzr0yq5atzVDdxTR0iA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1662081525; bh=//7uly+1u1he/eHyd6032YyKChRFDV3/b/0CMS/ftak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WHsueKAUiTia4VfQ5Lstrv07MXNskOaRy0OkNO2ZD+G59Mv8+iuHDKtA9kV43jhl0 453XEVPfcna09Z8yWAFbVDIA9mlc4jxS3TSyJohap3MCl5SNSng9c568UdfdGhABVF qEVCnRlEhc/sMFcULBvmd4pGqp/7ceOpM5a4IPca4gjRm7SCGShSYqtPA/pRig6PEq laYnwkhfFfOwr6nj3kgdjk9//e7t5ZIg0/FtWM78NLyMo0jtVghsFxFcHMs58/ZqCQ w8siPFBPDbSoq+Ni0TTKnAoyCk7ZLhP5qZTg8oaOZHIfei6uopmlwkTXpFqz9WcKdW mblySzOrc3GGA== 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 Subject: [RESEND PATCH liburing v1 12/12] t/recv-msgall-stream: Don't use a static port number Date: Fri, 2 Sep 2022 08:17:52 +0700 Message-Id: <20220902011548.2506938-13-ammar.faizi@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220902011548.2506938-1-ammar.faizi@intel.com> References: <20220902011548.2506938-1-ammar.faizi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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,67 +1,65 @@ /* 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 #include #include #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; } pthread_mutex_unlock(&rd->mutex); ret = accept(sockfd, NULL, NULL); if (ret < 0) { perror("accept"); @@ -270,36 +268,36 @@ static int do_send(struct recv_data *rd) int *buf; ret = io_uring_queue_init(2, &ring, 0); if (ret) { fprintf(stderr, "queue init failed: %d\n", ret); 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; } iov.iov_base = buf; iov.iov_len = MAX_MSG * sizeof(int) / 2; for (i = 0; i < 2; i++) { sqe = io_uring_get_sqe(&ring); io_uring_prep_send(sqe, sockfd, iov.iov_base, iov.iov_len, 0); @@ -342,25 +340,25 @@ static int test(int use_recvmsg, int use_sync) pthread_mutexattr_t attr; pthread_t recv_thread; struct recv_data rd; int ret; void *retval; 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; } do_send(&rd); pthread_join(recv_thread, &retval); return (intptr_t)retval; } -- Ammar Faizi