From nobody Mon Apr 6 23:17:38 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 13361ECAAD3 for ; Fri, 2 Sep 2022 01:01:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235206AbiIBBBR (ORCPT ); Thu, 1 Sep 2022 21:01:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234832AbiIBBBB (ORCPT ); Thu, 1 Sep 2022 21:01:01 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3810F5D13B for ; Thu, 1 Sep 2022 18:00:43 -0700 (PDT) Received: from localhost.localdomain (unknown [182.2.38.99]) by gnuweeb.org (Postfix) with ESMTPSA id E482C80C10; Fri, 2 Sep 2022 01:00:39 +0000 (UTC) X-GW-Data: lPqxHiMPbJw1wb7CM9QUryAGzr0yq5atzVDdxTR0iA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1662080443; bh=bn92G2/WYBNLJSMRZSx4NfHoCNzbF2NxOW0dvPrdplU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tLZ4D4mqY+Eafut4H9fJrmMAPOrTLiLrbQyodlHejjAJJIkwJrn+j1g5rIj29ptsh 2kwR/Uq+rZVO774OKxu+750cffkB/OsvFVQX+y8nPqJNC//5EkfSmUfutUdsE+Lwfh Aln/xFc1jlP1SLj8cUCrSk2dOYKssSIOAxWMHxYKS8sOXVeQsH+FjorlLcIuP+t/Ed vrfjDwB8bRWTsnfq5bas0tjvzOYCczRPv07zzT//J1cNnyFHb0/CQof8oIukcbq5z6 2lCBZ7v89jAeumB10nap98ivspjCkDtvJqG5em86LFXt1tHVPHfWu5EAXgl/FXfX+F z/ytQnWtQnXVQ== 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 06/12] t/files-exit-hang-poll: Don't brute force the port number Date: Fri, 2 Sep 2022 07:59:40 +0700 Message-Id: <20220902005825.2484023-7-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 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 --- test/files-exit-hang-poll.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/test/files-exit-hang-poll.c b/test/files-exit-hang-poll.c index 0c609f1..04febc8 100644 --- a/test/files-exit-hang-poll.c +++ b/test/files-exit-hang-poll.c @@ -9,28 +9,26 @@ #include #include #include #include #include #include #include #include #include "liburing.h" #include "helpers.h" =20 #define BACKLOG 512 =20 -#define PORT 9100 - static struct io_uring ring; =20 static void add_poll(struct io_uring *ring, int fd) { struct io_uring_sqe *sqe; =20 sqe =3D io_uring_get_sqe(ring); io_uring_prep_poll_add(sqe, fd, POLLIN); sqe->flags |=3D IOSQE_IO_LINK; } =20 static void add_accept(struct io_uring *ring, int fd) { @@ -54,57 +52,45 @@ static int setup_io_uring(void) } =20 static void alarm_sig(int sig) { exit(0); } =20 int main(int argc, char *argv[]) { struct sockaddr_in serv_addr; struct io_uring_cqe *cqe; int ret, sock_listen_fd; const int val =3D 1; - int i; =20 if (argc > 1) return T_EXIT_SKIP; =20 sock_listen_fd =3D socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); if (sock_listen_fd < 0) { perror("socket"); return T_EXIT_FAIL; } =20 setsockopt(sock_listen_fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); =20 memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family =3D AF_INET; serv_addr.sin_addr.s_addr =3D INADDR_ANY; =20 - for (i =3D 0; i < 100; i++) { - serv_addr.sin_port =3D htons(PORT + i); - - ret =3D bind(sock_listen_fd, (struct sockaddr *)&serv_addr, sizeof(serv_= addr)); - if (!ret) - break; - if (errno !=3D EADDRINUSE) { - fprintf(stderr, "bind: %s\n", strerror(errno)); - return T_EXIT_FAIL; - } - if (i =3D=3D 99) { - printf("Gave up on finding a port, skipping\n"); - goto skip; - } + if (t_bind_ephemeral_port(sock_listen_fd, &serv_addr)) { + perror("bind"); + return T_EXIT_FAIL; } =20 if (listen(sock_listen_fd, BACKLOG) < 0) { perror("Error listening on socket\n"); return T_EXIT_FAIL; } =20 if (setup_io_uring()) return T_EXIT_FAIL; =20 add_poll(&ring, sock_listen_fd); add_accept(&ring, sock_listen_fd); =20 @@ -115,17 +101,14 @@ int main(int argc, char *argv[]) } =20 signal(SIGALRM, alarm_sig); alarm(1); =20 ret =3D io_uring_wait_cqe(&ring, &cqe); if (ret) { fprintf(stderr, "wait_cqe=3D%d\n", ret); return T_EXIT_FAIL; } =20 io_uring_queue_exit(&ring); return T_EXIT_PASS; -skip: - io_uring_queue_exit(&ring); - return T_EXIT_SKIP; } --=20 Ammar Faizi