From nobody Fri May 17 22:35:36 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D83B358113 for ; Tue, 2 Apr 2024 09:28:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712050123; cv=none; b=kEVRVhnZK5clltWTw2/LNSXZk0Q0gXusynPiIYwGi8bNtyRBHxdZRqf1CxrWaNmcWwnGF46TdbHj1E4jisKHA7bcqu3V1Iqnsd1SRC3ndFnCEbyp3HEJjOEAim8SVP98nr9fxWn++EbVuk5OgjtDRV528QVI4lkQpjiZ9VnEpb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712050123; c=relaxed/simple; bh=s32tFXYWLu6yZYOT+V8IYJyyk4WHV/3WuBZO0Ua/5fQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R0m0aOhHHw0/GVrx+s71BJ5L6KS9fzZWKioYk2elJ8fyjhKOCl5AMzJo/zltHz181dDg3w3xNlMZAXLgyQd08DDdR1v6My6PZH+Q7DyoUaeEhR8lNoVQtKQt1tf9qiVTXbhktoH8oZYSIMyQSZoVJBXSJFpkVV9Jv1gDFB/HGTg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cFOTBiuO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cFOTBiuO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A563AC433C7; Tue, 2 Apr 2024 09:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712050123; bh=s32tFXYWLu6yZYOT+V8IYJyyk4WHV/3WuBZO0Ua/5fQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cFOTBiuOApeDPyyIxqqg1AGMe8OgbWzpOlnX2Yn8v73b5JEdxzbdv7QCzhwXgCMY2 q/pgWMdfeuazNXw5ON70cmh4fkuPmcBK+PjqNVFoFrZQKObeW+agA1ou2Stb69pF75 oQbrZajZeXDtwBPkO2M5tKAmfDYrVuHiYt0Rp35hnyf/+FvlxftxNSTHFMk/c+dC+/ 4EP4HM3mdSM79nHeg04H2DwqFAD+H2dYxQSz7xUVgf2yxb+WH9BfY3iDgIqRaM3alt 9b0xKoQLFvLDlVj44VbOz8mklEqoRwBNpTjKoFFmMgaPtJ8hiaxTduyuq0eZZFnraN 0vf0hXP0eTRZg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 1/2] mptcp: add last time fields in mptcp_info Date: Tue, 2 Apr 2024 17:28:35 +0800 Message-Id: <8f7f0bc03d89c920ff8e60818d3280bc93fc16a3.1712049966.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang 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(). 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. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/446 Signed-off-by: Geliang Tang --- 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 | 4 ++++ 5 files changed, 19 insertions(+) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 74cfe496891e..67d015df8893 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -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; }; =20 /* MPTCP Reset reason codes, rfc8684 */ diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 5926955625cf..c0832df3b0a3 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -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 =3D tcp_jiffies32; mptcp_data_unlock(sk); =20 trace_ack_update_msk(mp_opt->data_ack, diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 556b3b95c537..43318aa5f991 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -706,6 +706,8 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp= _sock *msk, } } while (more_data_avail); =20 + if (moved > 0) + msk->last_data_recv =3D tcp_jiffies32; *bytes +=3D moved; return done; } @@ -1556,6 +1558,8 @@ static int __subflow_push_pending(struct sock *sk, st= ruct sock *ssk, err =3D copied; =20 out: + if (err > 0) + msk->last_data_sent =3D tcp_jiffies32; return err; } =20 @@ -2793,6 +2797,9 @@ static void __mptcp_init_sock(struct sock *sk) WRITE_ONCE(msk->allow_infinite_fallback, true); msk->recovery =3D false; msk->subflow_id =3D 1; + msk->last_data_sent =3D tcp_jiffies32; + msk->last_data_recv =3D tcp_jiffies32; + msk->last_ack_recv =3D tcp_jiffies32; =20 mptcp_pm_data_init(msk); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 5a4538205fd6..3a3fed3642dd 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -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; diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 73fdf423de44..2ec2fdf9f4af 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -896,6 +896,7 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_= sock *msk, int level, int void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) { struct sock *sk =3D (struct sock *)msk; + u32 now =3D tcp_jiffies32; u32 flags =3D 0; bool slow; =20 @@ -930,6 +931,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struc= t mptcp_info *info) info->mptcpi_snd_una =3D msk->snd_una; info->mptcpi_rcv_nxt =3D msk->ack_seq; info->mptcpi_bytes_acked =3D msk->bytes_acked; + info->mptcpi_last_ack_recv =3D jiffies_to_msecs(now - msk->last_ack_recv); mptcp_data_unlock(sk); =20 slow =3D lock_sock_fast(sk); @@ -942,6 +944,8 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struc= t mptcp_info *info) info->mptcpi_bytes_retrans =3D msk->bytes_retrans; info->mptcpi_subflows_total =3D info->mptcpi_subflows + __mptcp_has_initial_subflow(msk); + info->mptcpi_last_data_sent =3D jiffies_to_msecs(now - msk->last_data_sen= t); + info->mptcpi_last_data_recv =3D jiffies_to_msecs(now - msk->last_data_rec= v); unlock_sock_fast(sk, slow); } EXPORT_SYMBOL_GPL(mptcp_diag_fill_info); --=20 2.40.1 From nobody Fri May 17 22:35:36 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3969458226 for ; Tue, 2 Apr 2024 09:28:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712050125; cv=none; b=DEatQIoe9/IwUaGmCbMl4cGzCjeIdUMR/V69Pva59LnVqoLJ+zrgilpCfrKIj9DO07xx3DdZIDbbnglTpaF12KBsgjaJgliIS5JVyPUzZH20u67wBhfa/6aIxNuJPjxwplygRjUV0YqNXzKhOr/5XD0tl5J/SECNL1u7jmXUHhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712050125; c=relaxed/simple; bh=CX7MsCyfoNrkdYrWOUssbVbe+vug6Wpy8y0RRF56ATY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q0LuhRY7YUMgQVTkqapZgBGciZPfFdg+99PzSaoM0x0Jru497Y8RD0mvzwrLeLYwQDGPwaoVqv/UiGCpKk5VAvJjj9y9xJKOrJz3EPBS7s8ML4A5LGNcuylXjkCROeTzlIOxvxBY9mqebrvLBHn4h6cJIOu2yHUbqc8V/x8sFUY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Pp1l96TZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Pp1l96TZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F324EC43390; Tue, 2 Apr 2024 09:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712050124; bh=CX7MsCyfoNrkdYrWOUssbVbe+vug6Wpy8y0RRF56ATY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pp1l96TZoGNFSizd8PU8bWzr0sRWMciUkprjRxPCtqOEW4nQGuVo05snPn3eV9zAB 1qQa5U/3ukD5Jg0i5VhBt1mPndfftLY7So21sVWjZNjoQC+3pIXV4nuN95KMkHzxZp dIC4P/tiVYYB3STS7+WyF1nZ+xHVM9zS6wv9DiG1BBKio49rXSUFM8QWbi0Q7DfBYu PwsXGDqXw3JadTB7Ea4wtIlAPspFkiIV3ssqXF5fXNgui2iHXToAmvL7L/9KqL0eqh DdwJvVZYp4VBjSBwk1kS0Wff3oc6ca7yPUUSdV1UJRpZc7CoJhAiQQjkvFnasKn+ES mGLkGNCdUvaVw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 2/2] selftests: mptcp: test last time mptcp_info Date: Tue, 2 Apr 2024 17:28:36 +0800 Message-Id: <0e14deb5db6de99fcfd30673ddf54aa9a1191007.1712049966.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch adds a new helper chk_msk_info() to show the counters in mptcp_info of the given info, 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 chk_last_time_info(). Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index bc97ab33a00e..3d60e6544e5f 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -200,6 +200,53 @@ chk_msk_cestab() "${expected}" "${msg}" "" } =20 +msk_info_get_value() +{ + local port=3D"${1}" + local info=3D"${2}" + + ss -N ${ns} -inHM dport ${port} | \ + mptcp_lib_get_info_value "${info}" "${info}" +} + +chk_msk_info() +{ + local port=3D"${1}" + local info=3D"${2}" + local cnt=3D"${3}" + local now=3D$(msk_info_get_value ${port} "${info}") + local delta_ms=3D250 + + mptcp_lib_print_title "....chk ${info}" + if { [ -z "${cnt}" ] || [ -z "${now}" ]; } && + ! mptcp_lib_expect_all_features; then + mptcp_lib_pr_skip "Feature probably not supported" + mptcp_lib_result_skip "${info}" + elif [ "$((cnt1 + ${delta_ms}))" -lt "${now}" ]; then + mptcp_lib_pr_ok + mptcp_lib_result_pass "${info}" + else + mptcp_lib_pr_fail "value of ${info} changed by $((now - cnt))ms," \ + "expected at least ${delta_ms}ms" + mptcp_lib_result_fail "${info}" + ret=3D${KSFT_FAIL} + fi +} + +chk_last_time_info() +{ + local port=3D"${1}" + local cnt1=3D$(msk_info_get_value ${port} "last_data_sent") + local cnt2=3D$(msk_info_get_value ${port} "last_data_recv") + local cnt3=3D$(msk_info_get_value ${port} "last_ack_recv") + + sleep 0.5 + + chk_msk_info "${port}" "last_data_sent" "${cnt1}" + chk_msk_info "${port}" "last_data_recv" "${cnt2}" + chk_msk_info "${port}" "last_ack_recv" "${cnt3}" +} + wait_connected() { local listener_ns=3D"${1}" @@ -233,6 +280,7 @@ echo "b" | \ 127.0.0.1 >/dev/null & wait_connected $ns 10000 chk_msk_nr 2 "after MPC handshake " +chk_last_time_info 10000 chk_msk_remote_key_nr 2 "....chk remote_key" chk_msk_fallback_nr 0 "....chk no fallback" chk_msk_inuse 2 --=20 2.40.1