monitor network traffic for flaky test cases
Subsystems (3)
v5 cover monitor network traffic for flaky test cases
Capture packets in the background for flaky test cases related to network features.
We have some flaky test cases that are difficult to debug without knowing what the traffic looks like. Capturing packets, the CI log and packet files may help developers to fix these flaky test cases.
This patch set monitors a few test cases. Recently, they have been showing flaky behavior.
IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 68, ifname lo (In), SYN
IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 60, ifname lo (In), SYN, ACK
IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 60, ifname lo (In), ACK
IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 52, ifname lo (In), ACK
IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 52, ifname lo (In), FIN, ACK
IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 52, ifname lo (In), RST, ACK
TCP packet: 127.0.0.1:33695 -> 127.0.0.1:40467, len 52, ifname lo, RST, ACK
Packet file: packets-2173-86-select_reuseport:sockhash_IPv4_TCP_LOOPBACK_test_detach_bpf-test.log
#280/87 select_reuseport/sockhash IPv4/TCP LOOPBACK test_detach_bpf:OKThe above block is the log of a test case. It shows every packet of a connection. The captured packets are stored in the file called packets-2173-86-select_reuseport:sockhash_IPv4_TCP_LOOPBACK_test_detach_bpf-test.log.
We have a set of high-level helpers and a test_progs option to simplify the process of enabling the traffic monitor. netns_new() and netns_free() are helpers used to create and delete namespaces while also enabling the traffic monitor for the namespace based on the patterns provided by the "-m" option of test_progs. The value of the "-m" option is a list of patterns used to enable the traffic monitor for a group of tests or a file containing patterns. CI can utilize this option to enable monitoring.
traffic_monitor_start() and traffic_monitor_stop() are low-level functions to start monitoring explicitly. You can have more controls, however high-level helpers are preferred.
The following block is an example that monitors the network traffic of a test case in a network namespace.
struct netns_obj *netns;
...
netns = netns_new("test", true);
if (!ASSERT_TRUE(netns, "netns_new"))
goto err;
... test ...
netns_free(netns);netns_new() will create a network namespace named "test" and bring up "lo" in the namespace. By passing "true" as the 2nd argument, it will set the network namespace of the current process to "test".netns_free() will destroy the namespace, and the process will leave the "test" namespace if the struct netns_obj returned by netns_new() is created with "true" as the 2nd argument. If the name of the test matches the patterns given by the "-m" option, the traffic monitor will be enabled for the "test" namespace as well.
The packet files are located in the directory "/tmp/tmon_pcap/". The directory is intended to be compressed as a file so that developers can download it from the CI.
This feature is enabled only if libpcap is available when building selftests.
---
Changes from v4:
- Use pkg-config to detect libpcap, and enable traffic monitor if there is libpcap.
- Move traffic monitor functions back to network_helper.c, and pass extra parameters to traffic_monitor_start().
- Use flockfile() & funlockfile() to avoid log interleaving.
- Show "In", "Out", "M" ... for captured packets.
- Print a warning message if the user pass a "-m" when libpcap is not available.
- Bring up dev lo in netns_new().
Changes from v3:
- Rebase to the latest tip of bpf-next/for-next
- Change verb back to C string.
Changes from v2:
- Include pcap header files conditionally.
- Move the implementation of traffic monitor to test_progs.c.
- Include test name and namespace as a part of names of packet files.
- Parse and print ICMP(v4|v6) packets.
- Add netns_new() and netns_free() to create and delete network namespaces.
- Make tc_redirect, sockmap_listen and select_reuseport test in a network namespace.
- Add the "-m" option to test_progs to enable traffic monitor for the tests matching the pattern. CI may use this option to enable monitoring for a given set of tests.
Changes from v1:
- Move to calling libpcap directly to capture packets in a background thread.
- Print parsed packet information for TCP and UDP packets.
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v4: https://lore.kernel.org/all/[email protected]/
Kui-Feng Lee (6):
selftests/bpf: Add traffic monitor functions. selftests/bpf: Add the traffic monitor option to test_progs. selftests/bpf: netns_new() and netns_free() helpers. selftests/bpf: Monitor traffic for tc_redirect. selftests/bpf: Monitor traffic for sockmap_listen. selftests/bpf: Monitor traffic for select_reuseport.
tools/testing/selftests/bpf/Makefile | 4 + tools/testing/selftests/bpf/network_helpers.c | 494 ++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 20 + .../bpf/prog_tests/select_reuseport.c | 37 +- .../selftests/bpf/prog_tests/sockmap_listen.c | 8 + .../selftests/bpf/prog_tests/tc_redirect.c | 33 +- tools/testing/selftests/bpf/test_progs.c | 177 ++++++- tools/testing/selftests/bpf/test_progs.h | 6 + 8 files changed, 724 insertions(+), 55 deletions(-)
Signature · 1 line
2.34.1
PATCH v5 1/6 selftests/bpf: Add traffic monitor functions.
Add functions that capture packets and print log in the background. They are supposed to be used for debugging flaky network test cases. A monitored test case should call traffic_monitor_start() to start a thread to capture packets in the background for a given namespace and call traffic_monitor_stop() to stop capturing. (Or, option '-m' implemented by the later patches.)
IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 68, ifname lo (In), SYN
IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 60, ifname lo (In), SYN, ACK
IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 60, ifname lo (In), ACK
IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 52, ifname lo (In), ACK
IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 52, ifname lo (In), FIN, ACK
IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 52, ifname lo (In), RST, ACK
Packet file: packets-2173-86-select_reuseport:sockhash_IPv4_TCP_LOOPBACK_test_detach_bpf-test.log
#280/87 select_reuseport/sockhash IPv4/TCP LOOPBACK test_detach_bpf:OKThe above is the output of an example. It shows the packets of a connection and the name of the file that contains captured packets in the directory /tmp/tmon_pcap. The file can be loaded by tcpdump or wireshark.
This feature only works if libpcap is available. (Could be found by pkg-config)
--- tools/testing/selftests/bpf/Makefile | 4 + tools/testing/selftests/bpf/network_helpers.c | 454 ++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 18 + 3 files changed, 476 insertions(+)
tools/testing/selftests/bpf/Makefile +4 -0
@@ -41,6 +41,10 @@ CFLAGS += -g $(OPT_FLAGS) -rdynamic \ LDFLAGS += $(SAN_LDFLAGS) LDLIBS += $(LIBELF_LIBS) -lz -lrt -lpthread +LDLIBS += $(shell $(PKG_CONFIG) --libs libpcap 2>/dev/null) +CFLAGS += $(shell $(PKG_CONFIG) --cflags libpcap 2>/dev/null) +CFLAGS += $(shell $(PKG_CONFIG) --exists libpcap 2>/dev/null && echo "-DTRAFFIC_MONITOR=1") + # The following tests perform type punning and they may break strict # aliasing rules, which are exploited by both GCC and clang by default # while optimizing. This can lead to broken programs.
tools/testing/selftests/bpf/network_helpers.c +454 -0
473 lines not on this page · raw message
tools/testing/selftests/bpf/network_helpers.h +18 -0
@@ -136,4 +136,22 @@ static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, return csum_fold((__u32)s); } +struct tmonitor_ctx ; + +#ifdef TRAFFIC_MONITOR +struct tmonitor_ctx *traffic_monitor_start (const char *netns,const char *test_name, +const char *subtest_name); +void traffic_monitor_stop (struct tmonitor_ctx *ctx); +#else +static inline struct tmonitor_ctx *traffic_monitor_start (const char *netns,const char *test_name, +const char *subtest_name) +{ +return (struct tmonitor_ctx *)-1 ; +} + +static inline void traffic_monitor_stop (struct tmonitor_ctx *ctx) +{ +} +#endif +#endif
Signature · 1 line
2.34.1
Re: [PATCH bpf-next v5 1/6] selftests/bpf: Add traffic monitor functions.
Quoted 534 lines · Kui-Feng Lee
Add functions that capture packets and print log in the background. They are supposed to be used for debugging flaky network test cases. A monitored test case should call
traffic_monitor_start()to start a thread to capture packets in the background for a given namespace and calltraffic_monitor_stop()to stop capturing. (Or, option '-m' implemented by the later patches.)IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 68, ifname lo (In), SYN IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 60, ifname lo (In), SYN, ACK IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 60, ifname lo (In), ACK IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 52, ifname lo (In), ACK IPv4 TCP packet: 127.0.0.1:48423 -> 127.0.0.1:40991, len 52, ifname lo (In), FIN, ACK IPv4 TCP packet: 127.0.0.1:40991 -> 127.0.0.1:48423, len 52, ifname lo (In), RST, ACK Packet file: packets-2173-86-select_reuseport:sockhash_IPv4_TCP_LOOPBACK_test_detach_bpf-test.log #280/87 select_reuseport/sockhash IPv4/TCP LOOPBACK test_detach_bpf:OKThe above is the output of an example. It shows the packets of a connection and the name of the file that contains captured packets in the directory
/tmp/tmon_pcap. The file can be loaded by tcpdump or wireshark.This feature only works if libpcap is available. (Could be found by pkg-config)
Signed-off-by Kui-Feng Lee <[email protected]>--- tools/testing/selftests/bpf/Makefile | 4 + tools/testing/selftests/bpf/network_helpers.c | 454 ++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 18 + 3 files changed, 476 insertions(+)tools/testing/selftests/bpf/Makefile +4
-0@@ -41,6 +41,10 @@ CFLAGS += -g $(OPT_FLAGS) -rdynamic \ LDFLAGS += $(SAN_LDFLAGS) LDLIBS += $(LIBELF_LIBS) -lz -lrt -lpthread +LDLIBS += $(shell $(PKG_CONFIG) --libs libpcap 2>/dev/null) +CFLAGS += $(shell $(PKG_CONFIG) --cflags libpcap 2>/dev/null) +CFLAGS += $(shell $(PKG_CONFIG) --exists libpcap 2>/dev/null && echo "-DTRAFFIC_MONITOR=1") + # The following tests perform type punning and they may break strict # aliasing rules, which are exploited by both GCC and clang by default # while optimizing. This can lead to broken programs.tools/testing/selftests/bpf/network_helpers.c +454
-0@@ -11,6 +11,7 @@#include <arpa/inet.h> #include <sys/mount.h> #include <sys/stat.h> +#include <sys/types.h> #include <sys/un.h> #include <linux/err.h> @@ -18,10 +19,22 @@#include <linux/in6.h> #include <linux/limits.h> +#include <linux/ip.h> +#include <linux/udp.h> +#include <netinet/tcp.h> +#include <net/if.h> +#include "bpf_util.h" #include "network_helpers.h" #include "test_progs.h" +#ifdef TRAFFIC_MONITOR +/* Prevent pcap.h from including pcap/bpf.h and causing conflicts */ +#define PCAP_DONT_INCLUDE_PCAP_BPF_H 1 +#include <pcap/pcap.h> +#include <pcap/dlt.h> +#endif +#ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262#endif @@ -660,3 +673,444 @@ int send_recv_data(int lfd, int fd, uint32_t total_bytes)return err; } + +#ifdef TRAFFIC_MONITOR +struct tmonitor_ctx { +pcap_t *pcap; +pcap_dumper_t *dumper; +pthread_t thread; +int wake_fd_r; +int wake_fd_w; + +bool done; +char pkt_fname[PATH_MAX ]; +int pcap_fd; +}; + +/* Is this packet captured with a Ethernet protocol type? */ +static bool is_ethernet (const u_char *packet) +{ +u16 arphdr_type; + +memcpy (&arphdr_type, packet +8 ,2 ); + arphdr_type =ntohs (arphdr_type); + +/* Except the following cases, the protocol type contains the +* Ethernet protocol type for the packet. +* +* https://www.tcpdump.org/linktypes/LINKTYPE_LINUX_SLL2.html +*/ +switch (arphdr_type) { +case 770 :/* ARPHRD_FRAD */ +case 778 :/* ARPHDR_IPGRE */ +case 803 :/* ARPHRD_IEEE80211_RADIOTAP */ +return false; + } +return true; +} + +static const char *const pkt_types[] = { +"In" , +"B" ,/* Broadcast */ +"M" ,/* Multicast */ +"C" ,/* Captured with the promiscuous mode */ +"Out" , +}; + +static const char *pkt_type_str (u16 pkt_type) +{ +if (pkt_type <ARRAY_SIZE (pkt_types)) +return pkt_types[pkt_type]; +return "Unknown" ; +} + +/* Show the information of the transport layer in the packet */ +static void show_transport (const u_char *packet,u16 len,u32 ifindex, +const char *src_addr,const char *dst_addr, +u16 proto,bool ipv6,u8 pkt_type) +{ +char *ifname, _ifname[IF_NAMESIZE ]; +const char *transport_str; +u16 src_port, dst_port; +struct udphdr *udp; +struct tcphdr *tcp; + + ifname =if_indextoname (ifindex, _ifname); +if (!ifname) { +snprintf (_ifname,sizeof (_ifname),"unknown(%d)" , ifindex); + ifname = _ifname; + } + +if (proto ==IPPROTO_UDP ) { + udp = (struct udphdr *)packet; + src_port =ntohs (udp->source); + dst_port =ntohs (udp->dest); + transport_str ="UDP" ; + }else if (proto ==IPPROTO_TCP ) { + tcp = (struct tcphdr *)packet; + src_port =ntohs (tcp->source); + dst_port =ntohs (tcp->dest); + transport_str ="TCP" +; + }else if (proto ==IPPROTO_ICMP ) { +printf ("IPv4 ICMP packet: %s -> %s, len %d, type %d, code %d, ifname %s (%s)\n" , + src_addr, dst_addr, len, packet[0 ], packet[1 ], ifname, +pkt_type_str (pkt_type)); +return ; + }else if (proto ==IPPROTO_ICMPV6 ) { +printf ("IPv6 ICMPv6 packet: %s -> %s, len %d, type %d, code %d, ifname %s (%s)\n" , + src_addr, dst_addr, len, packet[0 ], packet[1 ], ifname, +pkt_type_str (pkt_type)); +return ; + }else { +printf ("%s (proto %d): %s -> %s, ifname %s (%s)\n" , + ipv6 ?"IPv6" :"IPv4" , proto, src_addr, dst_addr, + ifname,pkt_type_str (pkt_type)); +return ; + } + +/* TCP */ + +flockfile (stdout); +if (ipv6) +printf ("IPv6 %s packet: [%s]:%d -> [%s]:%d, len %d, ifname %s (%s)" , + transport_str, src_addr, src_port, + dst_addr, dst_port, len, ifname,pkt_type_str (pkt_type)); +else +printf ("IPv4 %s packet: %s:%d -> %s:%d, len %d, ifname %s (%s)" , + transport_str, src_addr, src_port, + dst_addr, dst_port, len, ifname,pkt_type_str (pkt_type)); + +if (proto ==IPPROTO_TCP ) { +if (tcp->fin) +printf (", FIN" ); +if (tcp->syn) +printf (", SYN" ); +if (tcp->rst) +printf (", RST" ); +if (tcp->ack) +printf (", ACK" ); + } + +printf ("\n" ); +funlockfile (stdout); +} + +static void show_ipv6_packet (const u_char *packet,u32 ifindex,u8 pkt_type) +{ +char src_str[INET6_ADDRSTRLEN ], dst_str[INET6_ADDRSTRLEN ]; +struct ipv6hdr *pkt = (struct ipv6hdr *)packet; +struct in6_addr src; +struct in6_addr dst; +u_char proto; + +memcpy (&src, &pkt->saddr,sizeof (src)); +memcpy (&dst, &pkt->daddr,sizeof (dst)); +inet_ntop (AF_INET6 , &src, src_str,sizeof (src_str)); +inet_ntop (AF_INET6 , &dst, dst_str,sizeof (dst_str)); + proto = pkt->nexthdr; +show_transport (packet +sizeof (struct ipv6hdr ), +ntohs (pkt->payload_len), + ifindex, src_str, dst_str, proto, true, pkt_type); +} + +static void show_ipv4_packet (const u_char *packet,u32 ifindex,u8 pkt_type) +{ +char src_str[INET_ADDRSTRLEN ], dst_str[INET_ADDRSTRLEN ]; +struct iphdr *pkt = (struct iphdr *)packet; +struct in_addr src; +struct in_addr dst; +u_char proto; + +memcpy (&src, &pkt->saddr,sizeof (src)); +memcpy (&dst, &pkt->daddr,sizeof (dst)); +inet_ntop (AF_INET , &src, src_str,sizeof (src_str)); +inet_ntop (AF_INET , &dst, dst_str,sizeof (dst_str)); + proto = pkt->protocol; +show_transport (packet +sizeof (struct iphdr ), +ntohs (pkt->tot_len), + ifindex, src_str, dst_str, proto, false, pkt_type); +} + +static void *traffic_monitor_thread (void *arg) +{ +char *ifname, _ifname[IF_NAMESIZE ]; +const u_char *packet, *payload; +struct tmonitor_ctx *ctx = arg; +pcap_dumper_t *dumper = ctx->dumper; +int fd = ctx->pcap_fd, nfds, r; +int wake_fd = ctx->wake_fd_r; +struct pcap_pkthdr header; +pcap_t *pcap = ctx->pcap; +u32 ifindex; +fd_set fds; +u16 proto; +u8 ptype; + + nfds = (fd > wake_fd ? fd : wake_fd) +1 ; +FD_ZERO (&fds); + +while (!ctx->done) { +FD_SET (fd, &fds); +FD_SET (wake_fd, &fds); + r =select (nfds, &fds,NULL ,NULL ,NULL ); +if (!r) +continue ; +if (r <0 ) { +if (errno ==EINTR ) +continue ; +log_err ("Fail to select on pcap fd and wake fd: %s" ,strerror (errno)); +break ; + } + + packet =pcap_next (pcap, &header); +if (!packet) +continue ; + +/* According to the man page of pcap_dump(), first argument +* is the pcap_dumper_t pointer even it's argument type is +* u_char *. +*/ +pcap_dump ((u_char *)dumper, &header, packet); + +/* Not sure what other types of packets look like. Here, we +* parse only Ethernet and compatible packets. +*/ +if (!is_ethernet (packet)) { +printf ("Packet captured\n" ); +continue ; + } + +/* Skip SLL2 header +* https://www.tcpdump.org/linktypes/LINKTYPE_LINUX_SLL2.html +* +* Although the document doesn't mention that, the payload +* doesn't include the Ethernet header. The payload starts +* from the first byte of the network layer header. +*/ + payload = packet +20 ; + +memcpy (&proto, packet,2 ); + proto =ntohs (proto); +memcpy (&ifindex, packet +4 ,4 ); + ifindex =ntohl (ifindex); + ptype = packet[10 ]; + +if (proto ==ETH_P_IPV6 ) { +show_ipv6_packet (payload, ifindex, ptype); + }else if (proto ==ETH_P_IP ) { +show_ipv4_packet (payload, ifindex, ptype); + }else { + ifname =if_indextoname (ifindex, _ifname); +if (!ifname) { +snprintf (_ifname,sizeof (_ifname),"unknown(%d)" , ifindex); + ifname = _ifname; + } + +printf ("Unknown network protocol type %x, ifname %s (%s)\n" , + proto, ifname,pkt_type_str (ptype)); + } + } + +return NULL ; +} + +/* Prepare the pcap handle to capture packets. +* +* This pcap is non-blocking and immediate mode is enabled to receive +* captured packets as soon as possible. The snaplen is set to 1024 bytes +* to limit the size of captured content. The format of the link-layer +* header is set to DLT_LINUX_SLL2 to enable handling various link-layer +* technologies. +*/ +static pcap_t *traffic_monitor_prepare_pcap (void ) +{ +char errbuf[PCAP_ERRBUF_SIZE ]; +pcap_t *pcap; +int r; + +/* Listen on all NICs in the namespace */ + pcap =pcap_create ("any" , errbuf); +if (!pcap) { +log_err ("Failed to open pcap: %s" , errbuf); +return NULL ; + } +/* Limit the size of the packet (first N bytes) */ + r =pcap_set_snaplen (pcap,1024 ); +if (r) { +log_err ("Failed to set snaplen: %s" ,pcap_geterr (pcap)); + goto error; + } +/* To receive packets as fast as possible */ + r =pcap_set_immediate_mode (pcap,1 ); +if (r) { +log_err ("Failed to set immediate mode: %s" ,pcap_geterr (pcap)); + goto error; + } + r =pcap_setnonblock (pcap,1 , errbuf); +if (r) { +log_err ("Failed to set nonblock: %s" , errbuf); + goto error; + } + r =pcap_activate (pcap); +if (r) { +log_err ("Failed to activate pcap: %s" ,pcap_geterr (pcap)); + goto error; + } +/* Determine the format of the link-layer header */ + r =pcap_set_datalink (pcap,DLT_LINUX_SLL2 ); +if (r) { +log_err ("Failed to set datalink: %s" ,pcap_geterr (pcap)); + goto error; + } + +return pcap; +error: +pcap_close (pcap); +return NULL ; +} + +static void encode_test_name (char *buf,size_t len,const char *test_name,const char *subtest_name) +{ +char *p; + +if (subtest_name) +snprintf (buf, len,"%s:%s" , test_name, subtest_name); +else +snprintf (buf, len,"%s" , test_name); +while ((p =strchr (buf,'/' ))) + *p ='_' ; +while ((p =strchr (buf,' ' ))) + *p ='_' ; +} + +#define PCAP_DIR "/tmp/tmon_pcap" + +/* Start to monitor the network traffic in the given network namespace. +* +* netns: the name of the network namespace to monitor. If NULL, the +* current network namespace is monitored. +* test_name: the name of the running test. +* subtest_name: the name of the running subtest if there is. It should be +* NULL if it is not a subtest. +* +* This function will start a thread to capture packets going through NICs +* in the give network namespace. +*/ +struct tmonitor_ctx *traffic_monitor_start (const char *netns,const char *test_name, +const char *subtest_name) +{ +struct tmonitor_ctx *ctx =NULL ; +struct nstoken *nstoken =NULL ; +int pipefd[2 ] = {-1 ,-1 }; +char test_name_buf[64 ]; +static int tmon_seq; +int r; + +if (netns) { + nstoken =open_netns (netns); +if (!nstoken) +return NULL ; + } + ctx =malloc (sizeof (*ctx)); +if (!ctx) { +log_err ("Failed to malloc ctx" ); + goto fail_ctx; + } +memset (ctx,0 ,sizeof (*ctx)); + +encode_test_name (test_name_buf,sizeof (test_name_buf), test_name, subtest_name); +snprintf (ctx->pkt_fname,sizeof (ctx->pkt_fname), +PCAP_DIR "/packets-%d-%d-%s-%s.log" ,getpid (), tmon_seq++, + test_name_buf, netns ? netns :"unknown" ); + + r =mkdir (PCAP_DIR ,0755 ); +if (r && errno !=EEXIST ) { +log_err ("Failed to create " PCAP_DIR ); + goto fail_pcap; + } + + ctx->pcap =traffic_monitor_prepare_pcap (); +if (!ctx->pcap) + goto fail_pcap; + ctx->pcap_fd =pcap_get_selectable_fd (ctx->pcap); +if (ctx->pcap_fd <0 ) { +log_err ("Failed to get pcap fd" ); + goto fail_dumper; + } + +/* Create a packet file */ + ctx->dumper =pcap_dump_open (ctx->pcap, ctx->pkt_fname); +if (!ctx->dumper) { +log_err ("Failed to open pcap dump: %s" , ctx->pkt_fname); + goto fail_dumper; + } + +/* Create a pipe to wake up the monitor thread */ + r =pipe (pipefd); +if (r) { +log_err ("Failed to create pipe: %s" ,strerror (errno)); + goto fail; + } + ctx->wake_fd_r = pipefd[0 ]; + ctx->wake_fd_w = pipefd[1 ]; + + r =pthread_create (&ctx->thread,NULL , traffic_monitor_thread, ctx); +if (r) { +log_err ("Failed to create thread: %s" ,strerror (r)); + goto fail; + } + +close_netns (nstoken); + +return ctx; + +fail: +close (pipefd[0 ]); +close (pipefd[1 ]); + +pcap_dump_close (ctx->dumper); +unlink (ctx->pkt_fname); + +fail_dumper: +pcap_close (ctx->pcap); + +fail_pcap: +free (ctx); + +fail_ctx: +close_netns (nstoken); + +return NULL ; +} + +static void traffic_monitor_release (struct tmonitor_ctx *ctx) +{ +pcap_close (ctx->pcap); +pcap_dump_close (ctx->dumper); + +close (ctx->wake_fd_r); +close (ctx->wake_fd_w); + +free (ctx); +} + +/* Stop the network traffic monitor. +* +* ctx: the context returned by traffic_monitor_start() +*/ +void traffic_monitor_stop (struct tmonitor_ctx *ctx) +{ +if (!ctx) +return ; + +/* Stop the monitor thread */ + ctx->done = true; +write (ctx->wake_fd_w,"x" ,1 ); +pthread_join (ctx->thread,NULL ); + +printf ("Packet file: %s\n" ,strrchr (ctx->pkt_fname,'/' ) +1 ); + +traffic_monitor_release (ctx); +} +#endif /* TRAFFIC_MONITOR */ tools/testing/selftests/bpf/network_helpers.h +2
-0@@ -136,4 +136,22 @@ static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,return csum_fold ((__u32 )s); } +struct tmonitor_ctx ; +
tools/testing/selftests/bpf/network_helpers.h static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, · line 150
Quoted 10 lines
tools/testing/selftests/bpf/network_helpers.h +10
-0+#ifdef TRAFFIC_MONITOR +struct tmonitor_ctx *traffic_monitor_start (const char *netns,const char *test_name, +const char *subtest_name); +void traffic_monitor_stop (struct tmonitor_ctx *ctx); +#else +static inline struct tmonitor_ctx *traffic_monitor_start (const char *netns,const char *test_name, +const char *subtest_name) +{ +return (struct tmonitor_ctx *)-1 ; +}
According to the discussion with Martin, this function should return NULL. And, "-m" would be removed when TRAFFIC_MONITOR is not defined.
Quoted 7 lines
tools/testing/selftests/bpf/network_helpers.h +6
-0+ +static inline void traffic_monitor_stop (struct tmonitor_ctx *ctx) +{ +} +#endif +#endif
PATCH v5 2/6 selftests/bpf: Add the traffic monitor option to test_progs.
In reply to Kui-Feng LeeAdd option '-m' to test_progs to accept names and patterns of test cases. This option will be used later to enable traffic monitor that capture network packets generated by test cases.
--- tools/testing/selftests/bpf/test_progs.c | 87 +++++++++++++++++------- tools/testing/selftests/bpf/test_progs.h | 2 + 2 files changed, 65 insertions(+), 24 deletions(-)
tools/testing/selftests/bpf/test_progs.c +63 -24
@@ -155,6 +155,7 @@ struct prog_test_def {void (*run_serial_test)(void );bool should_run;bool need_cgroup_cleanup; +bool should_tmon; };/* Override C runtime library's usleep() implementation to ensure nanosleep()
@@ -192,46 +193,59 @@ static bool should_run(struct test_selector *sel, int num, const char *name)return num < sel->num_set_len && sel->num_set[num]; } -static bool should_run_subtest (struct test_selector *sel, -struct test_selector *subtest_sel, -int subtest_num, -const char *test_name, -const char *subtest_name) +static bool match_subtest (struct test_filter_set *filter, +const char *test_name, +const char *subtest_name) {int i, j; -for (i =0 ; i < sel->blacklist.cnt; i++) { -if (glob_match (test_name, sel->blacklist.tests[i].name)) { -if (!sel->blacklist.tests[i].subtest_cnt) -return false; - -for (j =0 ; j < sel->blacklist.tests[i].subtest_cnt; j++) { -if (glob_match (subtest_name, - sel->blacklist.tests[i].subtests[j])) -return false; - } - } - } - -for (i =0 ; i < sel->whitelist.cnt; i++) { -if (glob_match (test_name, sel->whitelist.tests[i].name)) { -if (!sel->whitelist.tests[i].subtest_cnt) +for (i =0 ; i < filter->cnt; i++) { +if (glob_match (test_name, filter->tests[i].name)) { +if (!filter->tests[i].subtest_cnt)return true; -for (j =0 ; j < sel->whitelist.tests[i].subtest_cnt; j++) { +for (j =0 ; j < filter->tests[i].subtest_cnt; j++) {if (glob_match (subtest_name, - sel->whitelist.tests[i].subtests[j])) + filter->tests[i].subtests[j]))return true; } } } +return false; +} + +static bool should_run_subtest (struct test_selector *sel, +struct test_selector *subtest_sel, +int subtest_num, +const char *test_name, +const char *subtest_name) +{ +if (match_subtest (&sel->blacklist, test_name, subtest_name)) +return false; + +if (match_subtest (&sel->whitelist, test_name, subtest_name)) +return true; +if (!sel->whitelist.cnt && !subtest_sel->num_set)return true;return subtest_num < subtest_sel->num_set_len && subtest_sel->num_set[subtest_num]; } +static bool should_tmon (struct test_selector *sel,int num,const char *name) +{ +int i; + +for (i =0 ; i < sel->whitelist.cnt; i++) { +if (glob_match (name, sel->whitelist.tests[i].name) && + !sel->whitelist.tests[i].subtest_cnt) +return true; + } + +return false; +} +static char *test_result (bool failed,bool skipped) {return failed ?"FAIL" : (skipped ?"SKIP" :"OK" );
@@ -488,6 +502,10 @@ bool test__start_subtest(const char *subtest_name)return false; } + subtest_state->should_tmon =match_subtest (&env.tmon_selector.whitelist, + test->test_name, + subtest_name); + env.subtest_state = subtest_state;stdio_hijack_init (&subtest_state->log_buf, &subtest_state->log_cnt);
@@ -667,7 +685,8 @@ enum ARG_KEYS {ARG_TEST_NAME_GLOB_DENYLIST ='d' ,ARG_NUM_WORKERS ='j' ,ARG_DEBUG =-1 , -ARG_JSON_SUMMARY ='J' +ARG_JSON_SUMMARY ='J' , + ARG_TRAFFIC_MONITOR = 'm', }; static const struct argp_option opts[] = {
@@ -694,6 +713,8 @@ static const struct argp_option opts[] = { {"debug" ,ARG_DEBUG ,NULL ,0 , "print extra debug information for test_progs." }, { "json-summary", ARG_JSON_SUMMARY, "FILE", 0, "Write report in json format to this file."}, + { "traffic-monitor", ARG_TRAFFIC_MONITOR, "NAMES", 0, + "Monitor network traffic of tests with name matching the pattern (supports '*' wildcard)." }, {}, };
@@ -905,6 +926,20 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)break ;case ARGP_KEY_END :break ; +case ARG_TRAFFIC_MONITOR : +#ifndef TRAFFIC_MONITOR +fprintf (stderr,"Traffic monitor is disabled.\n" ); +#else +if (arg[0 ] =='@' ) + err =parse_test_list_file (arg +1 , + &env->tmon_selector.whitelist, + true); +else + err =parse_test_list (arg, + &env->tmon_selector.whitelist, + true); +#endif +break ;default :return ARGP_ERR_UNKNOWN ; }
@@ -1736,6 +1771,9 @@ int main(int argc, char **argv) test->test_num, test->test_name, test->test_name, test->test_name);exit (EXIT_ERR_SETUP_INFRA ); } +if (test->should_run) + test->should_tmon =should_tmon (&env.tmon_selector, + test->test_num, test->test_name); }/* ignore workers if we are just listing */
@@ -1820,6 +1858,7 @@ int main(int argc, char **argv)free_test_selector (&env.test_selector);free_test_selector (&env.subtest_selector); +free_test_selector (&env.tmon_selector);free_test_states ();if (env.succ_cnt + env.fail_cnt + env.skip_cnt ==0 )
tools/testing/selftests/bpf/test_progs.h +2 -0
@@ -74,6 +74,7 @@ struct subtest_state {int error_cnt;bool skipped;bool filtered; +bool should_tmon;FILE *stdout_saved; };
@@ -98,6 +99,7 @@ struct test_state {struct test_env {struct test_selector test_selector;struct test_selector subtest_selector; +struct test_selector tmon_selector;bool verifier_stats;bool debug;enum verbosity verbosity;
Signature · 1 line
2.34.1
PATCH v5 3/6 selftests/bpf: netns_new() and netns_free() helpers.
In reply to Kui-Feng Leenetns_new()/netns_free() create/delete network namespaces. They support the option '-m' of test_progs to start/stop traffic monitor for the network namespace being created for matched tests.
--- tools/testing/selftests/bpf/network_helpers.c | 40 +++++++++ tools/testing/selftests/bpf/network_helpers.h | 2 + tools/testing/selftests/bpf/test_progs.c | 90 +++++++++++++++++++ tools/testing/selftests/bpf/test_progs.h | 4 + 4 files changed, 136 insertions(+)
tools/testing/selftests/bpf/network_helpers.c +40 -0
@@ -445,6 +445,46 @@ char *ping_command(int family)return "ping" ; } +int make_netns (const char *name) +{ +char *cmd; +int r; + + r =asprintf (&cmd,"ip netns add %s" , name); +if (r <0 ) { +log_err ("Failed to malloc cmd" ); +return -1 ; + } + + r =system (cmd); +if (r >0 ) +/* exit code */ + r = -r; + +free (cmd); +return r; +} + +int remove_netns (const char *name) +{ +char *cmd; +int r; + + r =asprintf (&cmd,"ip netns del %s >/dev/null 2>&1" , name); +if (r <0 ) { +log_err ("Failed to malloc cmd" ); +return -1 ; + } + + r =system (cmd); +if (r >0 ) +/* exit code */ + r = -r; + +free (cmd); +return r; +} +struct nstoken {int orig_netns_fd; };
tools/testing/selftests/bpf/network_helpers.h +2 -0
@@ -93,6 +93,8 @@ struct nstoken;struct nstoken *open_netns (const char *name);void close_netns (struct nstoken *token);int send_recv_data (int lfd,int fd,uint32_t total_bytes); +int make_netns (const char *name); +int remove_netns (const char *name);static __u16 csum_fold (__u32 csum) {
tools/testing/selftests/bpf/test_progs.c +90 -0
102 lines not on this page · raw message
tools/testing/selftests/bpf/test_progs.h +4 -0
@@ -430,6 +430,10 @@ int write_sysctl(const char *sysctl, const char *value);int get_bpf_max_tramp_links_from (struct btf *btf);int get_bpf_max_tramp_links (void ); +struct netns_obj ; +struct netns_obj *netns_new (const char *name,bool open); +void netns_free (struct netns_obj *netns); +#ifdef __x86_64__#define SYS_NANOSLEEP_KPROBE_NAME "__x64_sys_nanosleep"#elif defined(__s390x__)
Signature · 1 line
2.34.1
PATCH v5 4/6 selftests/bpf: Monitor traffic for tc_redirect.
In reply to Kui-Feng LeeEnable traffic monitoring for the test case tc_redirect.
--- .../selftests/bpf/prog_tests/tc_redirect.c | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-)
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +26 -7
@@ -68,6 +68,7 @@ __FILE__, __LINE__, strerror(errno), ##__VA_ARGS__)static const char *const namespaces[] = {NS_SRC ,NS_FWD ,NS_DST ,NULL }; +static struct netns_obj *netns_objs[3 ];static int write_file (const char *path,const char *newval) {
@@ -87,27 +88,45 @@ static int write_file(const char *path, const char *newval)static int netns_setup_namespaces (const char *verb) { +struct netns_obj **ns_obj = netns_objs;const char *const *ns = namespaces; -char cmd[128 ];while (*ns) { -snprintf (cmd,sizeof (cmd),"ip netns %s %s" , verb, *ns); -if (!ASSERT_OK (system (cmd), cmd)) -return -1 ; +if (strcmp (verb,"add" ) ==0 ) { + *ns_obj =netns_new (*ns, false); +if (!*ns_obj) { +log_err ("netns_new failed" ); +return -1 ; + } + }else { +if (!*ns_obj) { +log_err ("netns_obj is NULL" ); +return -1 ; + } +netns_free (*ns_obj); + *ns_obj =NULL ; + } ns++; + ns_obj++; }return 0 ; }static void netns_setup_namespaces_nofail (const char *verb) { +struct netns_obj **ns_obj = netns_objs;const char *const *ns = namespaces; -char cmd[128 ];while (*ns) { -snprintf (cmd,sizeof (cmd),"ip netns %s %s > /dev/null 2>&1" , verb, *ns); -system (cmd); +if (strcmp (verb,"add" ) ==0 ) { + *ns_obj =netns_new (*ns, false); + }else { +if (*ns_obj) +netns_free (*ns_obj); + *ns_obj =NULL ; + } ns++; + ns_obj++; } }
Signature · 1 line
2.34.1
PATCH v5 5/6 selftests/bpf: Monitor traffic for sockmap_listen.
In reply to Kui-Feng LeeEnable traffic monitor for each subtest of sockmap_listen.
--- tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +8 -0
@@ -1925,6 +1925,7 @@ static void test_udp_unix_redir(struct test_sockmap_listen *skel, struct bpf_map int family) {const char *family_name, *map_name; +struct netns_obj *netns;char s[MAX_TEST_NAME ]; family_name =family_str (family);
@@ -1932,8 +1933,15 @@ static void test_udp_unix_redir(struct test_sockmap_listen *skel, struct bpf_mapsnprintf (s,sizeof (s),"%s %s %s" , map_name, family_name, __func__);if (!test__start_subtest (s))return ; + + netns =netns_new ("test" , true); +if (!ASSERT_OK_PTR (netns,"netns_new" )) +return ; +inet_unix_skb_redir_to_connected (skel, map, family);unix_inet_skb_redir_to_connected (skel, map, family); + +netns_free (netns); } static void run_tests(struct test_sockmap_listen *skel, struct bpf_map *map,
Signature · 1 line
2.34.1
PATCH v5 6/6 selftests/bpf: Monitor traffic for select_reuseport.
In reply to Kui-Feng LeeEnable traffic monitoring for the subtests of select_reuseport.
--- .../bpf/prog_tests/select_reuseport.c | 37 +++++++------------ 1 file changed, 13 insertions(+), 24 deletions(-)
tools/testing/selftests/bpf/prog_tests/select_reuseport.c +13 -24
@@ -37,9 +37,7 @@ static int sk_fds[REUSEPORT_ARRAY_SIZE];static int reuseport_array =-1 , outer_map =-1 ;static enum bpf_map_type inner_map_type;static int select_by_skb_data_prog; -static int saved_tcp_syncookie =-1 ;static struct bpf_object *obj; -static int saved_tcp_fo =-1 ;static __u32 index_zero;static int epfd;
@@ -193,14 +191,6 @@ static int write_int_sysctl(const char *sysctl, int v)return 0 ; } -static void restore_sysctls (void ) -{ -if (saved_tcp_fo !=-1 ) -write_int_sysctl (TCP_FO_SYSCTL , saved_tcp_fo); -if (saved_tcp_syncookie !=-1 ) -write_int_sysctl (TCP_SYNCOOKIE_SYSCTL , saved_tcp_syncookie); -} -static int enable_fastopen (void ) {int fo;
@@ -793,6 +783,7 @@ static void test_config(int sotype, sa_family_t family, bool inany)TEST_INIT (test_pass_on_err), TEST_INIT(test_detach_bpf), }; +struct netns_obj *netns;char s[MAX_TEST_NAME ];const struct test *t;
@@ -808,9 +799,21 @@ static void test_config(int sotype, sa_family_t family, bool inany)if (!test__start_subtest (s))continue ; + netns =netns_new ("test" , true); +if (!ASSERT_OK_PTR (netns,"netns_new" )) +continue ; + +if (CHECK_FAIL (enable_fastopen ())) + goto out; +if (CHECK_FAIL (disable_syncookie ())) + goto out; +setup_per_test (sotype, family, inany, t->no_inner_map); t->fn (sotype, family);cleanup_per_test (t->no_inner_map); + +out: +netns_free (netns); } }
@@ -850,21 +853,7 @@ void test_map_type(enum bpf_map_type mt)void serial_test_select_reuseport (void ) { - saved_tcp_fo =read_int_sysctl (TCP_FO_SYSCTL ); -if (saved_tcp_fo <0 ) - goto out; - saved_tcp_syncookie =read_int_sysctl (TCP_SYNCOOKIE_SYSCTL ); -if (saved_tcp_syncookie <0 ) - goto out; - -if (enable_fastopen ()) - goto out; -if (disable_syncookie ()) - goto out; -test_map_type (BPF_MAP_TYPE_REUSEPORT_SOCKARRAY );test_map_type (BPF_MAP_TYPE_SOCKMAP );test_map_type (BPF_MAP_TYPE_SOCKHASH ); -out: -restore_sysctls (); }
Signature · 1 line
2.34.1