From patchwork Sat Jul 6 14:45:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13725846 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 F1A33811E0; Sat, 6 Jul 2024 14:47:28 +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=1720277249; cv=none; b=tWuMnyVMdHamax4k0kd4RiiXWKuI/HH0B5jttA7T2Zn2szodCoXsFPo/0OhjwIbdrZLczWyd9sqQOJHqCKWpdKxcWcakrDpM+ZajjbWegoomgLwTt0O1ntbHovIr1r1Ll2Z8u1ORd1fTulLMvjTSwyRSOrOky1qarC573U1ZT/Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720277249; c=relaxed/simple; bh=p/sQSZ6Ry7HCVEED0GCWFAhT5N2x1Y0pWGbUjY6YoeY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mmNhEkIWEdctOx3GSS1gXEbFdVTY5hF06I/Vpi1FzcqyOc+UuutRWrNWXgpdjA7Ah0dtZhhGtFzuxf/ydlfAtEkTSjzihHaGpRS8JReMxhYd5riM1i1OHDWFtYV10Y6LcccfzyWRzkMghgOJv6ie5g6qutGux1gz8rhbbo22qFs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BmoQHncS; 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="BmoQHncS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E193BC4AF0E; Sat, 6 Jul 2024 14:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720277248; bh=p/sQSZ6Ry7HCVEED0GCWFAhT5N2x1Y0pWGbUjY6YoeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BmoQHncS3G6eOOs6kMq9Qt3P9feoahzE27ebgcvyAEjzWctestQm1O8XdNbi5KW5M rBZxTn79+GluBXZZ//W1vcea7P8MPYJVfuWlgGRorZDbXFl0rlH0RMQvvInH7dd+SZ ZbljCkd0urBeUdfO7uZ+wSjM9D0CucMpGbY6hidsd3P6F/P3imN623lZK6JSrdzClL eTri2gAQJbagLhh/nTedkxIdhrlmF1QTx1drDzhhBusZ6gIEWDbyLcJptyWfNFdK+Y GVmBOTqJnTtKwaxys3r3TmiHnamDqMY4Jy/Q1Zuu2mOhJTvC/MOOoByn9HnkBVxvme FdY4zC2VSabmQ== 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 v9 07/11] selftests/bpf: Set expect_errno for cgroup_skb_sk_lookup Date: Sat, 6 Jul 2024 22:45:52 +0800 Message-ID: <739486ce0d05a999c317ad6b21d3ef02cdca2a5f.1720276189.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 EINPROGRESS is skipped in run_lookup_test() in cgroup_skb_sk_lookup tests, but it is still showed in the log: ./test_progs -t cgroup_skb_sk_lookup -v run_cgroup_bpf_test:PASS:skel_open_load 0 nsec run_cgroup_bpf_test:PASS:cgroup_join 0 nsec run_cgroup_bpf_test:PASS:cgroup_attach 0 nsec run_lookup_test:PASS:start_server 0 nsec run_lookup_test:PASS:getsockname 0 nsec (network_helpers.c:300: errno: Operation now in progress) Failed to \ connect to server run_lookup_test:PASS:connect_fd_to_fd 0 nsec run_lookup_test:PASS:connect_to_fd 0 nsec run_lookup_test:PASS:accept 0 nsec #51 cgroup_skb_sk_lookup:OK To fix this, set EINPROGRESS as the expect_errno of network_helper_opts and pass it to connect_fd_to_fd(). Skip this expect_errno when must_fail is false too in connect_fd_to_addr(). Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/network_helpers.c | 2 +- tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c index 062170d6be1c..1403487c5921 100644 --- a/tools/testing/selftests/bpf/network_helpers.c +++ b/tools/testing/selftests/bpf/network_helpers.c @@ -296,7 +296,7 @@ static int connect_fd_to_addr(int fd, return -1; } } else { - if (ret) { + if (ret && errno != expect_errno) { log_err("Failed to connect to server"); return -1; } diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c b/tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c index bcf142779cc6..0ef2e9a6f47c 100644 --- a/tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c @@ -10,6 +10,7 @@ static void run_lookup_test(__u16 *g_serv_port, int out_sk) { struct network_helper_opts opts = { .timeout_ms = 1000, + .expect_errno = EINPROGRESS, }; int serv_sk = -1, in_sk = -1, serv_in_sk = -1, err; struct sockaddr_in6 addr = {}; @@ -28,7 +29,7 @@ static void run_lookup_test(__u16 *g_serv_port, int out_sk) /* Client outside of test cgroup should fail to connect by timeout. */ err = connect_fd_to_fd(out_sk, serv_sk, &opts); - if (CHECK(!err || errno != EINPROGRESS, "connect_fd_to_fd", + if (CHECK(err || errno != EINPROGRESS, "connect_fd_to_fd", "unexpected result err %d errno %d\n", err, errno)) goto cleanup;