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

Commit 02c22347 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: udp: rename UDP_INC_STATS_BH() 



Rename UDP_INC_STATS_BH() to __UDP_INC_STATS(),
and UDP6_INC_STATS_BH() to __UDP6_INC_STATS()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d3848bc

include/net/udp.h

+6 −6
Original line number Diff line number Diff line
@@ -292,11 +292,11 @@ struct sock *udp6_lib_lookup_skb(struct sk_buff *skb, 
#define UDP_INC_STATS(net, field, is_udplite)		      do { \

	if (is_udplite) SNMP_INC_STATS((net)->mib.udplite_statistics, field);       \

	else		SNMP_INC_STATS((net)->mib.udp_statistics, field);  }  while(0)

#define UDP_INC_STATS_BH(net, field, is_udplite) 	      do { \

#define __UDP_INC_STATS(net, field, is_udplite) 	      do { \

	if (is_udplite) SNMP_INC_STATS_BH((net)->mib.udplite_statistics, field);         \

	else		SNMP_INC_STATS_BH((net)->mib.udp_statistics, field);    }  while(0)



#define UDP6_INC_STATS_BH(net, field, is_udplite)	    do { \

#define __UDP6_INC_STATS(net, field, is_udplite)	    do { \

	if (is_udplite) SNMP_INC_STATS_BH((net)->mib.udplite_stats_in6, field);\

	else		SNMP_INC_STATS_BH((net)->mib.udp_stats_in6, field);  \

} while(0)
@@ -306,15 +306,15 @@ struct sock *udp6_lib_lookup_skb(struct sk_buff *skb, 
} while(0)



#if IS_ENABLED(CONFIG_IPV6)

#define UDPX_INC_STATS_BH(sk, field)					\

#define __UDPX_INC_STATS(sk, field)					\

do {									\

	if ((sk)->sk_family == AF_INET)					\

		UDP_INC_STATS_BH(sock_net(sk), field, 0);		\

		__UDP_INC_STATS(sock_net(sk), field, 0);		\

	else								\

		UDP6_INC_STATS_BH(sock_net(sk), field, 0);		\

		__UDP6_INC_STATS(sock_net(sk), field, 0);		\

} while (0)

#else

#define UDPX_INC_STATS_BH(sk, field) UDP_INC_STATS_BH(sock_net(sk), field, 0)

#define __UDPX_INC_STATS(sk, field) __UDP_INC_STATS(sock_net(sk), field, 0)

#endif



/* /proc */

net/ipv4/udp.c

+23 −23
Original line number Diff line number Diff line
@@ -1242,9 +1242,9 @@ static unsigned int first_packet_length(struct sock *sk) 
	spin_lock_bh(&rcvq->lock);

	while ((skb = skb_peek(rcvq)) != NULL &&

		udp_lib_checksum_complete(skb)) {

		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS,

		__UDP_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS,

				IS_UDPLITE(sk));

		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,

		__UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS,

				IS_UDPLITE(sk));

		atomic_inc(&sk->sk_drops);

		__skb_unlink(skb, rcvq);
@@ -1514,9 +1514,9 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


		/* Note that an ENOMEM error is charged twice */

		if (rc == -ENOMEM)

			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,

			__UDP_INC_STATS(sock_net(sk), UDP_MIB_RCVBUFERRORS,

					is_udplite);

		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

		__UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

		kfree_skb(skb);

		trace_udp_fail_queue_rcv_skb(rc, sk);

		return -1;
@@ -1580,7 +1580,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


			ret = encap_rcv(sk, skb);

			if (ret <= 0) {

				UDP_INC_STATS_BH(sock_net(sk),

				__UDP_INC_STATS(sock_net(sk),

						UDP_MIB_INDATAGRAMS,

						is_udplite);

				return -ret;
@@ -1633,7 +1633,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


	udp_csum_pull_header(skb);

	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {

		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,

		__UDP_INC_STATS(sock_net(sk), UDP_MIB_RCVBUFERRORS,

				is_udplite);

		goto drop;

	}
@@ -1653,9 +1653,9 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
	return rc;



csum_error:

	UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);

	__UDP_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);

drop:

	UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

	__UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

	atomic_inc(&sk->sk_drops);

	kfree_skb(skb);

	return -1;
@@ -1715,9 +1715,9 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb, 


		if (unlikely(!nskb)) {

			atomic_inc(&sk->sk_drops);

			UDP_INC_STATS_BH(net, UDP_MIB_RCVBUFERRORS,

			__UDP_INC_STATS(net, UDP_MIB_RCVBUFERRORS,

					IS_UDPLITE(sk));

			UDP_INC_STATS_BH(net, UDP_MIB_INERRORS,

			__UDP_INC_STATS(net, UDP_MIB_INERRORS,

					IS_UDPLITE(sk));

			continue;

		}
@@ -1736,7 +1736,7 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb, 
			consume_skb(skb);

	} else {

		kfree_skb(skb);

		UDP_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI,

		__UDP_INC_STATS(net, UDP_MIB_IGNOREDMULTI,

				proto == IPPROTO_UDPLITE);

	}

	return 0;
@@ -1851,7 +1851,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, 
	if (udp_lib_checksum_complete(skb))

		goto csum_error;



	UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);

	__UDP_INC_STATS(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);

	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);



	/*
@@ -1878,9 +1878,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, 
			    proto == IPPROTO_UDPLITE ? "Lite" : "",

			    &saddr, ntohs(uh->source), &daddr, ntohs(uh->dest),

			    ulen);

	UDP_INC_STATS_BH(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE);

	__UDP_INC_STATS(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE);

drop:

	UDP_INC_STATS_BH(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);

	__UDP_INC_STATS(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);

	kfree_skb(skb);

	return 0;

}

net/ipv6/udp.c

+19 −19
Original line number Diff line number Diff line
@@ -570,9 +570,9 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


		/* Note that an ENOMEM error is charged twice */

		if (rc == -ENOMEM)

			UDP6_INC_STATS_BH(sock_net(sk),

			__UDP6_INC_STATS(sock_net(sk),

					 UDP_MIB_RCVBUFERRORS, is_udplite);

		UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

		__UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

		kfree_skb(skb);

		return -1;

	}
@@ -628,7 +628,7 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


			ret = encap_rcv(sk, skb);

			if (ret <= 0) {

				UDP_INC_STATS_BH(sock_net(sk),

				__UDP_INC_STATS(sock_net(sk),

						UDP_MIB_INDATAGRAMS,

						is_udplite);

				return -ret;
@@ -664,7 +664,7 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


	udp_csum_pull_header(skb);

	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {

		UDP6_INC_STATS_BH(sock_net(sk),

		__UDP6_INC_STATS(sock_net(sk),

				 UDP_MIB_RCVBUFERRORS, is_udplite);

		goto drop;

	}
@@ -684,9 +684,9 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
	return rc;



csum_error:

	UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);

	__UDP6_INC_STATS(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);

drop:

	UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

	__UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);

	atomic_inc(&sk->sk_drops);

	kfree_skb(skb);

	return -1;
@@ -769,9 +769,9 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb, 
		nskb = skb_clone(skb, GFP_ATOMIC);

		if (unlikely(!nskb)) {

			atomic_inc(&sk->sk_drops);

			UDP6_INC_STATS_BH(net, UDP_MIB_RCVBUFERRORS,

			__UDP6_INC_STATS(net, UDP_MIB_RCVBUFERRORS,

					 IS_UDPLITE(sk));

			UDP6_INC_STATS_BH(net, UDP_MIB_INERRORS,

			__UDP6_INC_STATS(net, UDP_MIB_INERRORS,

					 IS_UDPLITE(sk));

			continue;

		}
@@ -791,7 +791,7 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb, 
			consume_skb(skb);

	} else {

		kfree_skb(skb);

		UDP6_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI,

		__UDP6_INC_STATS(net, UDP_MIB_IGNOREDMULTI,

				 proto == IPPROTO_UDPLITE);

	}

	return 0;
@@ -885,7 +885,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, 
	if (udp_lib_checksum_complete(skb))

		goto csum_error;



	UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);

	__UDP6_INC_STATS(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);

	icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);



	kfree_skb(skb);
@@ -899,9 +899,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, 
			    daddr, ntohs(uh->dest));

	goto discard;

csum_error:

	UDP6_INC_STATS_BH(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE);

	__UDP6_INC_STATS(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE);

discard:

	UDP6_INC_STATS_BH(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);

	__UDP6_INC_STATS(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);

	kfree_skb(skb);

	return 0;

}

net/rxrpc/ar-input.c

+2 −2
Original line number Diff line number Diff line
@@ -698,12 +698,12 @@ void rxrpc_data_ready(struct sock *sk) 
	if (skb_checksum_complete(skb)) {

		rxrpc_free_skb(skb);

		rxrpc_put_local(local);

		UDP_INC_STATS_BH(&init_net, UDP_MIB_INERRORS, 0);

		__UDP_INC_STATS(&init_net, UDP_MIB_INERRORS, 0);

		_leave(" [CSUM failed]");

		return;

	}



	UDP_INC_STATS_BH(&init_net, UDP_MIB_INDATAGRAMS, 0);

	__UDP_INC_STATS(&init_net, UDP_MIB_INDATAGRAMS, 0);



	/* The socket buffer we have is owned by UDP, with UDP's data all over

	 * it, but we really want our own data there.

net/sunrpc/xprtsock.c

+2 −2
Original line number Diff line number Diff line
@@ -1018,11 +1018,11 @@ static void xs_udp_data_read_skb(struct rpc_xprt *xprt, 


	/* Suck it into the iovec, verify checksum if not done by hw. */

	if (csum_partial_copy_to_xdr(&rovr->rq_private_buf, skb)) {

		UDPX_INC_STATS_BH(sk, UDP_MIB_INERRORS);

		__UDPX_INC_STATS(sk, UDP_MIB_INERRORS);

		goto out_unlock;

	}



	UDPX_INC_STATS_BH(sk, UDP_MIB_INDATAGRAMS);

	__UDPX_INC_STATS(sk, UDP_MIB_INDATAGRAMS);



	xprt_adjust_cwnd(xprt, task, copied);

	xprt_complete_rqst(task, copied);