From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-185.mta1.migadu.com (out-185.mta1.migadu.com [95.215.58.185]) (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 D04FE43AA9 for ; Fri, 12 Jul 2024 17:36:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.185 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720805811; cv=none; b=Nx9xCVl+hL3GdlcKjBDQJbwuX7n1jtnp7cMG0EMwS1YlqCYItenTM+bvaGgI5YvX6w4HtUcnx8Jx2pnayInFj8FY99L9lug/lJR/bMxIN7nScOLfQ8GH0Mytqdx67mtbdlqLbL3y635O382CPWuPgH2o52dzQWA3dr9OUSAM5Z8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720805811; c=relaxed/simple; bh=VePdywuy5lsuUuTxhhxWcFfpQ3SG0ffx3WCatwsteW0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=hH4ddozYvbveJKrKzG2hB4POxV46qbGHvF+mnr3d8J893E9KFSmeqUoN/DjiADMCy8SoLOLK8u8JuGMSn8cZUO5JgPyBztJy5i8/AXpUIR75paXIKw3qdm50wKcFKICkLxepuLYrc2IJsw1g131jrwqDH8DiQpfHhVo//7onsbQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=OGqgTV08; arc=none smtp.client-ip=95.215.58.185 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="OGqgTV08" X-Envelope-To: geliang@kernel.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1720805807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ojao2ZbHzJY9vHnNyvekVQMfatU7qAIpTciZ1GoQdN8=; b=OGqgTV08FRo5+bRKUH1sJ4g98+XEwckaP9YFmjrspnh/UVYz7UFn0xChfZ3v0Sdh0uKg+B jQUF74lNIg/eqw8F+q3SHdIQ9HtPQHMpBcxcgCGIc+T5LiRhNqNUIDltKc4fk3UAd6AIVD ksqKbNVWrvPSK4ELdUzUVFVY0t01qrU= X-Envelope-To: andrii@kernel.org X-Envelope-To: eddyz87@gmail.com X-Envelope-To: mykolal@fb.com X-Envelope-To: ast@kernel.org X-Envelope-To: daniel@iogearbox.net X-Envelope-To: song@kernel.org X-Envelope-To: yonghong.song@linux.dev X-Envelope-To: john.fastabend@gmail.com X-Envelope-To: kpsingh@kernel.org X-Envelope-To: haoluo@google.com X-Envelope-To: jolsa@kernel.org X-Envelope-To: shuah@kernel.org X-Envelope-To: tanggeliang@kylinos.cn X-Envelope-To: bpf@vger.kernel.org X-Envelope-To: linux-kselftest@vger.kernel.org X-Envelope-To: martin.lau@kernel.org Message-ID: <2cf71a18-b2f2-477b-85fb-25a907b8dd73@linux.dev> Date: Fri, 12 Jul 2024 10:36:36 -0700 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH bpf-next v2 2/5] selftests/bpf: Drop must_fail from network_helper_opts To: Geliang Tang Cc: Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Song Liu , Yonghong Song , John Fastabend , KP Singh , Hao Luo , Jiri Olsa , Shuah Khan , Geliang Tang , bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Martin KaFai Lau References: <5730eabdd6e90d1534d4f5df47e55a76f04197ca.1720767414.git.tanggeliang@kylinos.cn> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Martin KaFai Lau In-Reply-To: <5730eabdd6e90d1534d4f5df47e55a76f04197ca.1720767414.git.tanggeliang@kylinos.cn> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT On 7/12/24 12:04 AM, Geliang Tang wrote: > From: Geliang Tang > > The struct member "must_fail" of network_helper_opts() is only used in > cgroup_v1v2 tests, it makes sense to drop it from network_helper_opts. > > Return value (fd) of connect_to_fd_opts() and the expect errno (EPERM) > can be checked in cgroup_v1v2.c directly, no need to check them in > connect_fd_to_addr() in network_helpers.c. > > This also makes connect_fd_to_addr() function useless. It can be replaced > by connect(). > > Suggested-by: Martin KaFai Lau > Signed-off-by: Geliang Tang > --- > tools/testing/selftests/bpf/network_helpers.c | 31 ++----------------- > tools/testing/selftests/bpf/network_helpers.h | 1 - > .../selftests/bpf/prog_tests/cgroup_v1v2.c | 10 ++---- > 3 files changed, 5 insertions(+), 37 deletions(-) > > diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c > index 15e0e0bb7553..48c27c810db7 100644 > --- a/tools/testing/selftests/bpf/network_helpers.c > +++ b/tools/testing/selftests/bpf/network_helpers.c > @@ -277,33 +277,6 @@ int client_socket(int family, int type, > return -1; > } > > -static int connect_fd_to_addr(int fd, > - const struct sockaddr_storage *addr, > - socklen_t addrlen, const bool must_fail) > -{ > - int ret; > - > - errno = 0; > - ret = connect(fd, (const struct sockaddr *)addr, addrlen); > - if (must_fail) { > - if (!ret) { > - log_err("Unexpected success to connect to server"); > - return -1; > - } > - if (errno != EPERM) { > - log_err("Unexpected error from connect to server"); > - return -1; > - } > - } else { > - if (ret) { > - log_err("Failed to connect to server"); > - return -1; > - } > - } > - > - return 0; > -} > - > int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addrlen, > const struct network_helper_opts *opts) > { > @@ -318,7 +291,7 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t add > return -1; > } > > - if (connect_fd_to_addr(fd, addr, addrlen, opts->must_fail)) > + if (connect(fd, (const struct sockaddr *)addr, addrlen)) > goto error_close; > > return fd; > @@ -383,7 +356,7 @@ int connect_fd_to_fd(int client_fd, int server_fd, int timeout_ms) > return -1; > } > > - if (connect_fd_to_addr(client_fd, &addr, len, false)) > + if (connect(client_fd, (const struct sockaddr *)&addr, len)) > return -1; > > return 0; > diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h > index 5b548c0c60de..f39eeb5a4594 100644 > --- a/tools/testing/selftests/bpf/network_helpers.h > +++ b/tools/testing/selftests/bpf/network_helpers.h > @@ -23,7 +23,6 @@ typedef __u16 __sum16; > > struct network_helper_opts { > int timeout_ms; > - bool must_fail; > int proto; > /* +ve: Passed to listen() as-is. > * 0: Default when the test does not set > diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c b/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c > index addf720428f7..04e82a486102 100644 > --- a/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c > +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c > @@ -9,9 +9,6 @@ > > static int run_test(int cgroup_fd, int server_fd, bool classid) > { > - struct network_helper_opts opts = { > - .must_fail = true, > - }; > struct connect4_dropper *skel; > int fd, err = 0; > > @@ -32,11 +29,10 @@ static int run_test(int cgroup_fd, int server_fd, bool classid) > goto out; > } > > - fd = connect_to_fd_opts(server_fd, &opts); > - if (fd < 0) > - err = -1; > - else > + fd = connect_to_fd_opts(server_fd, NULL); > + if (fd >= 0) > close(fd); > + err = errno != EPERM ? -1 : 0; Still not right. Can errno be used when fd >= 0? That makes the fd >= 0 case flaky. fd >= 0 should always be treated as error here (i.e. err = -1). just always set err = -1 in the fd >= 0 case. No need to be smart here to save a few lines. Please take time to review the patches before posting to the list. pw-bot: cr