From patchwork Sat Jun 22 01:23:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13708162 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 115F64404; Sat, 22 Jun 2024 01:24:10 +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=1719019450; cv=none; b=qQR6eBuHrw6rakjYCq7lKFD+E+DxFj882vPsMKEsj2swkvG6IS0qajIxJOeBKLnnBwEb/z43rAd5Jqj8tb20uD/ytQFkqOFAnVADXX5ZQsQRXNlootzuIsCXeAMJTmxU8KiNMgudDL8+uh2g14w85A8okIxbsMt8ogPhky4Rdbk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719019450; c=relaxed/simple; bh=rZ0OwJbHuOAuxHZEiv3dpoarwqBZUxrIq68bMu+v91Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tNzo81ZRJJtYrgVa4eXes+oQra+Y/dn3hGAXWTU03WfMSqqYZPoBSTwbf5f7fMdS7Dny3slELRIPit4m7t+mewJckkIRPncfbHNJyNMXtk2zxz28Mdita6XoEbCvHCWpcc6hiJu91cisjwtMzq48qN2NDK6S6cz88N9bT5NikyY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a1PVbRhg; 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="a1PVbRhg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13F30C4AF07; Sat, 22 Jun 2024 01:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719019449; bh=rZ0OwJbHuOAuxHZEiv3dpoarwqBZUxrIq68bMu+v91Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a1PVbRhgLRrwtLRXr96acqK/3zoR1SsjSBLeWAm3r+fGEIPscTJoCOiARMA722o86 kr/glWF5LSGctMGS8481DXAt84WGcEMlPF1g+412/PoWxbsZcum1NDqL4Z6irsvwLJ opUvvn3L+LOSQWgRTbbSPicxWEmAe3tCN9w09quFbQrximQ+2VJzvIzXTljcy+U5Zr W12Bwa2T6tgYR4t3ew+Hsz4YEZMFmvGkaAOzir52J3KNLLkxhYqbpWEQUHP2epnad+ 7V7OdN2UuWJkjefUxwNJJE5xv8kGX6unm7NPuiV0LyEOcjIERr03+LSqUXBypbIl55 LgAUfTQ7E4kPg== 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 v2 2/7] selftests/bpf: Use connect_to_fd in sockmap_ktls Date: Sat, 22 Jun 2024 09:23:42 +0800 Message-ID: <1f6a05f89fe56725f42a4e4fba517b61067f2036.1719019125.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Geliang Tang Use public network helper connect_to_fd() instead of open-coding it in prog_tests/sockmap_ktls.c. This can avoid duplicate code. Acked-by: Eduard Zingerman Signed-off-by: Geliang Tang --- .../selftests/bpf/prog_tests/sockmap_ktls.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c index 9cc881b38669..68867028c432 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c @@ -21,26 +21,16 @@ static int disconnect(int fd) /* Disconnect (unhash) a kTLS socket after removing it from sockmap. */ static void test_sockmap_ktls_disconnect_after_delete(int family, int map) { - struct sockaddr_storage addr = {0}; - socklen_t len = sizeof(addr); int err, cli, srv, zero = 0; srv = start_server(family, SOCK_STREAM, NULL, 0, 0); if (srv == -1) return; - err = getsockname(srv, (struct sockaddr *)&addr, &len); - if (!ASSERT_OK(err, "getsockopt")) - goto close_srv; - - cli = socket(family, SOCK_STREAM, 0); - if (!ASSERT_GE(cli, 0, "socket")) + cli = connect_to_fd(srv, 0); + if (!ASSERT_GE(cli, 0, "connect_to_fd")) goto close_srv; - err = connect(cli, (struct sockaddr *)&addr, len); - if (!ASSERT_OK(err, "connect")) - goto close_cli; - err = bpf_map_update_elem(map, &zero, &cli, 0); if (!ASSERT_OK(err, "bpf_map_update_elem")) goto close_cli;