mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-05-24 10:39:52 +00:00
c075c9c4af
The patch removes the remaining bpf_tcp_helpers.h usages in the non tcp-cc networking tests. It either replaces it with bpf_tracing_net.h or just removed it because the test is not actually using any kernel sockets. For the later, the missing macro (mainly SOL_TCP) is defined locally. An exception is the test_sock_fields which is testing the "struct bpf_sock" type instead of the kernel sock type. Whenever "vmlinux.h" is used instead, it hits a verifier error on doing arithmetic on the sock_common pointer: ; return !a6[0] && !a6[1] && !a6[2] && a6[3] == bpf_htonl(1); @ test_sock_fields.c:54 21: (61) r2 = *(u32 *)(r1 +28) ; R1_w=sock_common() R2_w=scalar(smin=0,smax=umax=0xffffffff,var_off=(0x0; 0xffffffff)) 22: (56) if w2 != 0x0 goto pc-6 ; R2_w=0 23: (b7) r3 = 28 ; R3_w=28 24: (bf) r2 = r1 ; R1_w=sock_common() R2_w=sock_common() 25: (0f) r2 += r3 R2 pointer arithmetic on sock_common prohibited Hence, instead of including bpf_tracing_net.h, the test_sock_fields test defines a tcp_sock with one lsndtime field in it. Another highlight is, in sockopt_qos_to_cc.c, the tcp_cc_eq() is replaced by bpf_strncmp(). tcp_cc_eq() was a workaround in bpf_tcp_helpers.h before bpf_strncmp had been added. The SOL_IPV6 addition to bpf_tracing_net.h is needed by the test_tcpbpf_kern test. Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org> Link: https://lore.kernel.org/r/20240509175026.3423614-10-martin.lau@linux.dev Signed-off-by: Alexei Starovoitov <ast@kernel.org>
88 lines
1.8 KiB
C
88 lines
1.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* Copyright (c) 2020, Tessares SA. */
|
|
/* Copyright (c) 2022, SUSE. */
|
|
|
|
#include "bpf_tracing_net.h"
|
|
#include <bpf/bpf_helpers.h>
|
|
#include <bpf/bpf_tracing.h>
|
|
|
|
char _license[] SEC("license") = "GPL";
|
|
__u32 token = 0;
|
|
|
|
struct mptcp_storage {
|
|
__u32 invoked;
|
|
__u32 is_mptcp;
|
|
struct sock *sk;
|
|
__u32 token;
|
|
struct sock *first;
|
|
char ca_name[TCP_CA_NAME_MAX];
|
|
};
|
|
|
|
struct {
|
|
__uint(type, BPF_MAP_TYPE_SK_STORAGE);
|
|
__uint(map_flags, BPF_F_NO_PREALLOC);
|
|
__type(key, int);
|
|
__type(value, struct mptcp_storage);
|
|
} socket_storage_map SEC(".maps");
|
|
|
|
SEC("sockops")
|
|
int _sockops(struct bpf_sock_ops *ctx)
|
|
{
|
|
struct mptcp_storage *storage;
|
|
struct mptcp_sock *msk;
|
|
int op = (int)ctx->op;
|
|
struct tcp_sock *tsk;
|
|
struct bpf_sock *sk;
|
|
bool is_mptcp;
|
|
|
|
if (op != BPF_SOCK_OPS_TCP_CONNECT_CB)
|
|
return 1;
|
|
|
|
sk = ctx->sk;
|
|
if (!sk)
|
|
return 1;
|
|
|
|
tsk = bpf_skc_to_tcp_sock(sk);
|
|
if (!tsk)
|
|
return 1;
|
|
|
|
is_mptcp = bpf_core_field_exists(tsk->is_mptcp) ? tsk->is_mptcp : 0;
|
|
if (!is_mptcp) {
|
|
storage = bpf_sk_storage_get(&socket_storage_map, sk, 0,
|
|
BPF_SK_STORAGE_GET_F_CREATE);
|
|
if (!storage)
|
|
return 1;
|
|
|
|
storage->token = 0;
|
|
__builtin_memset(storage->ca_name, 0, TCP_CA_NAME_MAX);
|
|
storage->first = NULL;
|
|
} else {
|
|
msk = bpf_skc_to_mptcp_sock(sk);
|
|
if (!msk)
|
|
return 1;
|
|
|
|
storage = bpf_sk_storage_get(&socket_storage_map, msk, 0,
|
|
BPF_SK_STORAGE_GET_F_CREATE);
|
|
if (!storage)
|
|
return 1;
|
|
|
|
storage->token = msk->token;
|
|
__builtin_memcpy(storage->ca_name, msk->ca_name, TCP_CA_NAME_MAX);
|
|
storage->first = msk->first;
|
|
}
|
|
storage->invoked++;
|
|
storage->is_mptcp = is_mptcp;
|
|
storage->sk = (struct sock *)sk;
|
|
|
|
return 1;
|
|
}
|
|
|
|
SEC("fentry/mptcp_pm_new_connection")
|
|
int BPF_PROG(trace_mptcp_pm_new_connection, struct mptcp_sock *msk,
|
|
const struct sock *ssk, int server_side)
|
|
{
|
|
if (!server_side)
|
|
token = msk->token;
|
|
|
|
return 0;
|
|
}
|