Commit c075c9c4 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov
Browse files

selftests/bpf: Remove the bpf_tcp_helpers.h usages from other non tcp-cc tests 



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: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Link: https://lore.kernel.org/r/20240509175026.3423614-10-martin.lau@linux.dev


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 6eee55aa

tools/testing/selftests/bpf/progs/bpf_tracing_net.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#define IP_TOS			1



#define SOL_IPV6		41

#define IPV6_TCLASS		67

#define IPV6_AUTOFLOWLABEL	70

tools/testing/selftests/bpf/progs/connect4_prog.c

+4 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <bpf/bpf_helpers.h>

#include <bpf/bpf_endian.h>



#include "bpf_tcp_helpers.h"



#define SRC_REWRITE_IP4		0x7f000004U

#define DST_REWRITE_IP4		0x7f000001U

#define DST_REWRITE_PORT4	4444
@@ -32,6 +30,10 @@ 
#define IFNAMSIZ 16

#endif



#ifndef SOL_TCP

#define SOL_TCP 6

#endif



__attribute__ ((noinline)) __weak

int do_bind(struct bpf_sock_addr *ctx)

{

tools/testing/selftests/bpf/progs/mptcp_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
/* Copyright (c) 2020, Tessares SA. */

/* Copyright (c) 2022, SUSE. */



#include <linux/bpf.h>

#include "bpf_tracing_net.h"

#include <bpf/bpf_helpers.h>

#include "bpf_tcp_helpers.h"

#include <bpf/bpf_tracing.h>



char _license[] SEC("license") = "GPL";

__u32 token = 0;

tools/testing/selftests/bpf/progs/sockopt_qos_to_cc.c

+6 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2021 Facebook */

#include <string.h>

#include <linux/tcp.h>

#include <netinet/in.h>

#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>

#include "bpf_tcp_helpers.h"

#include "bpf_tracing_net.h"



char _license[] SEC("license") = "GPL";



__s32 page_size = 0;



const char cc_reno[TCP_CA_NAME_MAX] = "reno";

const char cc_cubic[TCP_CA_NAME_MAX] = "cubic";



SEC("cgroup/setsockopt")

int sockopt_qos_to_cc(struct bpf_sockopt *ctx)

{

	void *optval_end = ctx->optval_end;

	int *optval = ctx->optval;

	char buf[TCP_CA_NAME_MAX];

	char cc_reno[TCP_CA_NAME_MAX] = "reno";

	char cc_cubic[TCP_CA_NAME_MAX] = "cubic";



	if (ctx->level != SOL_IPV6 || ctx->optname != IPV6_TCLASS)

		goto out;
@@ -29,11 +25,11 @@ int sockopt_qos_to_cc(struct bpf_sockopt *ctx) 
	if (bpf_getsockopt(ctx->sk, SOL_TCP, TCP_CONGESTION, &buf, sizeof(buf)))

		return 0;



	if (!tcp_cc_eq(buf, cc_cubic))

	if (bpf_strncmp(buf, sizeof(buf), cc_cubic))

		return 0;



	if (*optval == 0x2d) {

		if (bpf_setsockopt(ctx->sk, SOL_TCP, TCP_CONGESTION, &cc_reno,

		if (bpf_setsockopt(ctx->sk, SOL_TCP, TCP_CONGESTION, (void *)&cc_reno,

				sizeof(cc_reno)))

			return 0;

	}

tools/testing/selftests/bpf/progs/test_btf_skc_cls_ingress.c

+5 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2020 Facebook */



#include <string.h>

#include <errno.h>

#include <netinet/in.h>

#include <linux/stddef.h>

#include <linux/bpf.h>

#include <linux/ipv6.h>

#include <linux/tcp.h>

#include <linux/if_ether.h>

#include <linux/pkt_cls.h>



#include "bpf_tracing_net.h"

#include <bpf/bpf_helpers.h>

#include <bpf/bpf_endian.h>

#include "bpf_tcp_helpers.h"



#ifndef ENOENT

#define ENOENT 2

#endif



struct sockaddr_in6 srv_sa6 = {};

__u16 listen_tp_sport = 0;