Commit fc518953 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

mptcp: add and use MIB counter infrastructure 



Exported via same /proc file as the Linux TCP MIB counters, so "netstat -s"
or "nstat" will show them automatically.

The MPTCP MIB counters are allocated in a distinct pcpu area in order to
avoid bloating/wasting TCP pcpu memory.

Counters are allocated once the first MPTCP socket is created in a
network namespace and free'd on exit.

If no sockets have been allocated, all-zero mptcp counters are shown.

The MIB counter list is taken from the multipath-tcp.org kernel, but
only a few counters have been picked up so far.  The counter list can
be increased at any time later on.

v2 -> v3:
 - remove 'inline' in foo.c files (David S. Miller)

Co-developed-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5147dfb5

include/net/mptcp.h

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/tcp.h>

#include <linux/types.h>



struct seq_file;



/* MPTCP sk_buff extension data */

struct mptcp_ext {

	u64		data_ack;
@@ -123,6 +125,7 @@ static inline bool mptcp_skb_can_collapse(const struct sk_buff *to, 


bool mptcp_sk_is_subflow(const struct sock *sk);



void mptcp_seq_show(struct seq_file *seq);

#else



static inline void mptcp_init(void)
@@ -194,6 +197,7 @@ static inline bool mptcp_sk_is_subflow(const struct sock *sk) 
	return false;

}



static inline void mptcp_seq_show(struct seq_file *seq) { }

#endif /* CONFIG_MPTCP */



#if IS_ENABLED(CONFIG_MPTCP_IPV6)

include/net/netns/mib.h

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ struct netns_mib { 
#if IS_ENABLED(CONFIG_TLS)

	DEFINE_SNMP_STAT(struct linux_tls_mib, tls_statistics);

#endif

#ifdef CONFIG_MPTCP

	DEFINE_SNMP_STAT(struct mptcp_mib, mptcp_statistics);

#endif

};



#endif

net/ipv4/af_inet.c

+4 −0
Original line number Diff line number Diff line
@@ -1793,6 +1793,10 @@ static __net_exit void ipv4_mib_exit_net(struct net *net) 
	free_percpu(net->mib.net_statistics);

	free_percpu(net->mib.ip_statistics);

	free_percpu(net->mib.tcp_statistics);

#ifdef CONFIG_MPTCP

	/* allocated on demand, see mptcp_init_sock() */

	free_percpu(net->mib.mptcp_statistics);

#endif

}



static __net_initdata struct pernet_operations ipv4_mib_ops = {

net/ipv4/proc.c

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <net/icmp.h>

#include <net/protocol.h>

#include <net/tcp.h>

#include <net/mptcp.h>

#include <net/udp.h>

#include <net/udplite.h>

#include <linux/bottom_half.h>
@@ -485,6 +486,7 @@ static int netstat_seq_show(struct seq_file *seq, void *v) 
					     offsetof(struct ipstats_mib, syncp)));



	seq_putc(seq, '\n');

	mptcp_seq_show(seq);

	return 0;

}

net/mptcp/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_MPTCP) += mptcp.o



mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o
 
mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o mib.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE