Skip to content

Commit c18cf95

Browse files
Geliang Tanggregkh
authored andcommitted
selftests: mptcp: join: fix subflow_send_ack lookup
commit c8f021e upstream. MPC backups tests will skip unexpected sometimes (For example, when compiling kernel with an older version of gcc, such as gcc-8), since static functions like mptcp_subflow_send_ack also be listed in /proc/kallsyms, with a 't' in front of it, not 'T' ('T' is for a global function): > grep "mptcp_subflow_send_ack" /proc/kallsyms 0000000000000000 T __pfx___mptcp_subflow_send_ack 0000000000000000 T __mptcp_subflow_send_ack 0000000000000000 t __pfx_mptcp_subflow_send_ack 0000000000000000 t mptcp_subflow_send_ack In this case, mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$" will be false, MPC backups tests will skip. This is not what we expected. The correct logic here should be: if mptcp_subflow_send_ack is not a global function in /proc/kallsyms, do these MPC backups tests. So a 'T' must be added in front of mptcp_subflow_send_ack. Fixes: 632978f ("selftests: mptcp: join: skip MPC backups tests if not supported") Cc: stable@vger.kernel.org Signed-off-by: Geliang Tang <geliang.tang@linux.dev> Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts <matttbe@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3b66455 commit c18cf95

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

tools/testing/selftests/net/mptcp/mptcp_join.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2773,7 +2773,7 @@ backup_tests()
27732773
fi
27742774

27752775
if reset "mpc backup" &&
2776-
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
2776+
continue_if mptcp_lib_kallsyms_doesnt_have "T mptcp_subflow_send_ack$"; then
27772777
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup
27782778
speed=slow \
27792779
run_tests $ns1 $ns2 10.0.1.1
@@ -2782,7 +2782,7 @@ backup_tests()
27822782
fi
27832783

27842784
if reset "mpc backup both sides" &&
2785-
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
2785+
continue_if mptcp_lib_kallsyms_doesnt_have "T mptcp_subflow_send_ack$"; then
27862786
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow,backup
27872787
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup
27882788
speed=slow \
@@ -2792,7 +2792,7 @@ backup_tests()
27922792
fi
27932793

27942794
if reset "mpc switch to backup" &&
2795-
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
2795+
continue_if mptcp_lib_kallsyms_doesnt_have "T mptcp_subflow_send_ack$"; then
27962796
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
27972797
sflags=backup speed=slow \
27982798
run_tests $ns1 $ns2 10.0.1.1
@@ -2801,7 +2801,7 @@ backup_tests()
28012801
fi
28022802

28032803
if reset "mpc switch to backup both sides" &&
2804-
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
2804+
continue_if mptcp_lib_kallsyms_doesnt_have "T mptcp_subflow_send_ack$"; then
28052805
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow
28062806
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
28072807
sflags=backup speed=slow \

0 commit comments

Comments
 (0)