Commit 2fbdd9ea authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: add the mibs for ADD_ADDR with port 



This patch adds the mibs for ADD_ADDR with port:

MPTCP_MIB_PORTADD for received ADD_ADDR suboption with a port number.

MPTCP_MIB_PORTSYNRX, MPTCP_MIB_PORTSYNACKRX, MPTCP_MIB_PORTACKRX, for
received MP_JOIN's SYN or SYN/ACK or ACK with a port number which is
different from the msk's port number.

MPTCP_MIB_MISMATCHPORTSYNRX and MPTCP_MIB_MISMATCHPORTACKRX, for
received SYN or ACK MP_JOIN with a mismatched port-number.

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 d4a7726a

net/mptcp/mib.c

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ 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("PortAdd", MPTCP_MIB_PORTADD),

	SNMP_MIB_ITEM("MPJoinPortSynRx", MPTCP_MIB_JOINPORTSYNRX),

	SNMP_MIB_ITEM("MPJoinPortSynAckRx", MPTCP_MIB_JOINPORTSYNACKRX),

	SNMP_MIB_ITEM("MPJoinPortAckRx", MPTCP_MIB_JOINPORTACKRX),

	SNMP_MIB_ITEM("MismatchPortSynRx", MPTCP_MIB_MISMATCHPORTSYNRX),

	SNMP_MIB_ITEM("MismatchPortAckRx", MPTCP_MIB_MISMATCHPORTACKRX),

	SNMP_MIB_ITEM("RmAddr", MPTCP_MIB_RMADDR),

	SNMP_MIB_ITEM("RmSubflow", MPTCP_MIB_RMSUBFLOW),

	SNMP_MIB_ITEM("MPPrioTx", MPTCP_MIB_MPPRIOTX),

net/mptcp/mib.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ 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_PORTADD,		/* Received ADD_ADDR with a port-number */

	MPTCP_MIB_JOINPORTSYNRX,	/* Received a SYN MP_JOIN with a different port-number */

	MPTCP_MIB_JOINPORTSYNACKRX,	/* Received a SYNACK MP_JOIN with a different port-number */

	MPTCP_MIB_JOINPORTACKRX,	/* Received an ACK MP_JOIN with a different port-number */

	MPTCP_MIB_MISMATCHPORTSYNRX,	/* Received a SYN MP_JOIN with a mismatched port-number */

	MPTCP_MIB_MISMATCHPORTACKRX,	/* Received an ACK MP_JOIN with a mismatched port-number */

	MPTCP_MIB_RMADDR,		/* Received RM_ADDR */

	MPTCP_MIB_RMSUBFLOW,		/* Remove a subflow */

	MPTCP_MIB_MPPRIOTX,		/* Transmit a MP_PRIO */

net/mptcp/options.c

+4 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,10 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) 
			mptcp_pm_del_add_timer(msk, &addr);

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADD);

		}



		if (mp_opt.port)

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_PORTADD);



		mp_opt.add_addr = 0;

	}

net/mptcp/subflow.c

+7 −1
Original line number Diff line number Diff line
@@ -207,8 +207,10 @@ static int subflow_init_req(struct request_sock *req, 
				tcp_request_sock_ops.destructor(req);

				subflow_req->msk = NULL;

				subflow_req->mp_join = 0;

				SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MISMATCHPORTSYNRX);

				return -EPERM;

			}

			SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINPORTSYNRX);

		}



		subflow_req_create_thmac(subflow_req);
@@ -431,6 +433,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) 
			pr_debug("synack inet_dport=%d %d",

				 ntohs(inet_sk(sk)->inet_dport),

				 ntohs(inet_sk(parent)->inet_dport));

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINPORTSYNACKRX);

		}

	} else if (mptcp_check_fallback(sk)) {

fallback:
@@ -702,9 +705,12 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, 
				pr_debug("ack inet_sport=%d %d",

					 ntohs(inet_sk(sk)->inet_sport),

					 ntohs(inet_sk((struct sock *)owner)->inet_sport));

				if (!mptcp_pm_sport_in_anno_list(owner, sk))

				if (!mptcp_pm_sport_in_anno_list(owner, sk)) {

					SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MISMATCHPORTACKRX);

					goto out;

				}

				SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINPORTACKRX);

			}

		}

	}