forked from mirrors/linux
45b1a1227a
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: Paolo Abeni <pabeni@redhat.com> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
98 lines
4.6 KiB
C
98 lines
4.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
enum linux_mptcp_mib_field {
|
|
MPTCP_MIB_NUM = 0,
|
|
MPTCP_MIB_MPCAPABLEPASSIVE, /* Received SYN with MP_CAPABLE */
|
|
MPTCP_MIB_MPCAPABLEACTIVE, /* Sent SYN with MP_CAPABLE */
|
|
MPTCP_MIB_MPCAPABLEACTIVEACK, /* Received SYN/ACK with MP_CAPABLE */
|
|
MPTCP_MIB_MPCAPABLEPASSIVEACK, /* Received third ACK with MP_CAPABLE */
|
|
MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK,/* Server-side fallback during 3-way handshake */
|
|
MPTCP_MIB_MPCAPABLEACTIVEFALLBACK, /* Client-side fallback during 3-way handshake */
|
|
MPTCP_MIB_TOKENFALLBACKINIT, /* Could not init/allocate token */
|
|
MPTCP_MIB_RETRANSSEGS, /* Segments retransmitted at the MPTCP-level */
|
|
MPTCP_MIB_JOINNOTOKEN, /* Received MP_JOIN but the token was not found */
|
|
MPTCP_MIB_JOINSYNRX, /* Received a SYN + MP_JOIN */
|
|
MPTCP_MIB_JOINSYNACKRX, /* Received a SYN/ACK + MP_JOIN */
|
|
MPTCP_MIB_JOINSYNACKMAC, /* HMAC was wrong on SYN/ACK + MP_JOIN */
|
|
MPTCP_MIB_JOINACKRX, /* Received an ACK + MP_JOIN */
|
|
MPTCP_MIB_JOINACKMAC, /* HMAC was wrong on ACK + MP_JOIN */
|
|
MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the previous one */
|
|
MPTCP_MIB_INFINITEMAPTX, /* Sent an infinite mapping */
|
|
MPTCP_MIB_INFINITEMAPRX, /* Received an infinite mapping */
|
|
MPTCP_MIB_DSSTCPMISMATCH, /* DSS-mapping did not map with TCP's sequence numbers */
|
|
MPTCP_MIB_DATACSUMERR, /* The data checksum fail */
|
|
MPTCP_MIB_OFOQUEUETAIL, /* Segments inserted into OoO queue tail */
|
|
MPTCP_MIB_OFOQUEUE, /* Segments inserted into OoO queue */
|
|
MPTCP_MIB_OFOMERGE, /* Segments merged in OoO queue */
|
|
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 */
|
|
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_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 */
|
|
MPTCP_MIB_MPFAILTX, /* Transmit a MP_FAIL */
|
|
MPTCP_MIB_MPFAILRX, /* Received a MP_FAIL */
|
|
MPTCP_MIB_MPFASTCLOSETX, /* Transmit a MP_FASTCLOSE */
|
|
MPTCP_MIB_MPFASTCLOSERX, /* Received a MP_FASTCLOSE */
|
|
MPTCP_MIB_MPRSTTX, /* Transmit a MP_RST */
|
|
MPTCP_MIB_MPRSTRX, /* Received a MP_RST */
|
|
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_SNDWNDSHARED, /* Subflow snd wnd is overridden by msk's one */
|
|
MPTCP_MIB_RCVWNDSHARED, /* Subflow rcv wnd is overridden by msk's one */
|
|
MPTCP_MIB_RCVWNDCONFLICTUPDATE, /* subflow rcv wnd is overridden by msk's one due to
|
|
* conflict with another subflow while updating msk rcv wnd
|
|
*/
|
|
MPTCP_MIB_RCVWNDCONFLICT, /* Conflict with while updating msk rcv wnd */
|
|
__MPTCP_MIB_MAX
|
|
};
|
|
|
|
#define LINUX_MIB_MPTCP_MAX __MPTCP_MIB_MAX
|
|
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)
|
|
{
|
|
if (likely(net->mib.mptcp_statistics))
|
|
SNMP_INC_STATS(net->mib.mptcp_statistics, field);
|
|
}
|
|
|
|
static inline void __MPTCP_INC_STATS(struct net *net,
|
|
enum linux_mptcp_mib_field field)
|
|
{
|
|
if (likely(net->mib.mptcp_statistics))
|
|
__SNMP_INC_STATS(net->mib.mptcp_statistics, field);
|
|
}
|
|
|
|
bool mptcp_mib_alloc(struct net *net);
|