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

mptcp: add the mibs for MP_PRIO 



This patch added the mibs for MP_PRIO, MPTCP_MIB_MPPRIOTX for transmitting
of the MP_PRIO suboption, and MPTCP_MIB_MPPRIORX for receiving of it.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6e8b244a

net/mptcp/mib.c

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

	SNMP_MIB_ITEM("RmAddr", MPTCP_MIB_RMADDR),

	SNMP_MIB_ITEM("RmSubflow", MPTCP_MIB_RMSUBFLOW),

	SNMP_MIB_ITEM("MPPrioTx", MPTCP_MIB_MPPRIOTX),

	SNMP_MIB_ITEM("MPPrioRx", MPTCP_MIB_MPPRIORX),

	SNMP_MIB_SENTINEL

};

net/mptcp/mib.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_ECHOADD,		/* Received ADD_ADDR with echo-flag=1 */

	MPTCP_MIB_RMADDR,		/* Received RM_ADDR */

	MPTCP_MIB_RMSUBFLOW,		/* Remove a subflow */

	MPTCP_MIB_MPPRIOTX,		/* Transmit a MP_PRIO */

	MPTCP_MIB_MPPRIORX,		/* Received a MP_PRIO */

	__MPTCP_MIB_MAX

};

net/mptcp/options.c

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


	if (mp_opt.mp_prio) {

		mptcp_pm_mp_prio_received(sk, mp_opt.backup);

		MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPPRIORX);

		mp_opt.mp_prio = 0;

	}

net/mptcp/pm_netlink.c

+2 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, 


	mptcp_for_each_subflow(msk, subflow) {

		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);

		struct sock *sk = (struct sock *)msk;

		struct mptcp_addr_info local;



		local_address((struct sock_common *)ssk, &local);
@@ -461,6 +462,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, 
		subflow->backup = bkup;

		subflow->send_mp_prio = 1;

		subflow->request_bkup = bkup;

		__MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPPRIOTX);



		spin_unlock_bh(&msk->pm.lock);

		pr_debug("send ack for mp_prio");