From nobody Tue May 14 04:31:09 2024 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 BE7054D9FE; Tue, 26 Mar 2024 10:03:52 +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=1711447432; cv=none; b=TENEgo8p7f9rmOelVC1oxZqEBgGpAgFPsPT0atcKh53McXc8+zCjYXu8apWzclJszrHJHFxwztARf74HTZtyZ5mMFhkuuxgdViMtX2zl1tbuxt8KaNoS+1GEiemJvFPV2ldgu/YQ9CK63UMSaONztN6FVRJd6YXERc6B8uHSLF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711447432; c=relaxed/simple; bh=+fIE42jXnRsZLRuxQE/WMzSbKFFwXPegR9bLSmdyi7U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Hiwx2AcfF11jvJPv3vX0uWUOkoZFAUn4rhl3ccwlQdJVPFBUA/nASLrzkkMbwOJe5WMofd/yLu8x6a/bO0oYdBjxD3llYfgY1hYnyq7GJZxEgFPyVDmZ9DzHz8mQ8Pc3NQxTM28XTgNaM764Itd9BF46CoHYAg3IIKy6UbY+pIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X/VGSv81; 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="X/VGSv81" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52251C43394; Tue, 26 Mar 2024 10:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711447432; bh=+fIE42jXnRsZLRuxQE/WMzSbKFFwXPegR9bLSmdyi7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X/VGSv81NbNV5P5MOLrEh9SDyxuvBb38+DeUWKsm0muQSoPl7CWzPoamE/hItH2KA e4XIMlbVYWNg4WgALPcenBVpQ/7x2WMgkcc2QnHonIehGEUg1Ave/vbho+Ocrb8mKh SPiWkEZT5+O7Y67jkT45Hsxv8m8yGEYTiLduZEyYNqZEQieWAEl/IMbglBleDn0nO0 RikS+6w1FjOm3xybi2FfaD7kqYp2GR3Y86/9np+fsMztHDXfulyTC9vBk4Xuew4Inj a9S1QFOJw5MQHQD5XjcQHwYGJ4MH4wKYJ1/NiP5/4zGZqcs14J+8LfEjlbNPKrY1wk cGU24xiCt9fIA== 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, mptcp@lists.linux.dev Subject: [PATCH bpf-next v4 1/2] selftests/bpf: Use connect_fd_to_fd in bpf_tcp_ca Date: Tue, 26 Mar 2024 18:03:38 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang To simplify the code, use BPF selftests helper connect_fd_to_fd() in bpf_tcp_ca.c instead of open-coding it. This helper is defined in network_helpers.c, and exported in network_helpers.h, which is already included in bpf_tcp_ca.c. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools/te= sting/selftests/bpf/prog_tests/bpf_tcp_ca.c index 94cb22b01482..5aa3ccdc1351 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c @@ -78,11 +78,9 @@ static void *server(void *arg) =20 static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) { - struct sockaddr_in6 sa6 =3D {}; ssize_t nr_recv =3D 0, bytes =3D 0; int lfd =3D -1, fd =3D -1; pthread_t srv_thread; - socklen_t addrlen =3D sizeof(sa6); void *thread_ret; char batch[1500]; int err; @@ -103,10 +101,6 @@ static void do_test(const char *tcp_ca, const struct b= pf_map *sk_stg_map) settimeo(lfd, 0) || settimeo(fd, 0)) goto done; =20 - err =3D getsockname(lfd, (struct sockaddr *)&sa6, &addrlen); - if (!ASSERT_NEQ(err, -1, "getsockname")) - goto done; - if (sk_stg_map) { err =3D bpf_map_update_elem(bpf_map__fd(sk_stg_map), &fd, &expected_stg, BPF_NOEXIST); @@ -115,7 +109,7 @@ static void do_test(const char *tcp_ca, const struct bp= f_map *sk_stg_map) } =20 /* connect to server */ - err =3D connect(fd, (struct sockaddr *)&sa6, addrlen); + err =3D connect_fd_to_fd(fd, lfd, 0); if (!ASSERT_NEQ(err, -1, "connect")) goto done; =20 --=20 2.40.1 From nobody Tue May 14 04:31:09 2024 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 599DF548EC; Tue, 26 Mar 2024 10:03: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=1711447437; cv=none; b=RxlkfM05zaNo+x+Q40PkFi/SC7l/ORPnDS1L3DxNVneQPK4AzhRUK3H11Wfk4L5BSGNSqXiVNyootDpzmKwRS7VBE6RgyE6uj6RFCA42DddRY7CavlkYSv5ufdrf0mOdc0nKgmf6jKd0eNnqs1ejjxZQSIGEyzp29LB0Zmgb3qA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711447437; c=relaxed/simple; bh=iUIdoQJmd/JeS6FVWvYqhhiJJX4bqojbuzrdGV9yjoU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kiqCO+OV7Ojb66Npabz8NCeUd7hdOOPUBTRK8qF1JA26k+Edup1x2SJW9klHBZeXvlZwp7GOu6/hghP8qrCI7+fMs1TAq3wQFWSa8FtJ5TLpRqqH7rS7vJ5yqdoJwtyDIoWB0WTY/w84FqElM6+QI7jTkoUyIa1qgpzW2/5dRPc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gCk0hjc/; 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="gCk0hjc/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE142C433F1; Tue, 26 Mar 2024 10:03:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711447436; bh=iUIdoQJmd/JeS6FVWvYqhhiJJX4bqojbuzrdGV9yjoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gCk0hjc/AyHs/wuOx9T1Z+5cuWFAMAIaWMsoieBpSg1WJUB8uXkjf82uoUQE04mAY jcngSyo2TmmnbzEVQCRwRrDyNRg0F7cqb2FP2ueh8fALMg5JBIbZkrBXkjwsrZoRYN vtK2dprWk6/PNxYWMl4BI9t8J7uZYH71z5Tt2a+VTw0PH42EO4PKqyoAmxUBTkNHQa gVRJjczjO96ws0wouHymfNOnp43xuNENgIkaymbbN06ZNHVgnCwwPAtkD5XUKh9KqW UxMv3a91FugH1m8OXfOaqjJmZQNNdTg6O6ge5ta9A0culaU3yTRs0e04hzG9310K+g xJ5Fe1n8/Sgmw== 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, mptcp@lists.linux.dev Subject: [PATCH bpf-next v4 2/2] selftests/bpf: Drop settimeo in do_test Date: Tue, 26 Mar 2024 18:03:39 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang settimeo is invoked in start_server() and in connect_fd_to_fd() already, no need to invoke settimeo(lfd, 0) and settimeo(fd, 0) in do_test() anymore. This patch drops them. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools/te= sting/selftests/bpf/prog_tests/bpf_tcp_ca.c index 5aa3ccdc1351..3da3030c9365 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c @@ -97,8 +97,7 @@ static void do_test(const char *tcp_ca, const struct bpf_= map *sk_stg_map) return; } =20 - if (settcpca(lfd, tcp_ca) || settcpca(fd, tcp_ca) || - settimeo(lfd, 0) || settimeo(fd, 0)) + if (settcpca(lfd, tcp_ca) || settcpca(fd, tcp_ca)) goto done; =20 if (sk_stg_map) { --=20 2.40.1