All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geliang Tang <geliang@kernel.org>
To: Andrii Nakryiko <andrii@kernel.org>,
	Eduard Zingerman <eddyz87@gmail.com>,
	Mykola Lysenko <mykolal@fb.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Martin KaFai Lau <martin.lau@linux.dev>,
	Song Liu <song@kernel.org>,
	Yonghong Song <yonghong.song@linux.dev>,
	John Fastabend <john.fastabend@gmail.com>,
	KP Singh <kpsingh@kernel.org>,
	Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
	Jiri Olsa <jolsa@kernel.org>, Shuah Khan <shuah@kernel.org>
Cc: Geliang Tang <tanggeliang@kylinos.cn>,
	bpf@vger.kernel.org, linux-kselftest@vger.kernel.org,
	Geliang Tang <geliang@kernel.org>
Subject: [PATCH bpf-next v4 14/14] selftests/bpf: Use make_sockaddr in ip_check_defrag
Date: Tue, 16 Apr 2024 18:14:00 +0800	[thread overview]
Message-ID: <cf2b340582b17a4337ef0910bb14e5adbdc48fa3.1713262052.git.tanggeliang@kylinos.cn> (raw)
In-Reply-To: <cover.1713262052.git.tanggeliang@kylinos.cn>

From: Geliang Tang <tanggeliang@kylinos.cn>

This patch uses public helper make_sockaddr() exported in network_helpers.h
instead of open-coding in test_bpf_ip_check_defrag_ok() in
prog_tests/ip_check_defrag.c. This can avoid duplicate code.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 .../selftests/bpf/prog_tests/ip_check_defrag.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c b/tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c
index 284764e7179f..aafadb0ca666 100644
--- a/tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c
+++ b/tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c
@@ -220,21 +220,9 @@ void test_bpf_ip_check_defrag_ok(bool ipv6)
 	nstoken = open_netns(NS0);
 	if (!ASSERT_OK_PTR(nstoken, "setns ns0"))
 		goto out;
-	if (ipv6) {
-		struct sockaddr_in6 *c = (struct sockaddr_in6 *)&caddr;
-
-		c->sin6_family = AF_INET6;
-		inet_pton(AF_INET6, VETH0_ADDR6, &c->sin6_addr);
-		c->sin6_port = htons(CLIENT_PORT);
-		err = bind(client_rx_fd, (struct sockaddr *)c, sizeof(*c));
-	} else {
-		struct sockaddr_in *c = (struct sockaddr_in *)&caddr;
-
-		c->sin_family = AF_INET;
-		inet_pton(AF_INET, VETH0_ADDR, &c->sin_addr);
-		c->sin_port = htons(CLIENT_PORT);
-		err = bind(client_rx_fd, (struct sockaddr *)c, sizeof(*c));
-	}
+	make_sockaddr(ipv6 ? AF_INET6 : AF_INET, ipv6 ? VETH0_ADDR6 : VETH0_ADDR,
+		      CLIENT_PORT, &caddr, &caddr_len);
+	err = bind(client_rx_fd, (struct sockaddr *)&caddr, sizeof(caddr));
 	close_netns(nstoken);
 	if (!ASSERT_OK(err, "bind"))
 		goto out;
-- 
2.40.1


      parent reply	other threads:[~2024-04-16 10:15 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-16 10:13 [PATCH bpf-next v4 00/14] use network helpers, part 1 Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 01/14] selftests/bpf: Update arguments of connect_to_addr Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 02/14] selftests/bpf: Add start_server_addr* helpers Geliang Tang
2024-04-18  0:08   ` Martin KaFai Lau
2024-04-16 10:13 ` [PATCH bpf-next v4 03/14] selftests/bpf: Use start_server_addr in cls_redirect Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 04/14] selftests/bpf: Use connect_to_addr " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 05/14] selftests/bpf: Use start_server_addr in sk_assign Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 06/14] selftests/bpf: Use connect_to_addr " Geliang Tang
2024-04-18  0:15   ` Martin KaFai Lau
2024-04-16 10:13 ` [PATCH bpf-next v4 07/14] selftests/bpf: Use get_socket_local_port " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 08/14] selftests/bpf: Use make_sockaddr " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 09/14] selftests/bpf: Use log_err in network_helpers Geliang Tang
2024-04-18  0:19   ` Martin KaFai Lau
2024-04-16 10:13 ` [PATCH bpf-next v4 10/14] selftests/bpf: Use start_server_addr in test_sock_addr Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 11/14] selftests/bpf: Use connect_to_addr " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 12/14] selftests/bpf: Use make_sockaddr " Geliang Tang
2024-04-16 10:13 ` [PATCH bpf-next v4 13/14] selftests/bpf: Use make_sockaddr in test_sock Geliang Tang
2024-04-16 10:14 ` Geliang Tang [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cf2b340582b17a4337ef0910bb14e5adbdc48fa3.1713262052.git.tanggeliang@kylinos.cn \
    --to=geliang@kernel.org \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=eddyz87@gmail.com \
    --cc=haoluo@google.com \
    --cc=john.fastabend@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=kpsingh@kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=martin.lau@linux.dev \
    --cc=mykolal@fb.com \
    --cc=sdf@google.com \
    --cc=shuah@kernel.org \
    --cc=song@kernel.org \
    --cc=tanggeliang@kylinos.cn \
    --cc=yonghong.song@linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.