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

mptcp: add RM_ADDR related mibs 



This patch added two new mibs for RM_ADDR, named MPTCP_MIB_RMADDR and
MPTCP_MIB_RMSUBFLOW, when the RM_ADDR suboption is received, increase
the first mib counter, when the local subflow is removed, increase the
second mib counter.

Suggested-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Suggested-by: default avatarPaolo Abeni <pabeni@redhat.com>
Suggested-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ee4261a

net/mptcp/mib.c

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

	SNMP_MIB_ITEM("AddAddr", MPTCP_MIB_ADDADDR),

	SNMP_MIB_ITEM("EchoAdd", MPTCP_MIB_ECHOADD),

	SNMP_MIB_ITEM("RmAddr", MPTCP_MIB_RMADDR),

	SNMP_MIB_ITEM("RmSubflow", MPTCP_MIB_RMSUBFLOW),

	SNMP_MIB_SENTINEL

};

net/mptcp/mib.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_DUPDATA,		/* Segments discarded due to duplicate DSS */

	MPTCP_MIB_ADDADDR,		/* Received ADD_ADDR with echo-flag=0 */

	MPTCP_MIB_ECHOADD,		/* Received ADD_ADDR with echo-flag=1 */

	MPTCP_MIB_RMADDR,		/* Received RM_ADDR */

	MPTCP_MIB_RMSUBFLOW,		/* Remove a subflow */

	__MPTCP_MIB_MAX

};

net/mptcp/pm_netlink.c

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <uapi/linux/mptcp.h>



#include "protocol.h"

#include "mib.h"



/* forward declaration */

static struct genl_family mptcp_genl_family;
@@ -346,6 +347,8 @@ void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk) 
		msk->pm.subflows--;

		WRITE_ONCE(msk->pm.accept_addr, true);



		__MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMADDR);



		break;

	}

}
@@ -379,6 +382,8 @@ void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, u8 rm_id) 
		msk->pm.local_addr_used--;

		msk->pm.subflows--;



		__MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW);



		break;

	}

}