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

Commit 63231bdd authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

mib: add net to TCP_INC_STATS_BH 



Same as before - the sock is always there to get the net from,
but there are also some places with the net already saved on 
the stack.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81cc8a75

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ extern struct proto tcp_prot; 


DECLARE_SNMP_STAT(struct tcp_mib, tcp_statistics);

#define TCP_INC_STATS(net, field)	do { (void)net; SNMP_INC_STATS(tcp_statistics, field); } while (0)

#define TCP_INC_STATS_BH(field)		SNMP_INC_STATS_BH(tcp_statistics, field)

#define TCP_INC_STATS_BH(net, field)	do { (void)net; SNMP_INC_STATS_BH(tcp_statistics, field); } while (0)

#define TCP_DEC_STATS(field)		SNMP_DEC_STATS(tcp_statistics, field)

#define TCP_ADD_STATS_USER(field, val)	SNMP_ADD_STATS_USER(tcp_statistics, field, val)

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -2663,7 +2663,7 @@ EXPORT_SYMBOL(__tcp_put_md5sig_pool); 
void tcp_done(struct sock *sk)

{

	if(sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)

		TCP_INC_STATS_BH(TCP_MIB_ATTEMPTFAILS);

		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);



	tcp_set_state(sk, TCP_CLOSE);

	tcp_clear_xmit_timers(sk);

net/ipv4/tcp_input.c

+3 −3
Original line number Diff line number Diff line
@@ -4795,7 +4795,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, 
				tcp_data_snd_check(sk);

				return 0;

			} else { /* Header too small */

				TCP_INC_STATS_BH(TCP_MIB_INERRS);

				TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);

				goto discard;

			}

		} else {
@@ -4934,7 +4934,7 @@ slow_path: 
	tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq);



	if (th->syn && !before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) {

		TCP_INC_STATS_BH(TCP_MIB_INERRS);

		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);

		NET_INC_STATS_BH(LINUX_MIB_TCPABORTONSYN);

		tcp_reset(sk);

		return 1;
@@ -4957,7 +4957,7 @@ step5: 
	return 0;



csum_error:

	TCP_INC_STATS_BH(TCP_MIB_INERRS);

	TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);



discard:

	__kfree_skb(skb);

net/ipv4/tcp_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -599,8 +599,8 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) 
	ip_send_reply(net->ipv4.tcp_sock, skb,

		      &arg, arg.iov[0].iov_len);



	TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);

	TCP_INC_STATS_BH(TCP_MIB_OUTRSTS);

	TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);

	TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS);

}



/* The code following below sending ACKs in SYN-RECV and TIME-WAIT states
@@ -674,7 +674,7 @@ static void tcp_v4_send_ack(struct sk_buff *skb, u32 seq, u32 ack, 
	ip_send_reply(net->ipv4.tcp_sock, skb,

		      &arg, arg.iov[0].iov_len);



	TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);

	TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);

}



static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
@@ -1494,7 +1494,7 @@ discard: 
	return 0;



csum_err:

	TCP_INC_STATS_BH(TCP_MIB_INERRS);

	TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);

	goto discard;

}
@@ -1514,7 +1514,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 
		goto discard_it;



	/* Count it even if it's bad */

	TCP_INC_STATS_BH(TCP_MIB_INSEGS);

	TCP_INC_STATS_BH(net, TCP_MIB_INSEGS);



	if (!pskb_may_pull(skb, sizeof(struct tcphdr)))

		goto discard_it;
@@ -1590,7 +1590,7 @@ no_tcp_socket: 


	if (skb->len < (th->doff << 2) || tcp_checksum_complete(skb)) {

bad_packet:

		TCP_INC_STATS_BH(TCP_MIB_INERRS);

		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);

	} else {

		tcp_v4_send_reset(NULL, skb);

	}
@@ -1611,7 +1611,7 @@ do_time_wait: 
	}



	if (skb->len < (th->doff << 2) || tcp_checksum_complete(skb)) {

		TCP_INC_STATS_BH(TCP_MIB_INERRS);

		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);

		inet_twsk_put(inet_twsk(sk));

		goto discard_it;

	}

net/ipv4/tcp_minisocks.c

+2 −2
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, 
		newtp->rx_opt.mss_clamp = req->mss;

		TCP_ECN_openreq_child(newtp, req);



		TCP_INC_STATS_BH(TCP_MIB_PASSIVEOPENS);

		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_PASSIVEOPENS);

	}

	return newsk;

}
@@ -630,7 +630,7 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb, 
		 *	   "fourth, check the SYN bit"

		 */

		if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) {

			TCP_INC_STATS_BH(TCP_MIB_ATTEMPTFAILS);

			TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);

			goto embryonic_reset;

		}