BPF List
 help / color / mirror / Atom feed
From: Eduard Zingerman <eddyz87@gmail.com>
To: Geliang Tang <geliang@kernel.org>,
	Andrii Nakryiko <andrii@kernel.org>,
	 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
Subject: Re: [PATCH bpf-next 6/6] selftests/bpf: Drop make_socket in sk_lookup
Date: Fri, 21 Jun 2024 13:45:05 -0700	[thread overview]
Message-ID: <8a1d215239e9e39ec075778e4eb58d884448619f.camel@gmail.com> (raw)
In-Reply-To: <489e1543f8c4ac8feb9e90d1384af66ecb59ba82.1718965270.git.tanggeliang@kylinos.cn>

On Fri, 2024-06-21 at 18:35 +0800, Geliang Tang wrote:

[...]

> @@ -224,24 +188,22 @@ static int make_server(int sotype, const char *ip, int port,
>  
>  static int make_client(int sotype, const char *ip, int port)
>  {
> +	int family = is_ipv6(ip) ? AF_INET6 : AF_INET;
>  	struct sockaddr_storage addr = {0};
>  	socklen_t len;
>  	int err, fd;
>  
> -	fd = make_socket(sotype, ip, port, &addr, &len);
> -	if (fd < 0)
> +	err = make_sockaddr(family, ip, port, &addr, &len);
> +	if (err)
>  		return -1;
>  
> -	err = connect(fd, (void *)&addr, len);
> -	if (CHECK(err, "make_client", "connect")) {
> +	fd = connect_to_addr(sotype, &addr, len, NULL);

Nit: same nit about timeout, need to pass options here.

> +	if (CHECK(fd < 0, "connect_to_addr", "connect")) {
>  		log_err("failed to connect client socket");
> -		goto fail;
> +		return -1;
>  	}
>  
>  	return fd;
> -fail:
> -	close(fd);
> -	return -1;
>  }
>  
>  static __u64 socket_cookie(int fd)



      reply	other threads:[~2024-06-21 20:45 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-21 10:35 [PATCH bpf-next 0/6] use network helpers, part 8 Geliang Tang
2024-06-21 10:35 ` [PATCH bpf-next 1/6] selftests/bpf: Use start_server in sockmap_ktls Geliang Tang
2024-06-21 20:44   ` Eduard Zingerman
2024-06-21 10:35 ` [PATCH bpf-next 2/6] selftests/bpf: Use connect_to_fd " Geliang Tang
2024-06-21 20:44   ` Eduard Zingerman
2024-06-21 10:35 ` [PATCH bpf-next 3/6] selftests/bpf: Use start_server_str in sk_lookup Geliang Tang
2024-06-21 20:44   ` Eduard Zingerman
2024-06-21 10:35 ` [PATCH bpf-next 4/6] selftests/bpf: Drop inetaddr_len " Geliang Tang
2024-06-21 10:35 ` [PATCH bpf-next 5/6] selftests/bpf: Use connect_to_fd " Geliang Tang
2024-06-21 20:44   ` Eduard Zingerman
2024-06-21 10:35 ` [PATCH bpf-next 6/6] selftests/bpf: Drop make_socket " Geliang Tang
2024-06-21 20:45   ` Eduard Zingerman [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=8a1d215239e9e39ec075778e4eb58d884448619f.camel@gmail.com \
    --to=eddyz87@gmail.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=geliang@kernel.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox