Commit 45b1a122 authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

mptcp: introduces more address related mibs 

Currently we don't track explicitly a few events related to address
management suboption handling; this patch adds new mibs for ADD_ADDR
and RM_ADDR options tx and for missed tx events due to internal storage
exhaustion.

The self-tests must be updated to properly handle different mibs with
the same/shared prefix.

Additionally removes a couple of warning tracking the loss event.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/378


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e76c8ef5

net/mptcp/mib.c

+6 −0
Original line number Diff line number Diff line
@@ -34,7 +34,11 @@ static const struct snmp_mib mptcp_snmp_list[] = { 
	SNMP_MIB_ITEM("NoDSSInWindow", MPTCP_MIB_NODSSWINDOW),

	SNMP_MIB_ITEM("DuplicateData", MPTCP_MIB_DUPDATA),

	SNMP_MIB_ITEM("AddAddr", MPTCP_MIB_ADDADDR),

	SNMP_MIB_ITEM("AddAddrTx", MPTCP_MIB_ADDADDRTX),

	SNMP_MIB_ITEM("AddAddrTxDrop", MPTCP_MIB_ADDADDRTXDROP),

	SNMP_MIB_ITEM("EchoAdd", MPTCP_MIB_ECHOADD),

	SNMP_MIB_ITEM("EchoAddTx", MPTCP_MIB_ECHOADDTX),

	SNMP_MIB_ITEM("EchoAddTxDrop", MPTCP_MIB_ECHOADDTXDROP),

	SNMP_MIB_ITEM("PortAdd", MPTCP_MIB_PORTADD),

	SNMP_MIB_ITEM("AddAddrDrop", MPTCP_MIB_ADDADDRDROP),

	SNMP_MIB_ITEM("MPJoinPortSynRx", MPTCP_MIB_JOINPORTSYNRX),
@@ -44,6 +48,8 @@ static const struct snmp_mib mptcp_snmp_list[] = { 
	SNMP_MIB_ITEM("MismatchPortAckRx", MPTCP_MIB_MISMATCHPORTACKRX),

	SNMP_MIB_ITEM("RmAddr", MPTCP_MIB_RMADDR),

	SNMP_MIB_ITEM("RmAddrDrop", MPTCP_MIB_RMADDRDROP),

	SNMP_MIB_ITEM("RmAddrTx", MPTCP_MIB_RMADDRTX),

	SNMP_MIB_ITEM("RmAddrTxDrop", MPTCP_MIB_RMADDRTXDROP),

	SNMP_MIB_ITEM("RmSubflow", MPTCP_MIB_RMSUBFLOW),

	SNMP_MIB_ITEM("MPPrioTx", MPTCP_MIB_MPPRIOTX),

	SNMP_MIB_ITEM("MPPrioRx", MPTCP_MIB_MPPRIORX),

net/mptcp/mib.h

+18 −0
Original line number Diff line number Diff line
@@ -27,7 +27,15 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_NODSSWINDOW,		/* Segments not in MPTCP windows */

	MPTCP_MIB_DUPDATA,		/* Segments discarded due to duplicate DSS */

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

	MPTCP_MIB_ADDADDRTX,		/* Sent ADD_ADDR with echo-flag=0 */

	MPTCP_MIB_ADDADDRTXDROP,	/* ADD_ADDR with echo-flag=0 not send due to

					 * resource exhaustion

					 */

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

	MPTCP_MIB_ECHOADDTX,		/* Send ADD_ADDR with echo-flag=1 */

	MPTCP_MIB_ECHOADDTXDROP,	/* ADD_ADDR with echo-flag=1 not send due

					 * to resource exhaustion

					 */

	MPTCP_MIB_PORTADD,		/* Received ADD_ADDR with a port-number */

	MPTCP_MIB_ADDADDRDROP,		/* Dropped incoming ADD_ADDR */

	MPTCP_MIB_JOINPORTSYNRX,	/* Received a SYN MP_JOIN with a different port-number */
@@ -37,6 +45,8 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_MISMATCHPORTACKRX,	/* Received an ACK MP_JOIN with a mismatched port-number */

	MPTCP_MIB_RMADDR,		/* Received RM_ADDR */

	MPTCP_MIB_RMADDRDROP,		/* Dropped incoming RM_ADDR */

	MPTCP_MIB_RMADDRTX,		/* Sent RM_ADDR */

	MPTCP_MIB_RMADDRTXDROP,		/* RM_ADDR not sent due to resource exhaustion */

	MPTCP_MIB_RMSUBFLOW,		/* Remove a subflow */

	MPTCP_MIB_MPPRIOTX,		/* Transmit a MP_PRIO */

	MPTCP_MIB_MPPRIORX,		/* Received a MP_PRIO */
@@ -63,6 +73,14 @@ struct mptcp_mib { 
	unsigned long mibs[LINUX_MIB_MPTCP_MAX];

};



static inline void MPTCP_ADD_STATS(struct net *net,

				   enum linux_mptcp_mib_field field,

				   int val)

{

	if (likely(net->mib.mptcp_statistics))

		SNMP_ADD_STATS(net->mib.mptcp_statistics, field, val);

}



static inline void MPTCP_INC_STATS(struct net *net,

				   enum linux_mptcp_mib_field field)

{

net/mptcp/options.c

+4 −1
Original line number Diff line number Diff line
@@ -687,9 +687,12 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff * 
	}

	opts->suboptions |= OPTION_MPTCP_ADD_ADDR;

	if (!echo) {

		MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ADDADDRTX);

		opts->ahmac = add_addr_generate_hmac(msk->local_key,

						     msk->remote_key,

						     &opts->addr);

	} else {

		MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADDTX);

	}

	pr_debug("addr_id=%d, ahmac=%llu, echo=%d, port=%d",

		 opts->addr.id, opts->ahmac, echo, ntohs(opts->addr.port));
@@ -723,7 +726,7 @@ static bool mptcp_established_options_rm_addr(struct sock *sk, 


	for (i = 0; i < opts->rm_list.nr; i++)

		pr_debug("rm_list_ids[%d]=%d", i, opts->rm_list.ids[i]);



	MPTCP_ADD_STATS(sock_net(sk), MPTCP_MIB_RMADDRTX, opts->rm_list.nr);

	return true;

}

net/mptcp/pm.c

+4 −2
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, 


	if (add_addr &

	    (echo ? BIT(MPTCP_ADD_ADDR_ECHO) : BIT(MPTCP_ADD_ADDR_SIGNAL))) {

		pr_warn("addr_signal error, add_addr=%d, echo=%d", add_addr, echo);

		MPTCP_INC_STATS(sock_net((struct sock *)msk),

				echo ? MPTCP_MIB_ECHOADDTXDROP : MPTCP_MIB_ADDADDRTXDROP);

		return -EINVAL;

	}
@@ -48,7 +49,8 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_ 
	pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list->nr);



	if (rm_addr) {

		pr_warn("addr_signal error, rm_addr=%d", rm_addr);

		MPTCP_ADD_STATS(sock_net((struct sock *)msk),

				MPTCP_MIB_RMADDRTXDROP, rm_list->nr);

		return -EINVAL;

	}

tools/testing/selftests/net/mptcp/mptcp_join.sh

+2 −2
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ chk_add_nr() 
	fi



	echo -n " - echo  "

	count=$(ip netns exec $ns1 nstat -as | grep MPTcpExtEchoAdd | awk '{print $2}')

	count=$(ip netns exec $ns1 nstat -as MPTcpExtEchoAdd | grep MPTcpExtEchoAdd | awk '{print $2}')

	[ -z "$count" ] && count=0

	if [ "$count" != "$echo_nr" ]; then

		echo "[fail] got $count ADD_ADDR echo[s] expected $echo_nr"
@@ -1614,7 +1614,7 @@ chk_rm_nr() 
	fi



	printf "%-${nr_blank}s %s" " " "rm "

	count=$(ip netns exec $addr_ns nstat -as | grep MPTcpExtRmAddr | awk '{print $2}')

	count=$(ip netns exec $addr_ns nstat -as MPTcpExtRmAddr | grep MPTcpExtRmAddr | awk '{print $2}')

	[ -z "$count" ] && count=0

	if [ "$count" != "$rm_addr_nr" ]; then

		echo "[fail] got $count RM_ADDR[s] expected $rm_addr_nr"