Commit 68ab29b0 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

mptcp: add mptcpi_subflows_total counter 

mainline inclusion
from mainline-v6.8-rc1
commit 6ebf6f90ab4ac09a76172a6d387e8819d3259595
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=6ebf6f90ab4ac09a76172a6d387e8819d3259595

--------------------------------

If the initial subflow has been removed, we cannot know without checking
other counters, e.g. ss -ti <filter> | grep -c tcp-ulp-mptcp or
getsockopt(SOL_MPTCP, MPTCP_FULL_INFO, ...) (or others except MPTCP_INFO
of course) and then check mptcp_subflow_data->num_subflows to get the
total amount of subflows.

This patch adds a new counter mptcpi_subflows_total in mptcpi_flags to
store the total amount of subflows, including the initial one. A new
helper __mptcp_has_initial_subflow() is added to check whether the
initial subflow has been removed or not. With this helper, we can then
compute the total amount of subflows from mptcp_info by doing something
like:

    mptcpi_subflows_total = mptcpi_subflows +
            __mptcp_has_initial_subflow(msk).

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/428


Reviewed-by: default avatarMatthieu Baerts <matttbe@kernel.org>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231128-send-net-next-2023107-v4-1-8d6b94150f6b@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 468c9468

include/uapi/linux/mptcp.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct mptcp_info { 
	__u64	mptcpi_bytes_sent;

	__u64	mptcpi_bytes_received;

	__u64	mptcpi_bytes_acked;

	__u8	mptcpi_subflows_total;

};



/* MPTCP Reset reason codes, rfc8684 */

net/mptcp/protocol.h

+9 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,15 @@ static inline void __mptcp_do_fallback(struct mptcp_sock *msk) 
	set_bit(MPTCP_FALLBACK_DONE, &msk->flags);

}



static inline bool __mptcp_has_initial_subflow(const struct mptcp_sock *msk)

{

	struct sock *ssk = READ_ONCE(msk->first);



	return ssk && ((1 << inet_sk_state_load(ssk)) &

		       (TCPF_ESTABLISHED | TCPF_SYN_SENT |

			TCPF_SYN_RECV | TCPF_LISTEN));

}



static inline void mptcp_do_fallback(struct sock *ssk)

{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);

net/mptcp/sockopt.c

+2 −0
Original line number Diff line number Diff line
@@ -938,6 +938,8 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) 
	info->mptcpi_bytes_sent = msk->bytes_sent;

	info->mptcpi_bytes_received = msk->bytes_received;

	info->mptcpi_bytes_retrans = msk->bytes_retrans;

	info->mptcpi_subflows_total = info->mptcpi_subflows +

		__mptcp_has_initial_subflow(msk);

	unlock_sock_fast(sk, slow);

}

EXPORT_SYMBOL_GPL(mptcp_diag_fill_info);