Commit e40dd439 authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: add the mibs for MP_RST 



This patch added two more mibs for MP_RST, MPTCP_MIB_MPRSTTX for
the MP_RST sending and MPTCP_MIB_MPRSTRX for the MP_RST receiving.

Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e8e947ef

net/mptcp/mib.c

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ static const struct snmp_mib mptcp_snmp_list[] = { 
	SNMP_MIB_ITEM("MPFailRx", MPTCP_MIB_MPFAILRX),

	SNMP_MIB_ITEM("MPFastcloseTx", MPTCP_MIB_MPFASTCLOSETX),

	SNMP_MIB_ITEM("MPFastcloseRx", MPTCP_MIB_MPFASTCLOSERX),

	SNMP_MIB_ITEM("MPRstTx", MPTCP_MIB_MPRSTTX),

	SNMP_MIB_ITEM("MPRstRx", MPTCP_MIB_MPRSTRX),

	SNMP_MIB_ITEM("RcvPruned", MPTCP_MIB_RCVPRUNED),

	SNMP_MIB_ITEM("SubflowStale", MPTCP_MIB_SUBFLOWSTALE),

	SNMP_MIB_ITEM("SubflowRecover", MPTCP_MIB_SUBFLOWRECOVER),

net/mptcp/mib.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_MPFAILRX,		/* Received a MP_FAIL */

	MPTCP_MIB_MPFASTCLOSETX,	/* Transmit a MP_FASTCLOSE */

	MPTCP_MIB_MPFASTCLOSERX,	/* Received a MP_FASTCLOSE */

	MPTCP_MIB_MPRSTTX,		/* Transmit a MP_RST */

	MPTCP_MIB_MPRSTRX,		/* Received a MP_RST */

	MPTCP_MIB_RCVPRUNED,		/* Incoming packet dropped due to memory limit */

	MPTCP_MIB_SUBFLOWSTALE,		/* Subflows entered 'stale' status */

	MPTCP_MIB_SUBFLOWRECOVER,	/* Subflows returned to active status after being stale */

net/mptcp/options.c

+2 −0
Original line number Diff line number Diff line
@@ -839,6 +839,7 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb, 
		if (mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts)) {

			*size += opt_size;

			remaining -= opt_size;

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX);

		}

		return true;

	}
@@ -1161,6 +1162,7 @@ bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) 
			subflow->reset_seen = 1;

			subflow->reset_reason = mp_opt.reset_reason;

			subflow->reset_transient = mp_opt.reset_transient;

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTRX);

		}



		if (!(mp_opt.suboptions & OPTION_MPTCP_DSS))