From nobody Mon Apr 6 23:08:42 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 4C5ACECAAD3 for ; Fri, 2 Sep 2022 01:01:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235229AbiIBBBY (ORCPT ); Thu, 1 Sep 2022 21:01:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235125AbiIBBBE (ORCPT ); Thu, 1 Sep 2022 21:01:04 -0400 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31F7461D4D for ; Thu, 1 Sep 2022 18:00:48 -0700 (PDT) Received: from localhost.localdomain (unknown [182.2.38.99]) by gnuweeb.org (Postfix) with ESMTPSA id 5322680C11; Fri, 2 Sep 2022 01:00:44 +0000 (UTC) X-GW-Data: lPqxHiMPbJw1wb7CM9QUryAGzr0yq5atzVDdxTR0iA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1662080448; bh=wR9q1fHEmL5ldOvaDTrkydTc4/6tKsgAaLiL2mDHhBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IbgKz3i/nO4VsDAtrZZG8l0JbtymMLAEOoHcxuZ8GZ71hCtv0E7GZg2ewnm+XIKvM dpT4uyxH2uXi7g0VkRabpTECHb1ncCSB5jtWwUCT2gOoVC/unpxwOkUW4x7Y57Z8Y4 NT9ZBhzmRN2joZJhcAYM7z0TJkRZU9PwKtu/3cBc9ye4du+DPt5JWtTHbwBGajIGbk yS7uylGOkzf2VFLlXbZ50qE1oXoMJvg0apBB9I0jKQHNfqF2HumqZST8eTXVVWSLma +ISlhCFrsPO/hBZKOeIeBbbewDI6IoVRuRPCy0yHpSo56Ie8MREfUYl2tDTxaK+Jz9 tCgkJnCuuCoMw== 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 07/12] t/socket: Don't use a static port number Date: Fri, 2 Sep 2022 07:59:41 +0700 Message-Id: <20220902005825.2484023-8-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/socket.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/socket.c b/test/socket.c index 6a3ea09..94c8e9f 100644 --- a/test/socket.c +++ b/test/socket.c @@ -1,65 +1,65 @@ /* SPDX-License-Identifier: MIT */ /* * Simple test case using the socket op */ #include #include #include #include #include #include #include #include #include +#include =20 #include "liburing.h" #include "helpers.h" =20 static char str[] =3D "This is a test of send and recv over io_uring!"; =20 #define MAX_MSG 128 =20 -#define PORT 10202 #define HOST "127.0.0.1" =20 static int no_socket; +static __be32 g_port; =20 static int recv_prep(struct io_uring *ring, struct iovec *iov, int *sock, int registerfiles) { struct sockaddr_in saddr; struct io_uring_sqe *sqe; int sockfd, ret, val, use_fd; =20 memset(&saddr, 0, sizeof(saddr)); saddr.sin_family =3D AF_INET; saddr.sin_addr.s_addr =3D htonl(INADDR_ANY); - saddr.sin_port =3D htons(PORT); =20 sockfd =3D socket(AF_INET, SOCK_DGRAM, 0); if (sockfd < 0) { perror("socket"); return 1; } =20 val =3D 1; setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)); =20 - ret =3D bind(sockfd, (struct sockaddr *)&saddr, sizeof(saddr)); - if (ret < 0) { + if (t_bind_ephemeral_port(sockfd, &saddr)) { perror("bind"); goto err; } + g_port =3D saddr.sin_port; =20 if (registerfiles) { ret =3D io_uring_register_files(ring, &sockfd, 1); if (ret) { fprintf(stderr, "file reg failed\n"); goto err; } use_fd =3D 0; } else { use_fd =3D sockfd; } =20 sqe =3D io_uring_get_sqe(ring); @@ -234,29 +234,30 @@ static int do_send(int socket_direct, int alloc) if (ret) { fprintf(stderr, "queue init failed: %d\n", ret); return 1; } =20 if (socket_direct) { ret =3D io_uring_register_files(&ring, &fd, 1); if (ret) { fprintf(stderr, "file register %d\n", ret); return 1; } } =20 + assert(g_port !=3D 0); memset(&saddr, 0, sizeof(saddr)); saddr.sin_family =3D AF_INET; - saddr.sin_port =3D htons(PORT); + saddr.sin_port =3D g_port; inet_pton(AF_INET, HOST, &saddr.sin_addr); =20 sqe =3D io_uring_get_sqe(&ring); if (socket_direct) { unsigned file_index =3D 0; if (alloc) file_index =3D IORING_FILE_INDEX_ALLOC - 1; io_uring_prep_socket_direct(sqe, AF_INET, SOCK_DGRAM, 0, file_index, 0); } else { io_uring_prep_socket(sqe, AF_INET, SOCK_DGRAM, 0, 0); } ret =3D io_uring_submit(&ring); --=20 Ammar Faizi