selftests/bpf: remove test_tcp_check_syncookie
Now that btf_skc_cls_ingress has the same coverage as test_tcp_check_syncookie, remove the second one and keep the first one as it is integrated in test_progs Signed-off-by: Alexis Lothoré (eBPF Foundation) <alexis.lothore@bootlin.com> Link: https://lore.kernel.org/r/20241020-syncookie-v2-6-2db240225fed@bootlin.com Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>pull/1083/head
Alexis Lothoré (eBPF Foundation)
Martin KaFai Lau
parent
3845ce7477
commit
c3566ee6c6
|
|
@ -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) \
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
Loading…
Reference in New Issue