From patchwork Fri Sep 2 01:17:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ammar Faizi X-Patchwork-Id: 12963495 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 41B4BECAAD3 for ; Fri, 2 Sep 2022 01:18:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234299AbiIBBS0 (ORCPT ); Thu, 1 Sep 2022 21:18:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234572AbiIBBSZ (ORCPT ); Thu, 1 Sep 2022 21:18:25 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C56CA5C7A for ; Thu, 1 Sep 2022 18:18:23 -0700 (PDT) Received: from localhost.localdomain (unknown [182.2.38.99]) by gnuweeb.org (Postfix) with ESMTPSA id 5381380927; Fri, 2 Sep 2022 01:18:19 +0000 (UTC) X-GW-Data: lPqxHiMPbJw1wb7CM9QUryAGzr0yq5atzVDdxTR0iA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1662081502; bh=4ZRPWkdArbg7F0Dd1BU/wZj++4oPm5+IG+qHvo4RewM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=obISpPmhbNgizCNr2Op0L6+tCuZRhpI3IBGhdWFuEyIHrn6/jjJoB60Gl7v7vpsIM IjPuXx1ets7zK5zFGMfMgMUiqXOEzRXhicYTawlaU6tmxoFDXsnkDG6ztfW/jOhpkE dJlVz3vK3GeONtmh9f6yMF2LuOJafQp0P3L2OUoODVy/gusJKIn03dh5DAxjERYw8f k1i0DY2IyOGwzs1kBLeWlLQq/b3JgSE1hSirFx8AtpgXY08hgz7cgO2OreexA48den ypa/aZRFrOLkmG4Ts8YTfOYERNE2tnq8+U45GnCYsedPZw1MCyyd+ByxboAJo6ljZA clecM+d8UvQWA== 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 06/12] t/files-exit-hang-poll: Don't brute force the port number Date: Fri, 2 Sep 2022 08:17:46 +0700 Message-Id: <20220902011548.2506938-7-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/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 @@ -10,26 +10,24 @@ #include #include #include #include #include #include #include #include "liburing.h" #include "helpers.h" #define BACKLOG 512 -#define PORT 9100 - static struct io_uring ring; static void add_poll(struct io_uring *ring, int fd) { struct io_uring_sqe *sqe; sqe = io_uring_get_sqe(ring); io_uring_prep_poll_add(sqe, fd, POLLIN); sqe->flags |= IOSQE_IO_LINK; } static void add_accept(struct io_uring *ring, int fd) @@ -55,55 +53,43 @@ static int setup_io_uring(void) static void alarm_sig(int sig) { exit(0); } int main(int argc, char *argv[]) { struct sockaddr_in serv_addr; struct io_uring_cqe *cqe; int ret, sock_listen_fd; const int val = 1; - int i; if (argc > 1) return T_EXIT_SKIP; sock_listen_fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); if (sock_listen_fd < 0) { perror("socket"); return T_EXIT_FAIL; } setsockopt(sock_listen_fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; serv_addr.sin_addr.s_addr = INADDR_ANY; - for (i = 0; i < 100; i++) { - serv_addr.sin_port = htons(PORT + i); - - ret = bind(sock_listen_fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)); - if (!ret) - break; - if (errno != EADDRINUSE) { - fprintf(stderr, "bind: %s\n", strerror(errno)); - return T_EXIT_FAIL; - } - if (i == 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; } if (listen(sock_listen_fd, BACKLOG) < 0) { perror("Error listening on socket\n"); return T_EXIT_FAIL; } if (setup_io_uring()) return T_EXIT_FAIL; add_poll(&ring, sock_listen_fd); add_accept(&ring, sock_listen_fd); @@ -116,16 +102,13 @@ int main(int argc, char *argv[]) signal(SIGALRM, alarm_sig); alarm(1); ret = io_uring_wait_cqe(&ring, &cqe); if (ret) { fprintf(stderr, "wait_cqe=%d\n", ret); return T_EXIT_FAIL; } io_uring_queue_exit(&ring); return T_EXIT_PASS; -skip: - io_uring_queue_exit(&ring); - return T_EXIT_SKIP; }