Commit fc1b4e3b authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: add mibs for stale subflows processing 



This allows monitoring exceptional events like
active backup scenarios.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff5a0b42

net/mptcp/mib.c

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

	SNMP_MIB_ITEM("MPPrioRx", MPTCP_MIB_MPPRIORX),

	SNMP_MIB_ITEM("RcvPruned", MPTCP_MIB_RCVPRUNED),

	SNMP_MIB_ITEM("SubflowStale", MPTCP_MIB_SUBFLOWSTALE),

	SNMP_MIB_ITEM("SubflowRecover", MPTCP_MIB_SUBFLOWRECOVER),

	SNMP_MIB_SENTINEL

};

net/mptcp/mib.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_MPPRIOTX,		/* Transmit a MP_PRIO */

	MPTCP_MIB_MPPRIORX,		/* Received a MP_PRIO */

	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 */

	__MPTCP_MIB_MAX

};

net/mptcp/pm.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include <net/mptcp.h>

#include "protocol.h"



#include "mib.h"



/* path manager command handlers */



int mptcp_pm_announce_addr(struct mptcp_sock *msk,

net/mptcp/pm_netlink.c

+1 −0
Original line number Diff line number Diff line
@@ -923,6 +923,7 @@ void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ss 
			if (!tcp_rtx_and_write_queues_empty(ssk)) {

				subflow->stale = 1;

				__mptcp_retransmit_pending_data(sk);

				MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_SUBFLOWSTALE);

			}

			unlock_sock_fast(ssk, slow);

net/mptcp/protocol.c

+1 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,7 @@ void mptcp_subflow_set_active(struct mptcp_subflow_context *subflow) 
		return;



	subflow->stale = 0;

	MPTCP_INC_STATS(sock_net(mptcp_subflow_tcp_sock(subflow)), MPTCP_MIB_SUBFLOWRECOVER);

}



bool mptcp_subflow_active(struct mptcp_subflow_context *subflow)