From nobody Mon Apr 6 23:08:50 2026 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 020F9ECAAD2 for ; Fri, 2 Sep 2022 01:01:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234982AbiIBBBz (ORCPT ); Thu, 1 Sep 2022 21:01:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235034AbiIBBBQ (ORCPT ); Thu, 1 Sep 2022 21:01:16 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3B4C550B3 for ; Thu, 1 Sep 2022 18:01:05 -0700 (PDT) Received: from localhost.localdomain (unknown [182.2.38.99]) by gnuweeb.org (Postfix) with ESMTPSA id B3CD380C15; Fri, 2 Sep 2022 01:01:01 +0000 (UTC) X-GW-Data: lPqxHiMPbJw1wb7CM9QUryAGzr0yq5atzVDdxTR0iA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1662080465; bh=vShv+hxcQ7QcSMBl3vGKbL5wp9p4RgG0QrNvZWcvci8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PnO9tAhWPSTQ3dilR+VckCrmrIrKBALDGVSOGeSJe+0US5Z4ceO+s09TZhluZsLVU OWV0pCIZgNXWORmaZHJBS7ltxPnq4xGYHhiRmxKwlE7oOtCzJwySnlBiXpB7CmgFRH lelxTHvx7SqC6TOtm+Ch7dUPxvhr8+Zy4z4j9MMFzVAmVwtmvM/ohQ1w4zvgn32kxd pBZufE9p64YaF8r2d4KWeRGdogQkm5h0rDSuKAcplCMM6g8clGey0MdHDkxwPPBW5c GCC7S2ktXaMlY0DNO0WjeN5jOtcBUsZYiCTq1MkvixKdaNuhoWLVt/bdrk0OIJppRj VHQFnnfqxKYxg== From: Ammar Faizi To: Jens Axboe Cc: Ammar Faizi , Dylan Yudaken , Facebook Kernel Team , Pavel Begunkov , Kanna Scarlet , Muhammad Rizki , GNU/Weeb Mailing List , io-uring Mailing List , Linux Kernel Mailing List Subject: [PATCH liburing v1 11/12] t/232c93d07b74: Don't use a static port number Date: Fri, 2 Sep 2022 07:59:45 +0700 Message-Id: <20220902005825.2484023-12-ammar.faizi@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220902005825.2484023-1-ammar.faizi@intel.com> References: <20220902005825.2484023-1-ammar.faizi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/232c93d07b74.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/232c93d07b74.c b/test/232c93d07b74.c index c99491f..74cc063 100644 --- a/test/232c93d07b74.c +++ b/test/232c93d07b74.c @@ -17,31 +17,30 @@ #include #include #include #include #include #include =20 #include "helpers.h" #include "liburing.h" =20 #define RECV_BUFF_SIZE 2 #define SEND_BUFF_SIZE 3 =20 -#define PORT 0x1234 - struct params { int tcp; int non_blocking; + __be16 bind_port; }; =20 pthread_mutex_t mutex =3D PTHREAD_MUTEX_INITIALIZER; pthread_cond_t cond =3D PTHREAD_COND_INITIALIZER; int rcv_ready =3D 0; =20 static void set_rcv_ready(void) { pthread_mutex_lock(&mutex); =20 rcv_ready =3D 1; pthread_cond_signal(&cond); =20 @@ -67,30 +66,29 @@ static void *rcv(void *arg) if (p->tcp) { int val =3D 1; =20 =20 s0 =3D socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP); res =3D setsockopt(s0, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val)); assert(res !=3D -1); res =3D setsockopt(s0, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); assert(res !=3D -1); =20 struct sockaddr_in addr; =20 addr.sin_family =3D AF_INET; - addr.sin_port =3D htons(PORT); addr.sin_addr.s_addr =3D inet_addr("127.0.0.1"); - res =3D bind(s0, (struct sockaddr *) &addr, sizeof(addr)); - assert(res !=3D -1); + assert(t_bind_ephemeral_port(s0, &addr) =3D=3D 0); + p->bind_port =3D addr.sin_port; } else { s0 =3D socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); assert(s0 !=3D -1); =20 struct sockaddr_un addr; memset(&addr, 0, sizeof(addr)); =20 addr.sun_family =3D AF_UNIX; memcpy(addr.sun_path, "\0sock", 6); res =3D bind(s0, (struct sockaddr *) &addr, sizeof(addr)); assert(res !=3D -1); } res =3D listen(s0, 128); @@ -182,27 +180,27 @@ static void *snd(void *arg) =20 wait_for_rcv_ready(); =20 if (p->tcp) { int val =3D 1; =20 s0 =3D socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP); ret =3D setsockopt(s0, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)); assert(ret !=3D -1); =20 struct sockaddr_in addr; =20 addr.sin_family =3D AF_INET; - addr.sin_port =3D htons(PORT); + addr.sin_port =3D p->bind_port; addr.sin_addr.s_addr =3D inet_addr("127.0.0.1"); ret =3D connect(s0, (struct sockaddr*) &addr, sizeof(addr)); assert(ret !=3D -1); } else { s0 =3D socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); assert(s0 !=3D -1); =20 struct sockaddr_un addr; memset(&addr, 0, sizeof(addr)); =20 addr.sun_family =3D AF_UNIX; memcpy(addr.sun_path, "\0sock", 6); ret =3D connect(s0, (struct sockaddr*) &addr, sizeof(addr)); --=20 Ammar Faizi