mptcp: add mibs for stale subflows processing

This allows monitoring exceptional events like
active backup scenarios.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c
index ff2cc0e3273df14f8a6afd5deb8330872b19f016..3a7c4e7b2d790d5c03ef097f18aa16beec2e6014 100644 (file)
--- a/net/mptcp/mib.c
+++ b/net/mptcp/mib.c
@@ -45,6 +45,8 @@ static const struct snmp_mib mptcp_snmp_list[] = {
        SNMP_MIB_ITEM("MPPrioTx", MPTCP_MIB_MPPRIOTX),
        SNMP_MIB_ITEM("MPPrioRx", MPTCP_MIB_MPPRIORX),
        SNMP_MIB_ITEM("RcvPruned", MPTCP_MIB_RCVPRUNED),
+       SNMP_MIB_ITEM("SubflowStale", MPTCP_MIB_SUBFLOWSTALE),
+       SNMP_MIB_ITEM("SubflowRecover", MPTCP_MIB_SUBFLOWRECOVER),
        SNMP_MIB_SENTINEL
 };
 

diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h
index 0663cb12b448bf91e716f541b62550a0b76436a1..8ec16c991aac01915eb5a53f7c47e4d80eb9b1d5 100644 (file)
--- a/net/mptcp/mib.h
+++ b/net/mptcp/mib.h
@@ -38,6 +38,8 @@ enum linux_mptcp_mib_field {
        MPTCP_MIB_MPPRIOTX,             /* Transmit a MP_PRIO */
        MPTCP_MIB_MPPRIORX,             /* Received a MP_PRIO */
        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_MAX
 };
 

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index d8a85fe923609e92d06c133087fb6c805b5ff3b2..0ed3e565f8f816d7f8705f8fe84b256106af4f55 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -10,6 +10,8 @@
 #include <net/mptcp.h>
 #include "protocol.h"
 
+#include "mib.h"
+
 /* path manager command handlers */
 
 int mptcp_pm_announce_addr(struct mptcp_sock *msk,

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index c0eb14e05beafdaf0fad5fff714e8bdc5caa91e3..ac0aa6faacfa4234056616670b2eb63d6973630b 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -923,6 +923,7 @@ void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ss
                        if (!tcp_rtx_and_write_queues_empty(ssk)) {
                                subflow->stale = 1;
                                __mptcp_retransmit_pending_data(sk);
+                               MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_SUBFLOWSTALE);
                        }
                        unlock_sock_fast(ssk, slow);
 

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 18d3adccba5c52190b5d4cdf176a68417631f19a..22214a58d8925a525bada85997594586716ac4b8 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1397,6 +1397,7 @@ void mptcp_subflow_set_active(struct mptcp_subflow_context *subflow)
                return;
 
        subflow->stale = 0;
+       MPTCP_INC_STATS(sock_net(mptcp_subflow_tcp_sock(subflow)), MPTCP_MIB_SUBFLOWRECOVER);
 }
 
 bool mptcp_subflow_active(struct mptcp_subflow_context *subflow)