34ad6ec972
The opts.{type, noconnect} is at least a bit non intuitive or unnecessary.
The only use case now is in test_bpf_ip_check_defrag_ok which ends up
bypassing most (or at least some) of the connect_to_fd_opts() logic. It's
much better that test should have its own connect_to_fd_opts() instead.
This patch adds a new "type" parameter for connect_to_fd_opts(), then
opts->type and getsockopt(SO_TYPE) can be replaced by "type" parameter in
it.
In connect_to_fd(), use getsockopt(SO_TYPE) to get "type" value and pass
it to connect_to_fd_opts().
In bpf_tcp_ca.c and cgroup_v1v2.c, "SOCK_STREAM" types are passed to
connect_to_fd_opts(), and in ip_check_defrag.c, different types "SOCK_RAW"
and "SOCK_DGRAM" are passed to it.
With these changes, the strcut member "type" of network_helper_opts can be
dropped now.
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/cfd20b5ad4085c1d1af5e79df3b09013a407199f.1718932493.git.tanggeliang@kylinos.cn
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
79 lines
1.9 KiB
C
79 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include <test_progs.h>
|
|
|
|
#include "connect4_dropper.skel.h"
|
|
|
|
#include "cgroup_helpers.h"
|
|
#include "network_helpers.h"
|
|
|
|
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;
|
|
|
|
skel = connect4_dropper__open_and_load();
|
|
if (!ASSERT_OK_PTR(skel, "skel_open"))
|
|
return -1;
|
|
|
|
skel->links.connect_v4_dropper =
|
|
bpf_program__attach_cgroup(skel->progs.connect_v4_dropper,
|
|
cgroup_fd);
|
|
if (!ASSERT_OK_PTR(skel->links.connect_v4_dropper, "prog_attach")) {
|
|
err = -1;
|
|
goto out;
|
|
}
|
|
|
|
if (classid && !ASSERT_OK(join_classid(), "join_classid")) {
|
|
err = -1;
|
|
goto out;
|
|
}
|
|
|
|
fd = connect_to_fd_opts(server_fd, SOCK_STREAM, &opts);
|
|
if (fd < 0)
|
|
err = -1;
|
|
else
|
|
close(fd);
|
|
out:
|
|
connect4_dropper__destroy(skel);
|
|
return err;
|
|
}
|
|
|
|
void test_cgroup_v1v2(void)
|
|
{
|
|
struct network_helper_opts opts = {};
|
|
int server_fd, client_fd, cgroup_fd;
|
|
static const int port = 60120;
|
|
|
|
/* Step 1: Check base connectivity works without any BPF. */
|
|
server_fd = start_server(AF_INET, SOCK_STREAM, NULL, port, 0);
|
|
if (!ASSERT_GE(server_fd, 0, "server_fd"))
|
|
return;
|
|
client_fd = connect_to_fd_opts(server_fd, SOCK_STREAM, &opts);
|
|
if (!ASSERT_GE(client_fd, 0, "client_fd")) {
|
|
close(server_fd);
|
|
return;
|
|
}
|
|
close(client_fd);
|
|
close(server_fd);
|
|
|
|
/* Step 2: Check BPF policy prog attached to cgroups drops connectivity. */
|
|
cgroup_fd = test__join_cgroup("/connect_dropper");
|
|
if (!ASSERT_GE(cgroup_fd, 0, "cgroup_fd"))
|
|
return;
|
|
server_fd = start_server(AF_INET, SOCK_STREAM, NULL, port, 0);
|
|
if (!ASSERT_GE(server_fd, 0, "server_fd")) {
|
|
close(cgroup_fd);
|
|
return;
|
|
}
|
|
ASSERT_OK(run_test(cgroup_fd, server_fd, false), "cgroup-v2-only");
|
|
setup_classid_environment();
|
|
set_classid();
|
|
ASSERT_OK(run_test(cgroup_fd, server_fd, true), "cgroup-v1v2");
|
|
cleanup_classid_environment();
|
|
close(server_fd);
|
|
close(cgroup_fd);
|
|
}
|