From nobody Fri May 17 11:28:39 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 B971833D0 for ; Sat, 30 Mar 2024 07:46:19 +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=1711784779; cv=none; b=PzXKmQ+8QLbVanuWsJ3HXzfBkcNrapWafapa1YhkHa6rDYmYeRM2pTaMxffT5A0RiNBo5suzRqv7F3w5loUet2GqWBLzhRxT5XkYscKIXUExlfjc35VtaXny6sQQqcIKCeUxmagwClDut3rlOKEe/vrF6CjfHcYMu0TXWgPq23Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711784779; c=relaxed/simple; bh=hkoDZOuPqtAY3Wsi6VBhf7SUD+iXtlQ4gTo7nvgCfDE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HmmpllA226JLzY5oJYrP2E9IT6q8Mv0bXrkPCBy+f9NRiqtPrxviVkCb0w55Rjmka1/RmWBFbx7O0PSwcegXWFg+c6X2OsweK7Ce1EnMqsr9aKxOhqOtOxQlJsSch83nTomMDJ9Dn+fyDlnp4DIjomoETN0STp2TXJf3ODmw47k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nMC15/gh; 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="nMC15/gh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 494F9C43390; Sat, 30 Mar 2024 07:46:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711784779; bh=hkoDZOuPqtAY3Wsi6VBhf7SUD+iXtlQ4gTo7nvgCfDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nMC15/gh2rOlwUig5bozCi7pms0bxKC27jZYHFGqDNuMqbP827QJ+qS66D4LBLpg8 5/5S5uijQu53KsIS7PlY+AiuduYZVXXb73sZ/Ny6BXPU5jWA8TIwdNGc9s5RJvVIj+ eLPs00zmqEzWKvHyVts/TWQHUW4aQWyxYOVpAOrSho2mlBKiewLr68InzpIEhoNznV hG/8M8E8MBq4A/VS6oTUrjlGSU2W2Z/jL0MTA22FlpCZC7WBnm3h9wjGLC5X9o+1rS 3i4Qu5CVpwTSd6Bl1ftk2p0puv3es3NX3bkojbzpvFH5jUiCHtsby3nGa2OtgLc2n6 yC1pIb3C9AoYA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 1/3] mptcp: add last time fields in mptcp_sock Date: Sat, 30 Mar 2024 15:46:08 +0800 Message-Id: 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(). Signed-off-by: Geliang Tang --- net/mptcp/options.c | 1 + net/mptcp/protocol.c | 7 +++++++ net/mptcp/protocol.h | 3 +++ 3 files changed, 11 insertions(+) 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; --=20 2.40.1 From nobody Fri May 17 11:28:39 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 2FACE1C0DFC for ; Sat, 30 Mar 2024 07:46:20 +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=1711784781; cv=none; b=Gan5grmSJK6STPmQYIm3PqQ0MkP4TJXwegz6pckB3ukzTCtVLj9r36i6SABRH/pcdk/hlJRTa690vzEXGqCbeyAgIMUsDcyoTK2L/SYxy5UVDIKEvJ4ishH+ILrKrNkT/o3xXQUNsCWAfE/18d7XqwnneuiVnQC1dQLj2PmfwrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711784781; c=relaxed/simple; bh=vMMYevMUlNNQAJot//JBI5DCaZ77/LieHP9Ci+9MRmQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ml4du1lmPgDpiVcM/Z8tpBAy28kNevKCpJq6t7bevxgNjf5FaEjJFCRXCfsCyr4P/95n2n/BY+nJRxD1/SBws1IrdGa4v7XToRQCouna9C+oqFtGhQwBV9G7z4gML+JDZvXscwbxD8+HfS5F3DoQupqHETteU7azLcnJia3QhNY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Te9kv3kG; 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="Te9kv3kG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B35D3C433F1; Sat, 30 Mar 2024 07:46:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711784780; bh=vMMYevMUlNNQAJot//JBI5DCaZ77/LieHP9Ci+9MRmQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Te9kv3kG1METbkvnozFT+pNmcsaYluOxUjQKm5kH3lQPF1rgLkyE5HaAf6FPWMayd JBujlh50uyc4u6QOYhiVhaBB2v37/4gM6mraYoahlpTcKm/4lklpNAjDTz3S2uqE8B FtOlrAhZ/E3tF+LRndGoCkdt+vKymD79mHCSMdljwCvl/5KhjEOxydtUkgtLJYJGSU 6Uhoi7sG3Ix16Hr0sT8BZfC4Ckk8r043HcqwkY03Mwxzzv5k35Vp+4oIRotTy8Rtk3 IJC7Z4VZaIwciyQIFcRTC1NIqGQrR5/wfi9m769VCNokAaH36wxDiqu6dVO0tsM7in 4V6Tfqlwa3/0w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 2/3] mptcp: add last time fields in mptcp_info Date: Sat, 30 Mar 2024 15:46:09 +0800 Message-Id: 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 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/sockopt.c | 5 +++++ 2 files changed, 9 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/sockopt.c b/net/mptcp/sockopt.c index dcd1c76d2a3b..1e74851614e8 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -898,6 +898,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struc= t mptcp_info *info) struct sock *sk =3D (struct sock *)msk; u32 flags =3D 0; bool slow; + u32 now; =20 memset(info, 0, sizeof(*info)); =20 @@ -942,6 +943,10 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, stru= ct mptcp_info *info) info->mptcpi_bytes_retrans =3D msk->bytes_retrans; info->mptcpi_subflows_total =3D info->mptcpi_subflows + __mptcp_has_initial_subflow(msk); + now =3D tcp_jiffies32; + 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); + info->mptcpi_last_ack_recv =3D jiffies_to_msecs(now - msk->last_ack_recv); unlock_sock_fast(sk, slow); } EXPORT_SYMBOL_GPL(mptcp_diag_fill_info); --=20 2.40.1 From nobody Fri May 17 11:28:39 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 9322D1C0DFC for ; Sat, 30 Mar 2024 07:46:22 +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=1711784782; cv=none; b=TjkqTscSU2RaTk43KlmolGDk4ml6p9yhHz+V2U53ZuOsJRmq3nEz5buOCXpUIdcJWjBJjDpd25E7Seb/XCUyHSPydpAkJpDtiufFG4GnSWy2/k6HDRXkY+NyUGLukB7pPI4nZGdR7r/kMqfOsZTCPw8lRE7jAhSnR8D+d1ZzfuA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711784782; c=relaxed/simple; bh=0/FMzjZjxcKW09mETu0Ldh1pS89sQGwxBH+0X4EMfow=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nNEk4tdxmopMiWEjHz/gzacM2HxUggdTVq2rgSC2eZu+RW7ZlXSs96u2tjp56tCCv0ZeFYWVvaBnfdh/9Ni1ecCYR5O1VvqTP/Gr6w+nqAXjoKi4dopvEebgSKV/3rotbK7HRQSIcx3NmZBqhta4Q/Th1dkccCqOdgSE5erFN6k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=INTMg9+6; 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="INTMg9+6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41F2EC43390; Sat, 30 Mar 2024 07:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711784782; bh=0/FMzjZjxcKW09mETu0Ldh1pS89sQGwxBH+0X4EMfow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=INTMg9+6V4zMdQFGcWJY7yKKWf+fZAFpHVXaSI5aPP3atnuVP/VR5C7GEZB9reZDV qkTQVCFOHctU+M8YjN7fTNubbrA6QAC4RDZ+ucuY77fpEDPFdhnLTZ4bdY97Jpboa9 lfrBFs2NPowzVvxECtNAjKJXHnAMxdlAh4T4trzf+Cwd8SiGioar98UgeGrCYIh/rP WBNDuUorslj4hkJoRZD5OjcYrALCNic4qwQcPoTVhBPWS7TivdOirdkhRyKeNklKmF K0nhYItaSWhgpeer9omPkl8spOf81la+SknhkH7vKmgT/zwKcuz6oHt2UFB8NIq/qf B4eMIJZnl44xQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 3/3] selftests: mptcp: add last time actions tests Date: Sat, 30 Mar 2024 15:46:10 +0800 Message-Id: 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 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. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index bc97ab33a00e..2f9f734015b4 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -200,6 +200,34 @@ chk_msk_cestab() "${expected}" "${msg}" "" } =20 +chk_msk_info() +{ + local port=3D"${1}" + local info + + for info in "${@:2}"; do + local cnt1 cnt2 msg + + cnt1=3D$(ss -N ${ns} -inHM dport ${port} | mptcp_lib_get_info_value "$in= fo" "$info") + sleep 0.5 + cnt2=3D$(ss -N ${ns} -inHM dport ${port} | mptcp_lib_get_info_value "$in= fo" "$info") + msg=3D"....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=3D${KSFT_FAIL} + fi + done +} + wait_connected() { local listener_ns=3D"${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 --=20 2.40.1