Commit 488a23b8 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Daniel Borkmann
Browse files

selftests/bpf: Move existing common networking parts into network_helpers 



1. Move pkt_v4 and pkt_v6 into network_helpers and adjust the users.
2. Copy-paste spin_lock_thread into two tests that use it.

Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarAndrey Ignatov <rdna@fb.com>
Link: https://lore.kernel.org/bpf/20200508174611.228805-3-sdf@google.com
parent 33181bb8

tools/testing/selftests/bpf/network_helpers.c

+17 −0
Original line number Diff line number Diff line
@@ -14,6 +14,23 @@ 
#define log_err(MSG, ...) fprintf(stderr, "(%s:%d: errno: %s) " MSG "\n", \

	__FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)



struct ipv4_packet pkt_v4 = {

	.eth.h_proto = __bpf_constant_htons(ETH_P_IP),

	.iph.ihl = 5,

	.iph.protocol = IPPROTO_TCP,

	.iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),

	.tcp.urg_ptr = 123,

	.tcp.doff = 5,

};



struct ipv6_packet pkt_v6 = {

	.eth.h_proto = __bpf_constant_htons(ETH_P_IPV6),

	.iph.nexthdr = IPPROTO_TCP,

	.iph.payload_len = __bpf_constant_htons(MAGIC_BYTES),

	.tcp.urg_ptr = 123,

	.tcp.doff = 5,

};



int start_server(int family, int type)

{

	struct sockaddr_storage addr = {};

tools/testing/selftests/bpf/network_helpers.h

+29 −0
Original line number Diff line number Diff line
@@ -3,6 +3,35 @@ 
#define __NETWORK_HELPERS_H

#include <sys/socket.h>

#include <sys/types.h>

#include <linux/types.h>

typedef __u16 __sum16;

#include <linux/if_ether.h>

#include <linux/if_packet.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <netinet/tcp.h>

#include <bpf/bpf_endian.h>



#define MAGIC_VAL 0x1234

#define NUM_ITER 100000

#define VIP_NUM 5

#define MAGIC_BYTES 123



/* ipv4 test vector */

struct ipv4_packet {

	struct ethhdr eth;

	struct iphdr iph;

	struct tcphdr tcp;

} __packed;

extern struct ipv4_packet pkt_v4;



/* ipv6 test vector */

struct ipv6_packet {

	struct ethhdr eth;

	struct ipv6hdr iph;

	struct tcphdr tcp;

} __packed;

extern struct ipv6_packet pkt_v6;



int start_server(int family, int type);

int connect_to_fd(int family, int type, int server_fd);

tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2019 Facebook */

#include <test_progs.h>

#include <network_helpers.h>



static void test_fexit_bpf2bpf_common(const char *obj_file,

				      const char *target_obj_file,

tools/testing/selftests/bpf/prog_tests/flow_dissector.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <test_progs.h>

#include <network_helpers.h>

#include <error.h>

#include <linux/if.h>

#include <linux/if_tun.h>

tools/testing/selftests/bpf/prog_tests/flow_dissector_load_bytes.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <test_progs.h>

#include <network_helpers.h>



void test_flow_dissector_load_bytes(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE