Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa2ea058 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

tcp: fix outsegs stat for TSO segments 



Account for TSO segments of an skb in TCP_MIB_OUTSEGS counter.  Without
doing this, the counter can be off by orders of magnitude from the
actual number of segments sent.

Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3cfa856d

include/net/snmp.h

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ struct linux_xfrm_mib { 
			__this_cpu_add(mib[0]->mibs[field], addend)

#define SNMP_ADD_STATS_USER(mib, field, addend)	\

			this_cpu_add(mib[1]->mibs[field], addend)

#define SNMP_ADD_STATS(mib, field, addend)	\

			this_cpu_add(mib[0]->mibs[field], addend)

/*

 * Use "__typeof__(*mib[0]) *ptr" instead of "__typeof__(mib[0]) ptr"

 * to make @ptr a non-percpu pointer.

include/net/tcp.h

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ extern struct proto tcp_prot; 
#define TCP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.tcp_statistics, field)

#define TCP_DEC_STATS(net, field)	SNMP_DEC_STATS((net)->mib.tcp_statistics, field)

#define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)

#define TCP_ADD_STATS(net, field, val)	SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val)



extern void			tcp_v4_err(struct sk_buff *skb, u32);

net/ipv4/tcp_output.c

+3 −2
Original line number Diff line number Diff line
@@ -888,7 +888,8 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, 
		tcp_event_data_sent(tp, skb, sk);



	if (after(tcb->end_seq, tp->snd_nxt) || tcb->seq == tcb->end_seq)

		TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);

		TCP_ADD_STATS(sock_net(sk), TCP_MIB_OUTSEGS,

			      tcp_skb_pcount(skb));



	err = icsk->icsk_af_ops->queue_xmit(skb);

	if (likely(err <= 0))
@@ -2503,7 +2504,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, 
	th->window = htons(min(req->rcv_wnd, 65535U));

	tcp_options_write((__be32 *)(th + 1), tp, &opts);

	th->doff = (tcp_header_size >> 2);

	TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);

	TCP_ADD_STATS(sock_net(sk), TCP_MIB_OUTSEGS, tcp_skb_pcount(skb));



#ifdef CONFIG_TCP_MD5SIG

	/* Okay, we have all we need - do the md5 hash if needed */