display "last time" actions info
Subsystems (3)
Geliang Tang
reviewerv3 cover display "last time" actions info
From: Geliang Tang <[email protected]>
v3:
- address Matt's comments for patch 3 (thanks)
- add "dport", "sleep", and mptcp_lib_expect_all_features.
v2:
- address Mat's comments for v1 (thanks)
- set msk->last_data_sent only if err > 0
- set last_data_recv in __mptcp_move_skbs_from_subflow
- add three reserved bytes after mptcpi_subflows_total
- move selftests from mptcp_join.sh to diag.sh and check that the
timestamps move forward.
Geliang Tang (3):
mptcp: add last time fields in mptcp_sock
mptcp: add last time fields in mptcp_info
selftests: mptcp: add last time actions tests
include/uapi/linux/mptcp.h | 4 ++++ net/mptcp/options.c | 1 + net/mptcp/protocol.c | 7 ++++++ net/mptcp/protocol.h | 3 +++ net/mptcp/sockopt.c | 5 ++++ tools/testing/selftests/net/mptcp/diag.sh | 29 +++++++++++++++++++++++ 6 files changed, 49 insertions(+)
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v3 1/3 mptcp: add last time fields in mptcp_sock
From: Geliang Tang <[email protected]>
This patch adds "last time" fields last_data_sent, last_data_recv and last_ack_recv in struct mptcp_sock to record the last time data_sent, data_recv and ack_recv happened. They all are initialized as tcp_jiffies32 in __mptcp_init_sock(), but updated as tcp_jiffies32 too when data is sent in __subflow_push_pending(), data is received in __mptcp_move_skbs_from_subflow(), and ack is received in ack_update_msk().
--- net/mptcp/options.c | 1 + net/mptcp/protocol.c | 7 +++++++ net/mptcp/protocol.h | 3 +++ 3 files changed, 11 insertions(+)
net/mptcp/options.c +1 -0
@@ -1069,6 +1069,7 @@ static void ack_update_msk(struct mptcp_sock *msk,__mptcp_snd_una_update (msk, new_snd_una);__mptcp_data_acked (sk); } + msk->last_ack_recv = tcp_jiffies32;mptcp_data_unlock (sk); trace_ack_update_msk(mp_opt->data_ack,
net/mptcp/protocol.c +7 -0
@@ -706,6 +706,8 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk, } }while (more_data_avail); +if (moved >0 ) + msk->last_data_recv = tcp_jiffies32; *bytes += moved;return done; }
@@ -1556,6 +1558,8 @@ static int __subflow_push_pending(struct sock *sk, struct sock *ssk, err = copied; out: +if (err >0 ) + msk->last_data_sent = tcp_jiffies32;return err; }
@@ -2793,6 +2797,9 @@ static void __mptcp_init_sock(struct sock *sk)WRITE_ONCE (msk->allow_infinite_fallback, true); msk->recovery = false; msk->subflow_id =1 ; + msk->last_data_sent = tcp_jiffies32; + msk->last_data_recv = tcp_jiffies32; + msk->last_ack_recv = tcp_jiffies32;mptcp_pm_data_init (msk);
net/mptcp/protocol.h +3 -0
@@ -282,6 +282,9 @@ struct mptcp_sock {u64 bytes_acked;u64 snd_una;u64 wnd_end; +u32 last_data_sent; +u32 last_data_recv; +u32 last_ack_recv;unsigned long timer_ival;u32 token;int rmem_released;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v3 2/3 mptcp: add last time fields in mptcp_info
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Similar to tcpi_last_data_sent, tcpi_last_data_recv and tcpi_last_ack_recv exposed with TCP, this patch exposes the last time "an action happened" for MPTCP in mptcp_info, named mptcpi_last_data_sent, mptcpi_last_data_recv and mptcpi_last_ack_recv, calculated in mptcp_diag_fill_info() as the time deltas between now and the newly added last time fields in mptcp_sock.
Also add three reserved bytes in struct mptcp_info.
--- include/uapi/linux/mptcp.h | 4 ++++ net/mptcp/sockopt.c | 5 +++++ 2 files changed, 9 insertions(+)
include/uapi/linux/mptcp.h +4 -0
@@ -58,6 +58,10 @@ struct mptcp_info {__u64 mptcpi_bytes_received;__u64 mptcpi_bytes_acked;__u8 mptcpi_subflows_total; +__u8 reserved[3 ]; +__u32 mptcpi_last_data_sent; +__u32 mptcpi_last_data_recv; +__u32 mptcpi_last_ack_recv; };/* MPTCP Reset reason codes, rfc8684 */
net/mptcp/sockopt.c +5 -0
@@ -898,6 +898,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info)struct sock *sk = (struct sock *)msk;u32 flags =0 ;bool slow; +u32 now;memset (info,0 ,sizeof (*info));
@@ -942,6 +943,10 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) info->mptcpi_bytes_retrans = msk->bytes_retrans; info->mptcpi_subflows_total = info->mptcpi_subflows +__mptcp_has_initial_subflow (msk); + now = tcp_jiffies32; + info->mptcpi_last_data_sent =jiffies_to_msecs (now - msk->last_data_sent); + info->mptcpi_last_data_recv =jiffies_to_msecs (now - msk->last_data_recv); + info->mptcpi_last_ack_recv =jiffies_to_msecs (now - msk->last_ack_recv);unlock_sock_fast (sk, slow); }EXPORT_SYMBOL_GPL (mptcp_diag_fill_info);
Signature · 1 line
2.40.1
Mat Martineau
maintainerRe: [PATCH mptcp-next v3 2/3] mptcp: add last time fields in mptcp_info
Quoted 45 lines · Geliang Tang
From: Geliang Tang <[email protected]>
Similar to
tcpi_last_data_sent,tcpi_last_data_recvandtcpi_last_ack_recvexposed with TCP, this patch exposes the last time "an action happened" for MPTCP inmptcp_info, namedmptcpi_last_data_sent,mptcpi_last_data_recvandmptcpi_last_ack_recv, calculated inmptcp_diag_fill_info()as the time deltas between now and the newly added last time fields inmptcp_sock.Also add three reserved bytes in struct
mptcp_info.Signed-off-by Geliang Tang <[email protected]>---
include/uapi/linux/mptcp.h| 4 ++++net/mptcp/sockopt.c| 5 +++++2 files changed, 9 insertions(+)include/uapi/linux/mptcp.h +4
-0@@ -58,6 +58,10 @@ struct mptcp_info {__u64 mptcpi_bytes_received;__u64 mptcpi_bytes_acked;__u8 mptcpi_subflows_total; +__u8 reserved[3 ]; +__u32 mptcpi_last_data_sent; +__u32 mptcpi_last_data_recv; +__u32 mptcpi_last_ack_recv; };/* MPTCP Reset reason codes, rfc8684 */ net/mptcp/sockopt.c +1
-0@@ -898,6 +898,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info)struct sock *sk = (struct sock *)msk;u32 flags =0 ;bool slow; +u32 now;memset (info,0 ,sizeof (*info));
net/mptcp/sockopt.c void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) · line 949
Quoted 7 lines
net/mptcp/sockopt.c +4
-0@@ -942,6 +943,10 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) info->mptcpi_bytes_retrans = msk->bytes_retrans; info->mptcpi_subflows_total = info->mptcpi_subflows +__mptcp_has_initial_subflow (msk); + now = tcp_jiffies32; + info->mptcpi_last_data_sent =jiffies_to_msecs (now - msk->last_data_sent); + info->mptcpi_last_data_recv =jiffies_to_msecs (now - msk->last_data_recv); + info->mptcpi_last_ack_recv =jiffies_to_msecs (now - msk->last_ack_recv);
Hi Geliang -
msk->last_ack_recv is protected by mptcp_data_lock, not the msk socket lock, so this line should be moved to the data_lock protected section earlier in mptcp_diag_fill_info().
Thanks,
Mat
Quoted 8 lines
net/mptcp/sockopt.c +0
-0unlock_sock_fast (sk, slow); }EXPORT_SYMBOL_GPL (mptcp_diag_fill_info);Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v3 3/3 selftests: mptcp: add last time actions tests
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch adds a new helper chk_msk_info() to show the counters in mptcp_info of the given infos, and check that the timestamps move forward. Use it to show newly added last_data_sent, last_data_recv and last_ack_recv in mptcp_info in diag.sh.
--- tools/testing/selftests/net/mptcp/diag.sh | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+)
tools/testing/selftests/net/mptcp/diag.sh +29 -0
@@ -200,6 +200,34 @@ chk_msk_cestab() "${expected}" "${msg}" "" } +chk_msk_info() +{ + local port="${1}" + local info + + for info in "${@:2}"; do + local cnt1 cnt2 msg + + cnt1=$(ss -N ${ns} -inHM dport ${port} | mptcp_lib_get_info_value "$info" "$info") + sleep 0.5 + cnt2=$(ss -N ${ns} -inHM dport ${port} | mptcp_lib_get_info_value "$info" "$info") + msg="....chk ${info}" + mptcp_lib_print_title "${msg}" + if { [ -z "${cnt1}" ] || [ -z "${cnt2}" ]; } && + ! mptcp_lib_expect_all_features; then + mptcp_lib_pr_skip "Feature probably not supported" + mptcp_lib_result_skip "${msg}" + elif [ "$((cnt1 + 500))" -lt "${cnt2}" ]; then + mptcp_lib_pr_ok + mptcp_lib_result_pass "${msg}" + else + mptcp_lib_pr_fail "expected $((cnt1 + 500)) < $cnt2" + mptcp_lib_result_fail "${msg}" + ret=${KSFT_FAIL} + fi + done +} + wait_connected() { local listener_ns="${1}"
@@ -233,6 +261,7 @@ echo "b" | \ 127.0.0.1 >/dev/null & wait_connected $ns 10000 chk_msk_nr 2 "after MPC handshake " +chk_msk_info 10000 last_data_sent last_data_recv last_ack_recv chk_msk_remote_key_nr 2 "....chk remote_key" chk_msk_fallback_nr 0 "....chk no fallback" chk_msk_inuse 2
Signature · 1 line
2.40.1
Mat Martineau
maintainerRe: [PATCH mptcp-next v3 3/3] selftests: mptcp: add last time actions tests
Quoted 20 lines · Geliang Tang
From: Geliang Tang <[email protected]>
This patch adds a new helper
chk_msk_info()to show the counters inmptcp_infoof the given infos, and check that the timestamps move forward. Use it to show newly addedlast_data_sent,last_data_recvandlast_ack_recvinmptcp_infoindiag.sh.Signed-off-by Geliang Tang <[email protected]>---
tools/testing/selftests/net/mptcp/diag.sh| 29 +++++++++++++++++++++++1 file changed, 29 insertions(+)tools/testing/selftests/net/mptcp/diag.sh +0
-0@@ -200,6 +200,34 @@ chk_msk_cestab() "${expected}" "${msg}" "" }
tools/testing/selftests/net/mptcp/diag.sh chk_msk_cestab() · line 212
Quoted 10 lines
tools/testing/selftests/net/mptcp/diag.sh +10
-0+chk_msk_info() +{ + local port="${1}" + local info + + for info in "${@:2}"; do + local cnt1 cnt2 msg + + cnt1=$(ss -N ${ns} -inHM dport ${port} | mptcp_lib_get_info_value "$info" "$info") + sleep 0.5
Hi Geliang -
With the loop structured this way, it sleeps 3 times. You could collect the first timestamp for all three values (last_data_sent last_data_recv last_ack_recv), then sleep once, then get all 3 "after" timestamps.
(Unless Matthieu doesn't care about the extra test time :) )
tools/testing/selftests/net/mptcp/diag.sh chk_msk_cestab() · line 220
Quoted 8 lines
tools/testing/selftests/net/mptcp/diag.sh +8
-0+ cnt2=$(ss -N ${ns} -inHM dport ${port} | mptcp_lib_get_info_value "$info" "$info") + msg="....chk ${info}" + mptcp_lib_print_title "${msg}" + if { [ -z "${cnt1}" ] || [ -z "${cnt2}" ]; } && + ! mptcp_lib_expect_all_features; then + mptcp_lib_pr_skip "Feature probably not supported" + mptcp_lib_result_skip "${msg}" + elif [ "$((cnt1 + 500))" -lt "${cnt2}" ]; then
Using 500 here is likely to make this test flaky - Matthieu had suggested 250ms as a way to make sure the value moved forward but would not be sensitive to small changes in packet timing.
Also please add a local "delta_ms" variable instead of the magic number 500.
tools/testing/selftests/net/mptcp/diag.sh chk_msk_cestab() · line 224
Quoted 4 lines
tools/testing/selftests/net/mptcp/diag.sh +4
-0+ mptcp_lib_pr_ok + mptcp_lib_result_pass "${msg}" + else + mptcp_lib_pr_fail "expected $((cnt1 + 500)) < $cnt2"
Suggest rephrasing: "value of ${info} changed by $((cnt2 - cnt1))ms, expected at least ${delta_ms}ms"
- Mat
Quoted 22 lines
tools/testing/selftests/net/mptcp/diag.sh +6
-0+ mptcp_lib_result_fail "${msg}" + ret=${KSFT_FAIL} + fi + done +} + wait_connected() { local listener_ns="${1}"@@ -233,6 +261,7 @@ echo "b" | \ 127.0.0.1 >/dev/null &
wait_connected$ns 10000chk_msk_nr2 "after MPC handshake "
+chk_msk_info 10000last_data_sentlast_data_recvlast_ack_recvchk_msk_remote_key_nr2 "....chkremote_key"chk_msk_fallback_nr0 "....chk no fallback"chk_msk_inuse2Signature · 1 line
2.40.1
Matthieu Baerts
maintainerRe: [PATCH mptcp-next v3 3/3] selftests: mptcp: add last time actions tests
Hi Mat,
Quoted 37 lines · Mat Martineau
Quoted 30 lines · Geliang Tang
From: Geliang Tang <[email protected]>
This patch adds a new helper
chk_msk_info()to show the counters inmptcp_infoof the given infos, and check that the timestamps move forward. Use it to show newly addedlast_data_sent,last_data_recvandlast_ack_recvinmptcp_infoindiag.sh.Signed-off-by Geliang Tang <[email protected]>---
tools/testing/selftests/net/mptcp/diag.sh| 29 +++++++++++++++++++++++1 file changed, 29 insertions(+)tools/ renamed from tools/testing/selftests/net/mptcp/diag.sh +0
-0
testing/selftests/net/mptcp/diag.sh
indexbc97ab33a00e..2f9f734015b4100755tools/testing/selftests/net/mptcp/diag.sh +0
-0@@ -200,6 +200,34 @@ chk_msk_cestab()"${expected}" "${msg}" ""
}tools/testing/selftests/net/mptcp/diag.sh +9
-0+chk_msk_info() +{ + local port="${1}" + local info + + for info in "${@:2}"; do + local cnt1 cnt2 msg + + cnt1=$(ss -N ${ns} -inHM dport ${port} |Quoted 2 lines
mptcp_lib_get_info_value"$info" "$info")
+ sleep 0.5Hi Geliang -
Quoted 5 lines
With the loop structured this way, it sleeps 3 times. You could collect the first timestamp for all three values (
last_data_sentlast_data_recvlast_ack_recv), then sleep once, then get all 3 "after" timestamps.(Unless Matthieu doesn't care about the extra test time :) )
Good idea to have only one sleep!
Cheers,
Matt
Signature · 1 line
Sponsored by the NGI0 Core fund.
Hi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal: Unstable: 1 failed test(s): selftest_diag 🔴
- KVM Validation: debug: Unstable: 1 failed test(s): selftest_diag 🔴
- KVM Validation: btf (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/8489380071
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/104a535710cd
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=839974
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normalFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)