Commit eb7f3365 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: add the mibs for MP_FAIL 



This patch added the mibs for MP_FAIL: MPTCP_MIB_MPFAILTX and
MPTCP_MIB_MPFAILRX.

Signed-off-by: default avatarGeliang Tang <geliangtang@xiaomi.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 478d7700

net/mptcp/mib.c

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

	SNMP_MIB_ITEM("MPPrioTx", MPTCP_MIB_MPPRIOTX),

	SNMP_MIB_ITEM("MPPrioRx", MPTCP_MIB_MPPRIORX),

	SNMP_MIB_ITEM("MPFailTx", MPTCP_MIB_MPFAILTX),

	SNMP_MIB_ITEM("MPFailRx", MPTCP_MIB_MPFAILRX),

	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
@@ -37,6 +37,8 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_RMSUBFLOW,		/* Remove a subflow */

	MPTCP_MIB_MPPRIOTX,		/* Transmit a MP_PRIO */

	MPTCP_MIB_MPPRIORX,		/* Received a MP_PRIO */

	MPTCP_MIB_MPFAILTX,		/* Transmit a MP_FAIL */

	MPTCP_MIB_MPFAILRX,		/* Received a MP_FAIL */

	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

+1 −0
Original line number Diff line number Diff line
@@ -1158,6 +1158,7 @@ bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) 


	if (mp_opt.mp_fail) {

		mptcp_pm_mp_fail_received(sk, mp_opt.fail_seq);

		MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILRX);

		mp_opt.mp_fail = 0;

	}

net/mptcp/subflow.c

+1 −0
Original line number Diff line number Diff line
@@ -911,6 +911,7 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * 
	if (unlikely(csum_fold(csum))) {

		MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR);

		subflow->send_mp_fail = 1;

		MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_MPFAILTX);

		return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY;

	}