From patchwork Sat Jul 6 14:45:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13725862 X-Patchwork-Delegate: bpf@iogearbox.net Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC29513A41D; Sat, 6 Jul 2024 14:47:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720277277; cv=none; b=JxqoE/NvqL7Bpx9xestuDrvLNEA4hv1ge6v3wpqNhloqSjLA26ZE+BFTPYDt4PB4iK8/b9Z8t6IkHIpok7UVVvQB+ew9Aj3kMscZAJjg3f+8acsyscpg9GjjSH7XSlpfg3w5Sh16vvFGpxWtjMyg0IXlS9Lk/cxGSZXE+dS+Aec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720277277; c=relaxed/simple; bh=p/nFYb53W3oKJGhyYaKGXlD1rGfvyYSCXpNcmfni+hk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pox2x2ObE2uP1Tv9MZ4bOVGwgbO76MfzbuusrfeTbb0phDxfVoEGQoII+6cAWaWO6G+V/O4QFC8NRRpngzN7GI64zhsNgowZtOElBHAjpEhAaa3cWYQWUDkGiIReshUD+OKMEV5cRyC9zINFCbelv4n2PjVJHDeJx5om4/vDGes= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UUY642Bu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UUY642Bu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45B76C4AF0F; Sat, 6 Jul 2024 14:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720277277; bh=p/nFYb53W3oKJGhyYaKGXlD1rGfvyYSCXpNcmfni+hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UUY642Bu39wv09XN7NPXTd9Hf1HYMtyuE6h0E5oQZ5bbDYJH/FvLndGTONeWVwCbT S+chQxO77Q527c8BHYKiLHC/NKYxN9YhIdBFl3B6UcR5nVEWxhJGLt/fZPdUTRiUxj DxhQnmJOZ1B5zX1h2PPKs44bjC1ZMajcTGfalO7rtkH+3ThwxBVp2krVx1vdnE+zcq 1Cxz3TR6KywrLC4+LcCZYnxZfO6/DbAWoZm/7u24BoAab4zvfpNdPxW9IOUlzT+l6C zRGzUsghLuC/2HD8eVCghZzN0tQhy7VPljiNy2Ut3o+2OnAM8y/A1uqmTwicr62f1G baD0pupTHKo7Q== From: Geliang Tang To: Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan Cc: Geliang Tang , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v9 11/11] selftests/bpf: Drop make_socket in sk_lookup Date: Sat, 6 Jul 2024 22:45:56 +0800 Message-ID: <271f65310f9651d0059377e1c2a873edad2b1a81.1720276189.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Geliang Tang Use local helper make_client() in run_multi_prog_lookup() instead of using make_socket() + connect(). Then make_socket() and inetaddr_len() can be dropped now. Signed-off-by: Geliang Tang --- .../selftests/bpf/prog_tests/sk_lookup.c | 46 ++----------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c index f9b8415c16a6..dc84a3f90701 100644 --- a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c +++ b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c @@ -108,46 +108,6 @@ static int attach_reuseport(int sock_fd, struct bpf_program *reuseport_prog) return 0; } -static socklen_t inetaddr_len(const struct sockaddr_storage *addr) -{ - return (addr->ss_family == AF_INET ? sizeof(struct sockaddr_in) : - addr->ss_family == AF_INET6 ? sizeof(struct sockaddr_in6) : 0); -} - -static int make_socket(int sotype, const char *ip, int port, - struct sockaddr_storage *addr) -{ - struct timeval timeo = { .tv_sec = IO_TIMEOUT_SEC }; - int err, family, fd; - - family = is_ipv6(ip) ? AF_INET6 : AF_INET; - err = make_sockaddr(family, ip, port, addr, NULL); - if (CHECK(err, "make_address", "failed\n")) - return -1; - - fd = socket(addr->ss_family, sotype, 0); - if (CHECK(fd < 0, "socket", "failed\n")) { - log_err("failed to make socket"); - return -1; - } - - err = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &timeo, sizeof(timeo)); - if (CHECK(err, "setsockopt(SO_SNDTIMEO)", "failed\n")) { - log_err("failed to set SNDTIMEO"); - close(fd); - return -1; - } - - err = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo)); - if (CHECK(err, "setsockopt(SO_RCVTIMEO)", "failed\n")) { - log_err("failed to set RCVTIMEO"); - close(fd); - return -1; - } - - return fd; -} - static int setsockopts(int fd, void *opts) { struct cb_opts *co = (struct cb_opts *)opts; @@ -1227,7 +1187,6 @@ struct test_multi_prog { static void run_multi_prog_lookup(const struct test_multi_prog *t) { - struct sockaddr_storage dst = {}; int map_fd, server_fd, client_fd; struct bpf_link *link1, *link2; int prog_idx, done, err; @@ -1260,11 +1219,12 @@ static void run_multi_prog_lookup(const struct test_multi_prog *t) if (err) goto out_close_server; - client_fd = make_socket(SOCK_STREAM, EXT_IP4, EXT_PORT, &dst); + client_fd = make_client(SOCK_STREAM, EXT_IP4, EXT_PORT, + t->expect_errno); if (client_fd < 0) goto out_close_server; - err = connect(client_fd, (void *)&dst, inetaddr_len(&dst)); + err = t->expect_errno ? -1 : 0; if (CHECK(err && !t->expect_errno, "connect", "unexpected error %d\n", errno)) goto out_close_client;