Skip to content

Commit fe11dfa

Browse files
Paolo Abenikuba-moo
authored andcommitted
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: Mat Martineau <[email protected]> Signed-off-by: Paolo Abeni <[email protected]> Tested-by: Geliang Tang <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent a824084 commit fe11dfa

3 files changed

Lines changed: 3 additions & 0 deletions

File tree

net/mptcp/mib.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ static const struct snmp_mib mptcp_snmp_list[] = {
8585
SNMP_MIB_ITEM("DssFallback", MPTCP_MIB_DSSFALLBACK),
8686
SNMP_MIB_ITEM("SimultConnectFallback", MPTCP_MIB_SIMULTCONNFALLBACK),
8787
SNMP_MIB_ITEM("FallbackFailed", MPTCP_MIB_FALLBACKFAILED),
88+
SNMP_MIB_ITEM("WinProbe", MPTCP_MIB_WINPROBE),
8889
};
8990

9091
/* mptcp_mib_alloc - allocate percpu mib counters

net/mptcp/mib.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ enum linux_mptcp_mib_field {
8888
MPTCP_MIB_DSSFALLBACK, /* Bad or missing DSS */
8989
MPTCP_MIB_SIMULTCONNFALLBACK, /* Simultaneous connect */
9090
MPTCP_MIB_FALLBACKFAILED, /* Can't fallback due to msk status */
91+
MPTCP_MIB_WINPROBE, /* MPTCP-level zero window probe */
9192
__MPTCP_MIB_MAX
9293
};
9394

net/mptcp/protocol.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,6 +1355,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
13551355
mpext->dsn64);
13561356

13571357
if (zero_window_probe) {
1358+
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_WINPROBE);
13581359
mptcp_subflow_ctx(ssk)->rel_write_seq += copy;
13591360
mpext->frozen = 1;
13601361
if (READ_ONCE(msk->csum_enabled))

0 commit comments

Comments
 (0)