mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-03 18:12:25 -04:00
Merge branch 'selftests/bpf: integrate test_tcp_check_syncookie.sh into test_progs'
Alexis Lothoré (eBPF Foundation) says:
====================
this series aims to bring test_tcp_check_syncookie.sh scope into
test_progs to make sure that the corresponding tests are also run
automatically in CI. This script tests for bpf_tcp_{gen,check}_syncookie
and bpf_skc_lookup_tcp, in different contexts (ipv4, v6 or dual, and
with tc and xdp programs).
Some other tests like btf_skc_cls_ingress have some overlapping tests with
test_tcp_check_syncookie.sh, so this series moves the missing bits from
test_tcp_check_syncookie.sh into btf_skc_cls_ingress, which is already
integrated into test_progs.
- the first three commits bring some minor improvements to
btf_skc_cls_ingress without changing its testing scope
- fourth and fifth commits bring test_tcp_check_syncookie.sh features
into btf_skc_cls_ingress
- last commit removes test_tcp_check_syncookie.sh
The only topic for which I am not sure for this integration is the
necessity or not to run the tests with different program types:
test_tcp_check_syncookie.sh runs tests with both tc and xdp programs, but
btf_skc_cls_ingress currently tests those helpers only with a tc
program. Would it make sense to also make sure that btf_skc_cls_ingress
is tested with all the programs types supported by those helpers ?
The series has been tested both in CI and in a local x86_64 qemu
environment:
# ./test_progs -a btf_skc_cls_ingress
#38/1 btf_skc_cls_ingress/conn_ipv4:OK
#38/2 btf_skc_cls_ingress/conn_ipv6:OK
#38/3 btf_skc_cls_ingress/conn_dual:OK
#38/4 btf_skc_cls_ingress/syncookie_ipv4:OK
#38/5 btf_skc_cls_ingress/syncookie_ipv6:OK
#38/6 btf_skc_cls_ingress/syncookie_dual:OK
#38 btf_skc_cls_ingress:OK
Summary: 1/6 PASSED, 0 SKIPPED, 0 FAILED
---
Changes in v2:
- fix initial test author mail in Cc
- Fix default cases in switches: indent, action
- remove unneeded initializer
- remove duplicate interface bring-up
- remove unnecessary check and return in bpf program
- Link to v1: https://lore.kernel.org/r/20241016-syncookie-v1-0-3b7a0de12153@bootlin.com
====================
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
This commit is contained in:
1
tools/testing/selftests/bpf/.gitignore
vendored
1
tools/testing/selftests/bpf/.gitignore
vendored
@@ -24,7 +24,6 @@ test_flow_dissector
|
||||
flow_dissector_load
|
||||
test_tcpnotify_user
|
||||
test_libbpf
|
||||
test_tcp_check_syncookie_user
|
||||
test_sysctl
|
||||
xdping
|
||||
test_cpp
|
||||
|
||||
@@ -137,7 +137,6 @@ TEST_PROGS := test_kmod.sh \
|
||||
test_xdp_vlan_mode_generic.sh \
|
||||
test_xdp_vlan_mode_native.sh \
|
||||
test_lwt_ip_encap.sh \
|
||||
test_tcp_check_syncookie.sh \
|
||||
test_tc_tunnel.sh \
|
||||
test_tc_edt.sh \
|
||||
test_xdping.sh \
|
||||
@@ -154,10 +153,9 @@ TEST_PROGS_EXTENDED := with_addr.sh \
|
||||
|
||||
# Compile but not part of 'make run_tests'
|
||||
TEST_GEN_PROGS_EXTENDED = \
|
||||
flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \
|
||||
test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \
|
||||
xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \
|
||||
xdp_features bpf_test_no_cfi.ko
|
||||
flow_dissector_load test_flow_dissector test_lirc_mode2_user xdping \
|
||||
test_cpp runqslower bench bpf_testmod.ko xskxceiver xdp_redirect_multi \
|
||||
xdp_synproxy veristat xdp_hw_metadata xdp_features bpf_test_no_cfi.ko
|
||||
|
||||
TEST_GEN_FILES += liburandom_read.so urandom_read sign-file uprobe_multi
|
||||
|
||||
@@ -347,7 +345,6 @@ $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS)
|
||||
$(OUTPUT)/test_maps: $(TESTING_HELPERS)
|
||||
$(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) $(UNPRIV_HELPERS)
|
||||
$(OUTPUT)/xsk.o: $(BPFOBJ)
|
||||
$(OUTPUT)/test_tcp_check_syncookie_user: $(NETWORK_HELPERS)
|
||||
|
||||
BPFTOOL ?= $(DEFAULT_BPFTOOL)
|
||||
$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
|
||||
|
||||
@@ -17,32 +17,37 @@
|
||||
#include "test_progs.h"
|
||||
#include "test_btf_skc_cls_ingress.skel.h"
|
||||
|
||||
static struct test_btf_skc_cls_ingress *skel;
|
||||
static struct sockaddr_in6 srv_sa6;
|
||||
static __u32 duration;
|
||||
#define TEST_NS "skc_cls_ingress"
|
||||
|
||||
static int prepare_netns(void)
|
||||
#define BIT(n) (1 << (n))
|
||||
#define TEST_MODE_IPV4 BIT(0)
|
||||
#define TEST_MODE_IPV6 BIT(1)
|
||||
#define TEST_MODE_DUAL (TEST_MODE_IPV4 | TEST_MODE_IPV6)
|
||||
|
||||
#define SERVER_ADDR_IPV4 "127.0.0.1"
|
||||
#define SERVER_ADDR_IPV6 "::1"
|
||||
#define SERVER_ADDR_DUAL "::0"
|
||||
/* RFC791, 576 for minimal IPv4 datagram, minus 40 bytes of TCP header */
|
||||
#define MIN_IPV4_MSS 536
|
||||
|
||||
static struct netns_obj *prepare_netns(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
LIBBPF_OPTS(bpf_tc_hook, qdisc_lo, .attach_point = BPF_TC_INGRESS);
|
||||
LIBBPF_OPTS(bpf_tc_opts, tc_attach,
|
||||
.prog_fd = bpf_program__fd(skel->progs.cls_ingress));
|
||||
struct netns_obj *ns = NULL;
|
||||
|
||||
if (CHECK(unshare(CLONE_NEWNET), "create netns",
|
||||
"unshare(CLONE_NEWNET): %s (%d)",
|
||||
strerror(errno), errno))
|
||||
return -1;
|
||||
|
||||
if (CHECK(system("ip link set dev lo up"),
|
||||
"ip link set dev lo up", "failed\n"))
|
||||
return -1;
|
||||
ns = netns_new(TEST_NS, true);
|
||||
if (!ASSERT_OK_PTR(ns, "create and join netns"))
|
||||
return ns;
|
||||
|
||||
qdisc_lo.ifindex = if_nametoindex("lo");
|
||||
if (!ASSERT_OK(bpf_tc_hook_create(&qdisc_lo), "qdisc add dev lo clsact"))
|
||||
return -1;
|
||||
goto free_ns;
|
||||
|
||||
if (!ASSERT_OK(bpf_tc_attach(&qdisc_lo, &tc_attach),
|
||||
"filter add dev lo ingress"))
|
||||
return -1;
|
||||
goto free_ns;
|
||||
|
||||
/* Ensure 20 bytes options (i.e. in total 40 bytes tcp header) for the
|
||||
* bpf_tcp_gen_syncookie() helper.
|
||||
@@ -50,71 +55,142 @@ static int prepare_netns(void)
|
||||
if (write_sysctl("/proc/sys/net/ipv4/tcp_window_scaling", "1") ||
|
||||
write_sysctl("/proc/sys/net/ipv4/tcp_timestamps", "1") ||
|
||||
write_sysctl("/proc/sys/net/ipv4/tcp_sack", "1"))
|
||||
return -1;
|
||||
goto free_ns;
|
||||
|
||||
return 0;
|
||||
return ns;
|
||||
|
||||
free_ns:
|
||||
netns_free(ns);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void reset_test(void)
|
||||
static void reset_test(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
memset(&skel->bss->srv_sa4, 0, sizeof(skel->bss->srv_sa4));
|
||||
memset(&skel->bss->srv_sa6, 0, sizeof(skel->bss->srv_sa6));
|
||||
skel->bss->listen_tp_sport = 0;
|
||||
skel->bss->req_sk_sport = 0;
|
||||
skel->bss->recv_cookie = 0;
|
||||
skel->bss->gen_cookie = 0;
|
||||
skel->bss->linum = 0;
|
||||
skel->bss->mss = 0;
|
||||
}
|
||||
|
||||
static void print_err_line(void)
|
||||
static void print_err_line(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
if (skel->bss->linum)
|
||||
printf("bpf prog error at line %u\n", skel->bss->linum);
|
||||
}
|
||||
|
||||
static void test_conn(void)
|
||||
static int v6only_true(int fd, void *opts)
|
||||
{
|
||||
int mode = true;
|
||||
|
||||
return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &mode, sizeof(mode));
|
||||
}
|
||||
|
||||
static int v6only_false(int fd, void *opts)
|
||||
{
|
||||
int mode = false;
|
||||
|
||||
return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &mode, sizeof(mode));
|
||||
}
|
||||
|
||||
static void run_test(struct test_btf_skc_cls_ingress *skel, bool gen_cookies,
|
||||
int ip_mode)
|
||||
{
|
||||
const char *tcp_syncookies = gen_cookies ? "2" : "1";
|
||||
int listen_fd = -1, cli_fd = -1, srv_fd = -1, err;
|
||||
socklen_t addrlen = sizeof(srv_sa6);
|
||||
struct network_helper_opts opts = { 0 };
|
||||
struct sockaddr_storage *addr;
|
||||
struct sockaddr_in6 srv_sa6;
|
||||
struct sockaddr_in srv_sa4;
|
||||
socklen_t addr_len;
|
||||
int sock_family;
|
||||
char *srv_addr;
|
||||
int srv_port;
|
||||
|
||||
if (write_sysctl("/proc/sys/net/ipv4/tcp_syncookies", "1"))
|
||||
switch (ip_mode) {
|
||||
case TEST_MODE_IPV4:
|
||||
sock_family = AF_INET;
|
||||
srv_addr = SERVER_ADDR_IPV4;
|
||||
addr = (struct sockaddr_storage *)&srv_sa4;
|
||||
addr_len = sizeof(srv_sa4);
|
||||
break;
|
||||
case TEST_MODE_IPV6:
|
||||
opts.post_socket_cb = v6only_true;
|
||||
sock_family = AF_INET6;
|
||||
srv_addr = SERVER_ADDR_IPV6;
|
||||
addr = (struct sockaddr_storage *)&srv_sa6;
|
||||
addr_len = sizeof(srv_sa6);
|
||||
break;
|
||||
case TEST_MODE_DUAL:
|
||||
opts.post_socket_cb = v6only_false;
|
||||
sock_family = AF_INET6;
|
||||
srv_addr = SERVER_ADDR_DUAL;
|
||||
addr = (struct sockaddr_storage *)&srv_sa6;
|
||||
addr_len = sizeof(srv_sa6);
|
||||
break;
|
||||
default:
|
||||
PRINT_FAIL("Unknown IP mode %d", ip_mode);
|
||||
return;
|
||||
}
|
||||
|
||||
if (write_sysctl("/proc/sys/net/ipv4/tcp_syncookies", tcp_syncookies))
|
||||
return;
|
||||
|
||||
listen_fd = start_server(AF_INET6, SOCK_STREAM, "::1", 0, 0);
|
||||
if (CHECK_FAIL(listen_fd == -1))
|
||||
listen_fd = start_server_str(sock_family, SOCK_STREAM, srv_addr, 0,
|
||||
&opts);
|
||||
if (!ASSERT_OK_FD(listen_fd, "start server"))
|
||||
return;
|
||||
|
||||
err = getsockname(listen_fd, (struct sockaddr *)&srv_sa6, &addrlen);
|
||||
if (CHECK(err, "getsockname(listen_fd)", "err:%d errno:%d\n", err,
|
||||
errno))
|
||||
err = getsockname(listen_fd, (struct sockaddr *)addr, &addr_len);
|
||||
if (!ASSERT_OK(err, "getsockname(listen_fd)"))
|
||||
goto done;
|
||||
memcpy(&skel->bss->srv_sa6, &srv_sa6, sizeof(srv_sa6));
|
||||
srv_port = ntohs(srv_sa6.sin6_port);
|
||||
|
||||
switch (ip_mode) {
|
||||
case TEST_MODE_IPV4:
|
||||
memcpy(&skel->bss->srv_sa4, &srv_sa4, sizeof(srv_sa4));
|
||||
srv_port = ntohs(srv_sa4.sin_port);
|
||||
break;
|
||||
case TEST_MODE_IPV6:
|
||||
case TEST_MODE_DUAL:
|
||||
memcpy(&skel->bss->srv_sa6, &srv_sa6, sizeof(srv_sa6));
|
||||
srv_port = ntohs(srv_sa6.sin6_port);
|
||||
break;
|
||||
default:
|
||||
goto done;
|
||||
}
|
||||
|
||||
cli_fd = connect_to_fd(listen_fd, 0);
|
||||
if (CHECK_FAIL(cli_fd == -1))
|
||||
if (!ASSERT_OK_FD(cli_fd, "connect client"))
|
||||
goto done;
|
||||
|
||||
srv_fd = accept(listen_fd, NULL, NULL);
|
||||
if (CHECK_FAIL(srv_fd == -1))
|
||||
if (!ASSERT_OK_FD(srv_fd, "accept connection"))
|
||||
goto done;
|
||||
|
||||
if (CHECK(skel->bss->listen_tp_sport != srv_port ||
|
||||
skel->bss->req_sk_sport != srv_port,
|
||||
"Unexpected sk src port",
|
||||
"listen_tp_sport:%u req_sk_sport:%u expected:%u\n",
|
||||
skel->bss->listen_tp_sport, skel->bss->req_sk_sport,
|
||||
srv_port))
|
||||
goto done;
|
||||
ASSERT_EQ(skel->bss->listen_tp_sport, srv_port, "listen tp src port");
|
||||
|
||||
if (CHECK(skel->bss->gen_cookie || skel->bss->recv_cookie,
|
||||
"Unexpected syncookie states",
|
||||
"gen_cookie:%u recv_cookie:%u\n",
|
||||
skel->bss->gen_cookie, skel->bss->recv_cookie))
|
||||
goto done;
|
||||
|
||||
CHECK(skel->bss->linum, "bpf prog detected error", "at line %u\n",
|
||||
skel->bss->linum);
|
||||
if (!gen_cookies) {
|
||||
ASSERT_EQ(skel->bss->req_sk_sport, srv_port,
|
||||
"request socket source port with syncookies disabled");
|
||||
ASSERT_EQ(skel->bss->gen_cookie, 0,
|
||||
"generated syncookie with syncookies disabled");
|
||||
ASSERT_EQ(skel->bss->recv_cookie, 0,
|
||||
"received syncookie with syncookies disabled");
|
||||
} else {
|
||||
ASSERT_EQ(skel->bss->req_sk_sport, 0,
|
||||
"request socket source port with syncookies enabled");
|
||||
ASSERT_NEQ(skel->bss->gen_cookie, 0,
|
||||
"syncookie properly generated");
|
||||
ASSERT_EQ(skel->bss->gen_cookie, skel->bss->recv_cookie,
|
||||
"matching syncookies on client and server");
|
||||
ASSERT_GT(skel->bss->mss, MIN_IPV4_MSS,
|
||||
"MSS in cookie min value");
|
||||
ASSERT_LT(skel->bss->mss, USHRT_MAX,
|
||||
"MSS in cookie max value");
|
||||
}
|
||||
|
||||
done:
|
||||
if (listen_fd != -1)
|
||||
@@ -125,96 +201,74 @@ static void test_conn(void)
|
||||
close(srv_fd);
|
||||
}
|
||||
|
||||
static void test_syncookie(void)
|
||||
static void test_conn_ipv4(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
int listen_fd = -1, cli_fd = -1, srv_fd = -1, err;
|
||||
socklen_t addrlen = sizeof(srv_sa6);
|
||||
int srv_port;
|
||||
run_test(skel, false, TEST_MODE_IPV4);
|
||||
}
|
||||
|
||||
/* Enforce syncookie mode */
|
||||
if (write_sysctl("/proc/sys/net/ipv4/tcp_syncookies", "2"))
|
||||
return;
|
||||
static void test_conn_ipv6(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
run_test(skel, false, TEST_MODE_IPV6);
|
||||
}
|
||||
|
||||
listen_fd = start_server(AF_INET6, SOCK_STREAM, "::1", 0, 0);
|
||||
if (CHECK_FAIL(listen_fd == -1))
|
||||
return;
|
||||
static void test_conn_dual(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
run_test(skel, false, TEST_MODE_DUAL);
|
||||
}
|
||||
|
||||
err = getsockname(listen_fd, (struct sockaddr *)&srv_sa6, &addrlen);
|
||||
if (CHECK(err, "getsockname(listen_fd)", "err:%d errno:%d\n", err,
|
||||
errno))
|
||||
goto done;
|
||||
memcpy(&skel->bss->srv_sa6, &srv_sa6, sizeof(srv_sa6));
|
||||
srv_port = ntohs(srv_sa6.sin6_port);
|
||||
static void test_syncookie_ipv4(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
run_test(skel, true, TEST_MODE_IPV4);
|
||||
}
|
||||
|
||||
cli_fd = connect_to_fd(listen_fd, 0);
|
||||
if (CHECK_FAIL(cli_fd == -1))
|
||||
goto done;
|
||||
static void test_syncookie_ipv6(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
run_test(skel, true, TEST_MODE_IPV6);
|
||||
}
|
||||
|
||||
srv_fd = accept(listen_fd, NULL, NULL);
|
||||
if (CHECK_FAIL(srv_fd == -1))
|
||||
goto done;
|
||||
|
||||
if (CHECK(skel->bss->listen_tp_sport != srv_port,
|
||||
"Unexpected tp src port",
|
||||
"listen_tp_sport:%u expected:%u\n",
|
||||
skel->bss->listen_tp_sport, srv_port))
|
||||
goto done;
|
||||
|
||||
if (CHECK(skel->bss->req_sk_sport,
|
||||
"Unexpected req_sk src port",
|
||||
"req_sk_sport:%u expected:0\n",
|
||||
skel->bss->req_sk_sport))
|
||||
goto done;
|
||||
|
||||
if (CHECK(!skel->bss->gen_cookie ||
|
||||
skel->bss->gen_cookie != skel->bss->recv_cookie,
|
||||
"Unexpected syncookie states",
|
||||
"gen_cookie:%u recv_cookie:%u\n",
|
||||
skel->bss->gen_cookie, skel->bss->recv_cookie))
|
||||
goto done;
|
||||
|
||||
CHECK(skel->bss->linum, "bpf prog detected error", "at line %u\n",
|
||||
skel->bss->linum);
|
||||
|
||||
done:
|
||||
if (listen_fd != -1)
|
||||
close(listen_fd);
|
||||
if (cli_fd != -1)
|
||||
close(cli_fd);
|
||||
if (srv_fd != -1)
|
||||
close(srv_fd);
|
||||
static void test_syncookie_dual(struct test_btf_skc_cls_ingress *skel)
|
||||
{
|
||||
run_test(skel, true, TEST_MODE_DUAL);
|
||||
}
|
||||
|
||||
struct test {
|
||||
const char *desc;
|
||||
void (*run)(void);
|
||||
void (*run)(struct test_btf_skc_cls_ingress *skel);
|
||||
};
|
||||
|
||||
#define DEF_TEST(name) { #name, test_##name }
|
||||
static struct test tests[] = {
|
||||
DEF_TEST(conn),
|
||||
DEF_TEST(syncookie),
|
||||
DEF_TEST(conn_ipv4),
|
||||
DEF_TEST(conn_ipv6),
|
||||
DEF_TEST(conn_dual),
|
||||
DEF_TEST(syncookie_ipv4),
|
||||
DEF_TEST(syncookie_ipv6),
|
||||
DEF_TEST(syncookie_dual),
|
||||
};
|
||||
|
||||
void test_btf_skc_cls_ingress(void)
|
||||
{
|
||||
struct test_btf_skc_cls_ingress *skel;
|
||||
struct netns_obj *ns;
|
||||
int i;
|
||||
|
||||
skel = test_btf_skc_cls_ingress__open_and_load();
|
||||
if (CHECK(!skel, "test_btf_skc_cls_ingress__open_and_load", "failed\n"))
|
||||
if (!ASSERT_OK_PTR(skel, "test_btf_skc_cls_ingress__open_and_load"))
|
||||
return;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(tests); i++) {
|
||||
if (!test__start_subtest(tests[i].desc))
|
||||
continue;
|
||||
|
||||
if (prepare_netns())
|
||||
ns = prepare_netns(skel);
|
||||
if (!ns)
|
||||
break;
|
||||
|
||||
tests[i].run();
|
||||
tests[i].run(skel);
|
||||
|
||||
print_err_line();
|
||||
reset_test();
|
||||
print_err_line(skel);
|
||||
reset_test(skel);
|
||||
netns_free(ns);
|
||||
}
|
||||
|
||||
test_btf_skc_cls_ingress__destroy(skel);
|
||||
|
||||
@@ -10,16 +10,18 @@
|
||||
#endif
|
||||
|
||||
struct sockaddr_in6 srv_sa6 = {};
|
||||
struct sockaddr_in srv_sa4 = {};
|
||||
__u16 listen_tp_sport = 0;
|
||||
__u16 req_sk_sport = 0;
|
||||
__u32 recv_cookie = 0;
|
||||
__u32 gen_cookie = 0;
|
||||
__u32 mss = 0;
|
||||
__u32 linum = 0;
|
||||
|
||||
#define LOG() ({ if (!linum) linum = __LINE__; })
|
||||
|
||||
static void test_syncookie_helper(struct ipv6hdr *ip6h, struct tcphdr *th,
|
||||
struct tcp_sock *tp,
|
||||
static void test_syncookie_helper(void *iphdr, int iphdr_size,
|
||||
struct tcphdr *th, struct tcp_sock *tp,
|
||||
struct __sk_buff *skb)
|
||||
{
|
||||
if (th->syn) {
|
||||
@@ -38,17 +40,18 @@ static void test_syncookie_helper(struct ipv6hdr *ip6h, struct tcphdr *th,
|
||||
return;
|
||||
}
|
||||
|
||||
mss_cookie = bpf_tcp_gen_syncookie(tp, ip6h, sizeof(*ip6h),
|
||||
mss_cookie = bpf_tcp_gen_syncookie(tp, iphdr, iphdr_size,
|
||||
th, 40);
|
||||
if (mss_cookie < 0) {
|
||||
if (mss_cookie != -ENOENT)
|
||||
LOG();
|
||||
} else {
|
||||
gen_cookie = (__u32)mss_cookie;
|
||||
mss = mss_cookie >> 32;
|
||||
}
|
||||
} else if (gen_cookie) {
|
||||
/* It was in cookie mode */
|
||||
int ret = bpf_tcp_check_syncookie(tp, ip6h, sizeof(*ip6h),
|
||||
int ret = bpf_tcp_check_syncookie(tp, iphdr, iphdr_size,
|
||||
th, sizeof(*th));
|
||||
|
||||
if (ret < 0) {
|
||||
@@ -60,26 +63,58 @@ static void test_syncookie_helper(struct ipv6hdr *ip6h, struct tcphdr *th,
|
||||
}
|
||||
}
|
||||
|
||||
static int handle_ip6_tcp(struct ipv6hdr *ip6h, struct __sk_buff *skb)
|
||||
static int handle_ip_tcp(struct ethhdr *eth, struct __sk_buff *skb)
|
||||
{
|
||||
struct bpf_sock_tuple *tuple;
|
||||
struct bpf_sock_tuple *tuple = NULL;
|
||||
unsigned int tuple_len = 0;
|
||||
struct bpf_sock *bpf_skc;
|
||||
unsigned int tuple_len;
|
||||
void *data_end, *iphdr;
|
||||
struct ipv6hdr *ip6h;
|
||||
struct iphdr *ip4h;
|
||||
struct tcphdr *th;
|
||||
void *data_end;
|
||||
int iphdr_size;
|
||||
|
||||
data_end = (void *)(long)(skb->data_end);
|
||||
|
||||
th = (struct tcphdr *)(ip6h + 1);
|
||||
if (th + 1 > data_end)
|
||||
switch (eth->h_proto) {
|
||||
case bpf_htons(ETH_P_IP):
|
||||
ip4h = (struct iphdr *)(eth + 1);
|
||||
if (ip4h + 1 > data_end)
|
||||
return TC_ACT_OK;
|
||||
if (ip4h->protocol != IPPROTO_TCP)
|
||||
return TC_ACT_OK;
|
||||
th = (struct tcphdr *)(ip4h + 1);
|
||||
if (th + 1 > data_end)
|
||||
return TC_ACT_OK;
|
||||
/* Is it the testing traffic? */
|
||||
if (th->dest != srv_sa4.sin_port)
|
||||
return TC_ACT_OK;
|
||||
tuple_len = sizeof(tuple->ipv4);
|
||||
tuple = (struct bpf_sock_tuple *)&ip4h->saddr;
|
||||
iphdr = ip4h;
|
||||
iphdr_size = sizeof(*ip4h);
|
||||
break;
|
||||
case bpf_htons(ETH_P_IPV6):
|
||||
ip6h = (struct ipv6hdr *)(eth + 1);
|
||||
if (ip6h + 1 > data_end)
|
||||
return TC_ACT_OK;
|
||||
if (ip6h->nexthdr != IPPROTO_TCP)
|
||||
return TC_ACT_OK;
|
||||
th = (struct tcphdr *)(ip6h + 1);
|
||||
if (th + 1 > data_end)
|
||||
return TC_ACT_OK;
|
||||
/* Is it the testing traffic? */
|
||||
if (th->dest != srv_sa6.sin6_port)
|
||||
return TC_ACT_OK;
|
||||
tuple_len = sizeof(tuple->ipv6);
|
||||
tuple = (struct bpf_sock_tuple *)&ip6h->saddr;
|
||||
iphdr = ip6h;
|
||||
iphdr_size = sizeof(*ip6h);
|
||||
break;
|
||||
default:
|
||||
return TC_ACT_OK;
|
||||
}
|
||||
|
||||
/* Is it the testing traffic? */
|
||||
if (th->dest != srv_sa6.sin6_port)
|
||||
return TC_ACT_OK;
|
||||
|
||||
tuple_len = sizeof(tuple->ipv6);
|
||||
tuple = (struct bpf_sock_tuple *)&ip6h->saddr;
|
||||
if ((void *)tuple + tuple_len > data_end) {
|
||||
LOG();
|
||||
return TC_ACT_OK;
|
||||
@@ -126,7 +161,7 @@ static int handle_ip6_tcp(struct ipv6hdr *ip6h, struct __sk_buff *skb)
|
||||
|
||||
listen_tp_sport = tp->inet_conn.icsk_inet.sk.__sk_common.skc_num;
|
||||
|
||||
test_syncookie_helper(ip6h, th, tp, skb);
|
||||
test_syncookie_helper(iphdr, iphdr_size, th, tp, skb);
|
||||
bpf_sk_release(tp);
|
||||
return TC_ACT_OK;
|
||||
}
|
||||
@@ -142,7 +177,6 @@ static int handle_ip6_tcp(struct ipv6hdr *ip6h, struct __sk_buff *skb)
|
||||
SEC("tc")
|
||||
int cls_ingress(struct __sk_buff *skb)
|
||||
{
|
||||
struct ipv6hdr *ip6h;
|
||||
struct ethhdr *eth;
|
||||
void *data_end;
|
||||
|
||||
@@ -152,17 +186,11 @@ int cls_ingress(struct __sk_buff *skb)
|
||||
if (eth + 1 > data_end)
|
||||
return TC_ACT_OK;
|
||||
|
||||
if (eth->h_proto != bpf_htons(ETH_P_IPV6))
|
||||
if (eth->h_proto != bpf_htons(ETH_P_IP) &&
|
||||
eth->h_proto != bpf_htons(ETH_P_IPV6))
|
||||
return TC_ACT_OK;
|
||||
|
||||
ip6h = (struct ipv6hdr *)(eth + 1);
|
||||
if (ip6h + 1 > data_end)
|
||||
return TC_ACT_OK;
|
||||
|
||||
if (ip6h->nexthdr == IPPROTO_TCP)
|
||||
return handle_ip6_tcp(ip6h, skb);
|
||||
|
||||
return TC_ACT_OK;
|
||||
return handle_ip_tcp(eth, skb);
|
||||
}
|
||||
|
||||
char _license[] SEC("license") = "GPL";
|
||||
|
||||
@@ -1,167 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2018 Facebook
|
||||
// Copyright (c) 2019 Cloudflare
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <linux/bpf.h>
|
||||
#include <linux/pkt_cls.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/in.h>
|
||||
#include <linux/ip.h>
|
||||
#include <linux/ipv6.h>
|
||||
#include <sys/socket.h>
|
||||
#include <linux/tcp.h>
|
||||
|
||||
#include <bpf/bpf_helpers.h>
|
||||
#include <bpf/bpf_endian.h>
|
||||
|
||||
struct {
|
||||
__uint(type, BPF_MAP_TYPE_ARRAY);
|
||||
__type(key, __u32);
|
||||
__type(value, __u32);
|
||||
__uint(max_entries, 3);
|
||||
} results SEC(".maps");
|
||||
|
||||
static __always_inline __s64 gen_syncookie(void *data_end, struct bpf_sock *sk,
|
||||
void *iph, __u32 ip_size,
|
||||
struct tcphdr *tcph)
|
||||
{
|
||||
__u32 thlen = tcph->doff * 4;
|
||||
|
||||
if (tcph->syn && !tcph->ack) {
|
||||
// packet should only have an MSS option
|
||||
if (thlen != 24)
|
||||
return 0;
|
||||
|
||||
if ((void *)tcph + thlen > data_end)
|
||||
return 0;
|
||||
|
||||
return bpf_tcp_gen_syncookie(sk, iph, ip_size, tcph, thlen);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __always_inline void check_syncookie(void *ctx, void *data,
|
||||
void *data_end)
|
||||
{
|
||||
struct bpf_sock_tuple tup;
|
||||
struct bpf_sock *sk;
|
||||
struct ethhdr *ethh;
|
||||
struct iphdr *ipv4h;
|
||||
struct ipv6hdr *ipv6h;
|
||||
struct tcphdr *tcph;
|
||||
int ret;
|
||||
__u32 key_mss = 2;
|
||||
__u32 key_gen = 1;
|
||||
__u32 key = 0;
|
||||
__s64 seq_mss;
|
||||
|
||||
ethh = data;
|
||||
if (ethh + 1 > data_end)
|
||||
return;
|
||||
|
||||
switch (bpf_ntohs(ethh->h_proto)) {
|
||||
case ETH_P_IP:
|
||||
ipv4h = data + sizeof(struct ethhdr);
|
||||
if (ipv4h + 1 > data_end)
|
||||
return;
|
||||
|
||||
if (ipv4h->ihl != 5)
|
||||
return;
|
||||
|
||||
tcph = data + sizeof(struct ethhdr) + sizeof(struct iphdr);
|
||||
if (tcph + 1 > data_end)
|
||||
return;
|
||||
|
||||
tup.ipv4.saddr = ipv4h->saddr;
|
||||
tup.ipv4.daddr = ipv4h->daddr;
|
||||
tup.ipv4.sport = tcph->source;
|
||||
tup.ipv4.dport = tcph->dest;
|
||||
|
||||
sk = bpf_skc_lookup_tcp(ctx, &tup, sizeof(tup.ipv4),
|
||||
BPF_F_CURRENT_NETNS, 0);
|
||||
if (!sk)
|
||||
return;
|
||||
|
||||
if (sk->state != BPF_TCP_LISTEN)
|
||||
goto release;
|
||||
|
||||
seq_mss = gen_syncookie(data_end, sk, ipv4h, sizeof(*ipv4h),
|
||||
tcph);
|
||||
|
||||
ret = bpf_tcp_check_syncookie(sk, ipv4h, sizeof(*ipv4h),
|
||||
tcph, sizeof(*tcph));
|
||||
break;
|
||||
|
||||
case ETH_P_IPV6:
|
||||
ipv6h = data + sizeof(struct ethhdr);
|
||||
if (ipv6h + 1 > data_end)
|
||||
return;
|
||||
|
||||
if (ipv6h->nexthdr != IPPROTO_TCP)
|
||||
return;
|
||||
|
||||
tcph = data + sizeof(struct ethhdr) + sizeof(struct ipv6hdr);
|
||||
if (tcph + 1 > data_end)
|
||||
return;
|
||||
|
||||
memcpy(tup.ipv6.saddr, &ipv6h->saddr, sizeof(tup.ipv6.saddr));
|
||||
memcpy(tup.ipv6.daddr, &ipv6h->daddr, sizeof(tup.ipv6.daddr));
|
||||
tup.ipv6.sport = tcph->source;
|
||||
tup.ipv6.dport = tcph->dest;
|
||||
|
||||
sk = bpf_skc_lookup_tcp(ctx, &tup, sizeof(tup.ipv6),
|
||||
BPF_F_CURRENT_NETNS, 0);
|
||||
if (!sk)
|
||||
return;
|
||||
|
||||
if (sk->state != BPF_TCP_LISTEN)
|
||||
goto release;
|
||||
|
||||
seq_mss = gen_syncookie(data_end, sk, ipv6h, sizeof(*ipv6h),
|
||||
tcph);
|
||||
|
||||
ret = bpf_tcp_check_syncookie(sk, ipv6h, sizeof(*ipv6h),
|
||||
tcph, sizeof(*tcph));
|
||||
break;
|
||||
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
if (seq_mss > 0) {
|
||||
__u32 cookie = (__u32)seq_mss;
|
||||
__u32 mss = seq_mss >> 32;
|
||||
|
||||
bpf_map_update_elem(&results, &key_gen, &cookie, 0);
|
||||
bpf_map_update_elem(&results, &key_mss, &mss, 0);
|
||||
}
|
||||
|
||||
if (ret == 0) {
|
||||
__u32 cookie = bpf_ntohl(tcph->ack_seq) - 1;
|
||||
|
||||
bpf_map_update_elem(&results, &key, &cookie, 0);
|
||||
}
|
||||
|
||||
release:
|
||||
bpf_sk_release(sk);
|
||||
}
|
||||
|
||||
SEC("tc")
|
||||
int check_syncookie_clsact(struct __sk_buff *skb)
|
||||
{
|
||||
check_syncookie(skb, (void *)(long)skb->data,
|
||||
(void *)(long)skb->data_end);
|
||||
return TC_ACT_OK;
|
||||
}
|
||||
|
||||
SEC("xdp")
|
||||
int check_syncookie_xdp(struct xdp_md *ctx)
|
||||
{
|
||||
check_syncookie(ctx, (void *)(long)ctx->data,
|
||||
(void *)(long)ctx->data_end);
|
||||
return XDP_PASS;
|
||||
}
|
||||
|
||||
char _license[] SEC("license") = "GPL";
|
||||
@@ -1,85 +0,0 @@
|
||||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Copyright (c) 2018 Facebook
|
||||
# Copyright (c) 2019 Cloudflare
|
||||
|
||||
set -eu
|
||||
readonly NS1="ns1-$(mktemp -u XXXXXX)"
|
||||
|
||||
wait_for_ip()
|
||||
{
|
||||
local _i
|
||||
printf "Wait for IP %s to become available " "$1"
|
||||
for _i in $(seq ${MAX_PING_TRIES}); do
|
||||
printf "."
|
||||
if ns1_exec ping -c 1 -W 1 "$1" >/dev/null 2>&1; then
|
||||
echo " OK"
|
||||
return
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
echo 1>&2 "ERROR: Timeout waiting for test IP to become available."
|
||||
exit 1
|
||||
}
|
||||
|
||||
get_prog_id()
|
||||
{
|
||||
awk '/ id / {sub(/.* id /, "", $0); print($1)}'
|
||||
}
|
||||
|
||||
ns1_exec()
|
||||
{
|
||||
ip netns exec ${NS1} "$@"
|
||||
}
|
||||
|
||||
setup()
|
||||
{
|
||||
ip netns add ${NS1}
|
||||
ns1_exec ip link set lo up
|
||||
|
||||
ns1_exec sysctl -w net.ipv4.tcp_syncookies=2
|
||||
ns1_exec sysctl -w net.ipv4.tcp_window_scaling=0
|
||||
ns1_exec sysctl -w net.ipv4.tcp_timestamps=0
|
||||
ns1_exec sysctl -w net.ipv4.tcp_sack=0
|
||||
|
||||
wait_for_ip 127.0.0.1
|
||||
wait_for_ip ::1
|
||||
}
|
||||
|
||||
cleanup()
|
||||
{
|
||||
ip netns del ns1 2>/dev/null || :
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
trap cleanup EXIT 2 3 6 15
|
||||
setup
|
||||
|
||||
printf "Testing clsact..."
|
||||
ns1_exec tc qdisc add dev "${TEST_IF}" clsact
|
||||
ns1_exec tc filter add dev "${TEST_IF}" ingress \
|
||||
bpf obj "${BPF_PROG_OBJ}" sec "${CLSACT_SECTION}" da
|
||||
|
||||
BPF_PROG_ID=$(ns1_exec tc filter show dev "${TEST_IF}" ingress | \
|
||||
get_prog_id)
|
||||
ns1_exec "${PROG}" "${BPF_PROG_ID}"
|
||||
ns1_exec tc qdisc del dev "${TEST_IF}" clsact
|
||||
|
||||
printf "Testing XDP..."
|
||||
ns1_exec ip link set "${TEST_IF}" xdp \
|
||||
object "${BPF_PROG_OBJ}" section "${XDP_SECTION}"
|
||||
BPF_PROG_ID=$(ns1_exec ip link show "${TEST_IF}" | get_prog_id)
|
||||
ns1_exec "${PROG}" "${BPF_PROG_ID}"
|
||||
}
|
||||
|
||||
DIR=$(dirname $0)
|
||||
TEST_IF=lo
|
||||
MAX_PING_TRIES=5
|
||||
BPF_PROG_OBJ="${DIR}/test_tcp_check_syncookie_kern.bpf.o"
|
||||
CLSACT_SECTION="tc"
|
||||
XDP_SECTION="xdp"
|
||||
BPF_PROG_ID=0
|
||||
PROG="${DIR}/test_tcp_check_syncookie_user"
|
||||
|
||||
main
|
||||
@@ -1,213 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2018 Facebook
|
||||
// Copyright (c) 2019 Cloudflare
|
||||
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <bpf/bpf.h>
|
||||
#include <bpf/libbpf.h>
|
||||
|
||||
#include "cgroup_helpers.h"
|
||||
#include "network_helpers.h"
|
||||
|
||||
static int get_map_fd_by_prog_id(int prog_id, bool *xdp)
|
||||
{
|
||||
struct bpf_prog_info info = {};
|
||||
__u32 info_len = sizeof(info);
|
||||
__u32 map_ids[1];
|
||||
int prog_fd = -1;
|
||||
int map_fd = -1;
|
||||
|
||||
prog_fd = bpf_prog_get_fd_by_id(prog_id);
|
||||
if (prog_fd < 0) {
|
||||
log_err("Failed to get fd by prog id %d", prog_id);
|
||||
goto err;
|
||||
}
|
||||
|
||||
info.nr_map_ids = 1;
|
||||
info.map_ids = (__u64)(unsigned long)map_ids;
|
||||
|
||||
if (bpf_prog_get_info_by_fd(prog_fd, &info, &info_len)) {
|
||||
log_err("Failed to get info by prog fd %d", prog_fd);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (!info.nr_map_ids) {
|
||||
log_err("No maps found for prog fd %d", prog_fd);
|
||||
goto err;
|
||||
}
|
||||
|
||||
*xdp = info.type == BPF_PROG_TYPE_XDP;
|
||||
|
||||
map_fd = bpf_map_get_fd_by_id(map_ids[0]);
|
||||
if (map_fd < 0)
|
||||
log_err("Failed to get fd by map id %d", map_ids[0]);
|
||||
err:
|
||||
if (prog_fd >= 0)
|
||||
close(prog_fd);
|
||||
return map_fd;
|
||||
}
|
||||
|
||||
static int run_test(int server_fd, int results_fd, bool xdp)
|
||||
{
|
||||
int client = -1, srv_client = -1;
|
||||
int ret = 0;
|
||||
__u32 key = 0;
|
||||
__u32 key_gen = 1;
|
||||
__u32 key_mss = 2;
|
||||
__u32 value = 0;
|
||||
__u32 value_gen = 0;
|
||||
__u32 value_mss = 0;
|
||||
|
||||
if (bpf_map_update_elem(results_fd, &key, &value, 0) < 0) {
|
||||
log_err("Can't clear results");
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (bpf_map_update_elem(results_fd, &key_gen, &value_gen, 0) < 0) {
|
||||
log_err("Can't clear results");
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (bpf_map_update_elem(results_fd, &key_mss, &value_mss, 0) < 0) {
|
||||
log_err("Can't clear results");
|
||||
goto err;
|
||||
}
|
||||
|
||||
client = connect_to_fd(server_fd, 0);
|
||||
if (client == -1)
|
||||
goto err;
|
||||
|
||||
srv_client = accept(server_fd, NULL, 0);
|
||||
if (srv_client == -1) {
|
||||
log_err("Can't accept connection");
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (bpf_map_lookup_elem(results_fd, &key, &value) < 0) {
|
||||
log_err("Can't lookup result");
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (value == 0) {
|
||||
log_err("Didn't match syncookie: %u", value);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (bpf_map_lookup_elem(results_fd, &key_gen, &value_gen) < 0) {
|
||||
log_err("Can't lookup result");
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (xdp && value_gen == 0) {
|
||||
// SYN packets do not get passed through generic XDP, skip the
|
||||
// rest of the test.
|
||||
printf("Skipping XDP cookie check\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (bpf_map_lookup_elem(results_fd, &key_mss, &value_mss) < 0) {
|
||||
log_err("Can't lookup result");
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (value != value_gen) {
|
||||
log_err("BPF generated cookie does not match kernel one");
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (value_mss < 536 || value_mss > USHRT_MAX) {
|
||||
log_err("Unexpected MSS retrieved");
|
||||
goto err;
|
||||
}
|
||||
|
||||
goto out;
|
||||
|
||||
err:
|
||||
ret = 1;
|
||||
out:
|
||||
close(client);
|
||||
close(srv_client);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int v6only_true(int fd, void *opts)
|
||||
{
|
||||
int mode = true;
|
||||
|
||||
return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &mode, sizeof(mode));
|
||||
}
|
||||
|
||||
static int v6only_false(int fd, void *opts)
|
||||
{
|
||||
int mode = false;
|
||||
|
||||
return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &mode, sizeof(mode));
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
struct network_helper_opts opts = { 0 };
|
||||
int server = -1;
|
||||
int server_v6 = -1;
|
||||
int server_dual = -1;
|
||||
int results = -1;
|
||||
int err = 0;
|
||||
bool xdp;
|
||||
|
||||
if (argc < 2) {
|
||||
fprintf(stderr, "Usage: %s prog_id\n", argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* Use libbpf 1.0 API mode */
|
||||
libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
|
||||
|
||||
results = get_map_fd_by_prog_id(atoi(argv[1]), &xdp);
|
||||
if (results < 0) {
|
||||
log_err("Can't get map");
|
||||
goto err;
|
||||
}
|
||||
|
||||
server = start_server_str(AF_INET, SOCK_STREAM, "127.0.0.1", 0, NULL);
|
||||
if (server == -1)
|
||||
goto err;
|
||||
|
||||
opts.post_socket_cb = v6only_true;
|
||||
server_v6 = start_server_str(AF_INET6, SOCK_STREAM, "::1", 0, &opts);
|
||||
if (server_v6 == -1)
|
||||
goto err;
|
||||
|
||||
opts.post_socket_cb = v6only_false;
|
||||
server_dual = start_server_str(AF_INET6, SOCK_STREAM, "::0", 0, &opts);
|
||||
if (server_dual == -1)
|
||||
goto err;
|
||||
|
||||
if (run_test(server, results, xdp))
|
||||
goto err;
|
||||
|
||||
if (run_test(server_v6, results, xdp))
|
||||
goto err;
|
||||
|
||||
if (run_test(server_dual, results, xdp))
|
||||
goto err;
|
||||
|
||||
printf("ok\n");
|
||||
goto out;
|
||||
err:
|
||||
err = 1;
|
||||
out:
|
||||
close(server);
|
||||
close(server_v6);
|
||||
close(server_dual);
|
||||
close(results);
|
||||
return err;
|
||||
}
|
||||
Reference in New Issue
Block a user