[v3] Squash to "selftests: bpf: verify ca_name of struct mptcp_sock"

[PATCH mptcp-next v3] Squash to "selftests: bpf: verify ca_name of struct mptcp_sock"

Geliang Tang posted 1 patch 2 years, 1 month ago

Diff against v1 v1 v1 v2
Download mbox

Failed in applying to current master (apply log)

tools/testing/selftests/bpf/bpf_tcp_helpers.h  | 2 ++
tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)

Expand all Fold all

[PATCH mptcp-next v3] Squash to "selftests: bpf: verify ca_name of struct mptcp_sock"

Posted by Geliang Tang 2 years, 1 month ago

Drop 'err' label and add 'ifndef TCP_CA_NAME_MAX'.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
v3:
 - add 'ifndef TCP_CA_NAME_MAX' in bpf_tcp_helpers.h too.

v2:
 - add 'ifndef TCP_CA_NAME_MAX'
---
 tools/testing/selftests/bpf/bpf_tcp_helpers.h  | 2 ++
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
index 57de5ca5ed50..bebe382bcc7a 100644
--- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
@@ -16,7 +16,9 @@ BPF_PROG(name, args)
 #define SOL_TCP 6
 #endif
 
+#ifndef TCP_CA_NAME_MAX
 #define TCP_CA_NAME_MAX	16
+#endif
 
 #define tcp_jiffies32 ((__u32)bpf_jiffies64())
 
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index aff35ab33379..d2941fbc686c 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -4,7 +4,10 @@
 #include "network_helpers.h"
 
 #define TCP_CA_SYSCTL	"/proc/sys/net/ipv4/tcp_congestion_control"
+
+#ifndef TCP_CA_NAME_MAX
 #define TCP_CA_NAME_MAX	16
+#endif
 
 char monitor_log_path[64];
 
@@ -93,12 +96,9 @@ void get_msk_ca_name(char ca_name[])
 	}
 
 	len = read(fd, ca_name, TCP_CA_NAME_MAX);
-	if (CHECK_FAIL(len < 0)) {
+	if (CHECK_FAIL(len < 0))
 		log_err("Failed to read %s", TCP_CA_SYSCTL);
-		goto err;
-	}
 
-err:
 	close(fd);
 }
 
-- 
2.34.1