Commit fe11dfa1 authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

mptcp: zero window probe mib 



Explicitly account for MPTCP-level zero windows probe, to catch
hopefully earlier issues alike the one addressed by the previous
patch.

Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Tested-by: default avatarGeliang Tang <geliang@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251028-net-mptcp-send-timeout-v1-4-38ffff5a9ec8@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a824084b

net/mptcp/mib.c

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ static const struct snmp_mib mptcp_snmp_list[] = { 
	SNMP_MIB_ITEM("DssFallback", MPTCP_MIB_DSSFALLBACK),

	SNMP_MIB_ITEM("SimultConnectFallback", MPTCP_MIB_SIMULTCONNFALLBACK),

	SNMP_MIB_ITEM("FallbackFailed", MPTCP_MIB_FALLBACKFAILED),

	SNMP_MIB_ITEM("WinProbe", MPTCP_MIB_WINPROBE),

};



/* mptcp_mib_alloc - allocate percpu mib counters

net/mptcp/mib.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_DSSFALLBACK,		/* Bad or missing DSS */

	MPTCP_MIB_SIMULTCONNFALLBACK,	/* Simultaneous connect */

	MPTCP_MIB_FALLBACKFAILED,	/* Can't fallback due to msk status */

	MPTCP_MIB_WINPROBE,		/* MPTCP-level zero window probe */

	__MPTCP_MIB_MAX

};

net/mptcp/protocol.c

+1 −0
Original line number Diff line number Diff line
@@ -1355,6 +1355,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, 
		 mpext->dsn64);



	if (zero_window_probe) {

		MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_WINPROBE);

		mptcp_subflow_ctx(ssk)->rel_write_seq += copy;

		mpext->frozen = 1;

		if (READ_ONCE(msk->csum_enabled))