From patchwork Fri Sep 2 01:17:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ammar Faizi X-Patchwork-Id: 12963494 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 AAD2FECAAD3 for ; Fri, 2 Sep 2022 01:18:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232782AbiIBBSU (ORCPT ); Thu, 1 Sep 2022 21:18:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234698AbiIBBST (ORCPT ); Thu, 1 Sep 2022 21:18:19 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDF05A3D5C for ; Thu, 1 Sep 2022 18:18:18 -0700 (PDT) Received: from localhost.localdomain (unknown [182.2.38.99]) by gnuweeb.org (Postfix) with ESMTPSA id D7D3280BAE; Fri, 2 Sep 2022 01:18:14 +0000 (UTC) X-GW-Data: lPqxHiMPbJw1wb7CM9QUryAGzr0yq5atzVDdxTR0iA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1662081498; bh=5BqT3slwT3fHxa5r0dGJXvXj9KMzEoJox4VMoAXlKHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=paf94rR0OFXmV137EAVsj40V2EZbSeq9y24LQQsbtk89r9mM3Gg4OfrWMSpXrF4EX 7ZtvlcPTsMJUhoOczBeT+uWDn25vzlxV8wZ9Xm2vFhPjShq3/G6ntvOU8eoLycOgTX qAiPJay/K6/TTl/CM1/0K6klFn1qM4Pp83osFfRotYvuw8tT9UjbtamWZtJvMQ+Joa jdHVTabyTuFL5JnIO1oMrQWKTsxEitXoEjE1iv/UL8Ochll7z8ddQMozM+zFia/B0O DyD1AhEnkmHrY1L2jfxCvImdmgnw2pYdILK3SF07ulymWioycN3ZCVgVq4B5rvfKx+ tv69I3BKFXoQQ== 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 05/12] t/socket-rw-offset: Don't brute force the port number Date: Fri, 2 Sep 2022 08:17:45 +0700 Message-Id: <20220902011548.2506938-6-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 Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org From: Ammar Faizi Don't brute force the port number, use `t_bind_ephemeral_port()`, much simpler and reliable for choosing a port number that is not in use. Cc: Dylan Yudaken Cc: Facebook Kernel Team Cc: Pavel Begunkov Signed-off-by: Ammar Faizi Reviewed-by: Alviro Iskandar Setiawan --- test/socket-rw-offset.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/test/socket-rw-offset.c b/test/socket-rw-offset.c index 987b6c9..c422442 100644 --- a/test/socket-rw-offset.c +++ b/test/socket-rw-offset.c @@ -11,58 +11,49 @@ #include #include #include #include #include #include #include #include #include #include "liburing.h" +#include "helpers.h" int main(int argc, char *argv[]) { int p_fd[2], ret; int32_t recv_s0; int32_t val = 1; struct sockaddr_in addr; struct iovec iov_r[1], iov_w[1]; if (argc > 1) return 0; srand(getpid()); recv_s0 = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP); ret = setsockopt(recv_s0, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val)); assert(ret != -1); ret = setsockopt(recv_s0, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); assert(ret != -1); addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - - do { - addr.sin_port = htons((rand() % 61440) + 4096); - ret = bind(recv_s0, (struct sockaddr*)&addr, sizeof(addr)); - if (!ret) - break; - if (errno != EADDRINUSE) { - perror("bind"); - exit(1); - } - } while (1); + assert(!t_bind_ephemeral_port(recv_s0, &addr)); ret = listen(recv_s0, 128); assert(ret != -1); p_fd[1] = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP); val = 1; ret = setsockopt(p_fd[1], IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)); assert(ret != -1); int32_t flags = fcntl(p_fd[1], F_GETFL, 0); assert(flags != -1);