Skip to content

Commit 1badc27

Browse files
ameryhunggregkh
authored andcommitted
selftests/bpf: Fix stdout race condition in traffic monitor
[ Upstream commit b99f27e ] Fix a race condition between the main test_progs thread and the traffic monitoring thread. The traffic monitor thread tries to print a line using multiple printf and use flockfile() to prevent the line from being torn apart. Meanwhile, the main thread doing io redirection can reassign or close stdout when going through tests. A deadlock as shown below can happen. main traffic_monitor_thread ==== ====================== show_transport() -> flockfile(stdout) stdio_hijack_init() -> stdout = open_memstream(log_buf, log_cnt); ... env.subtest_state->stdout_saved = stdout; ... funlockfile(stdout) stdio_restore_cleanup() -> fclose(env.subtest_state->stdout_saved); After the traffic monitor thread lock stdout, A new memstream can be assigned to stdout by the main thread. Therefore, the traffic monitor thread later will not be able to unlock the original stdout. As the main thread tries to access the old stdout, it will hang indefinitely as it is still locked by the traffic monitor thread. The deadlock can be reproduced by running test_progs repeatedly with traffic monitor enabled: for ((i=1;i<=100;i++)); do ./test_progs -a flow_dissector_skb* -m '*' done Fix this by only calling printf once and remove flockfile()/funlockfile(). Signed-off-by: Amery Hung <ameryhung@gmail.com> Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org> Link: https://patch.msgid.link/20250213233217.553258-1-ameryhung@gmail.com Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent caa559d commit 1badc27

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

tools/testing/selftests/bpf/network_helpers.c

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -771,12 +771,13 @@ static const char *pkt_type_str(u16 pkt_type)
771771
return "Unknown";
772772
}
773773

774+
#define MAX_FLAGS_STRLEN 21
774775
/* Show the information of the transport layer in the packet */
775776
static void show_transport(const u_char *packet, u16 len, u32 ifindex,
776777
const char *src_addr, const char *dst_addr,
777778
u16 proto, bool ipv6, u8 pkt_type)
778779
{
779-
char *ifname, _ifname[IF_NAMESIZE];
780+
char *ifname, _ifname[IF_NAMESIZE], flags[MAX_FLAGS_STRLEN] = "";
780781
const char *transport_str;
781782
u16 src_port, dst_port;
782783
struct udphdr *udp;
@@ -817,29 +818,21 @@ static void show_transport(const u_char *packet, u16 len, u32 ifindex,
817818

818819
/* TCP or UDP*/
819820

820-
flockfile(stdout);
821+
if (proto == IPPROTO_TCP)
822+
snprintf(flags, MAX_FLAGS_STRLEN, "%s%s%s%s",
823+
tcp->fin ? ", FIN" : "",
824+
tcp->syn ? ", SYN" : "",
825+
tcp->rst ? ", RST" : "",
826+
tcp->ack ? ", ACK" : "");
827+
821828
if (ipv6)
822-
printf("%-7s %-3s IPv6 %s.%d > %s.%d: %s, length %d",
829+
printf("%-7s %-3s IPv6 %s.%d > %s.%d: %s, length %d%s\n",
823830
ifname, pkt_type_str(pkt_type), src_addr, src_port,
824-
dst_addr, dst_port, transport_str, len);
831+
dst_addr, dst_port, transport_str, len, flags);
825832
else
826-
printf("%-7s %-3s IPv4 %s:%d > %s:%d: %s, length %d",
833+
printf("%-7s %-3s IPv4 %s:%d > %s:%d: %s, length %d%s\n",
827834
ifname, pkt_type_str(pkt_type), src_addr, src_port,
828-
dst_addr, dst_port, transport_str, len);
829-
830-
if (proto == IPPROTO_TCP) {
831-
if (tcp->fin)
832-
printf(", FIN");
833-
if (tcp->syn)
834-
printf(", SYN");
835-
if (tcp->rst)
836-
printf(", RST");
837-
if (tcp->ack)
838-
printf(", ACK");
839-
}
840-
841-
printf("\n");
842-
funlockfile(stdout);
835+
dst_addr, dst_port, transport_str, len, flags);
843836
}
844837

845838
static void show_ipv6_packet(const u_char *packet, u32 ifindex, u8 pkt_type)

0 commit comments

Comments
 (0)