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

Commit 0283328e authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

MIB: add struct net to UDP_INC_STATS_BH 



Two special cases here - one is rxrpc - I put init_net there
explicitly, since we haven't touched this part yet. The second
place is in __udp4_lib_rcv - we already have a struct net there,
but I have to move its initialization above to make it ready
at the "drop" label.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 629ca23c

include/net/udp.h

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6); 
#define UDP_INC_STATS_USER(net, field, is_udplite)	      do { (void)net; \

	if (is_udplite) SNMP_INC_STATS_USER(udplite_statistics, field);       \

	else		SNMP_INC_STATS_USER(udp_statistics, field);  }  while(0)

#define UDP_INC_STATS_BH(field, is_udplite) 			       do  {  \

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

	if (is_udplite) SNMP_INC_STATS_BH(udplite_statistics, field);         \

	else		SNMP_INC_STATS_BH(udp_statistics, field);    }  while(0)
@@ -176,12 +176,12 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6); 
#define UDPX_INC_STATS_BH(sk, field) \

	do { \

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

			UDP_INC_STATS_BH(field, 0); \

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

		else \

			UDP6_INC_STATS_BH(field, 0); \

	} while (0);

#else

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

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

#endif



/* /proc */

net/ipv4/udp.c

+10 −8
Original line number Diff line number Diff line
@@ -991,7 +991,8 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) 


			ret = (*up->encap_rcv)(sk, skb);

			if (ret <= 0) {

				UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS,

				UDP_INC_STATS_BH(sock_net(sk),

						 UDP_MIB_INDATAGRAMS,

						 is_udplite);

				return -ret;

			}
@@ -1044,7 +1045,8 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) 
	if ((rc = sock_queue_rcv_skb(sk,skb)) < 0) {

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

		if (rc == -ENOMEM) {

			UDP_INC_STATS_BH(UDP_MIB_RCVBUFERRORS, is_udplite);

			UDP_INC_STATS_BH(sock_net(sk),

					UDP_MIB_RCVBUFERRORS, is_udplite);

			atomic_inc(&sk->sk_drops);

		}

		goto drop;
@@ -1053,7 +1055,7 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) 
	return 0;



drop:

	UDP_INC_STATS_BH(UDP_MIB_INERRORS, is_udplite);

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

	kfree_skb(skb);

	return -1;

}
@@ -1161,7 +1163,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[], 
	struct rtable *rt = (struct rtable*)skb->dst;

	__be32 saddr = ip_hdr(skb)->saddr;

	__be32 daddr = ip_hdr(skb)->daddr;

	struct net *net;

	struct net *net = dev_net(skb->dev);



	/*

	 *  Validate the packet.
@@ -1183,7 +1185,6 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[], 
	if (udp4_csum_init(skb, uh, proto))

		goto csum_error;



	net = dev_net(skb->dev);

	if (rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST))

		return __udp4_lib_mcast_deliver(net, skb, uh,

				saddr, daddr, udptable);
@@ -1217,7 +1218,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[], 
	if (udp_lib_checksum_complete(skb))

		goto csum_error;



	UDP_INC_STATS_BH(UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);

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

	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);



	/*
@@ -1251,7 +1252,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[], 
		       ntohs(uh->dest),

		       ulen);

drop:

	UDP_INC_STATS_BH(UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);

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

	kfree_skb(skb);

	return 0;

}
@@ -1458,7 +1459,8 @@ unsigned int udp_poll(struct file *file, struct socket *sock, poll_table *wait) 
		spin_lock_bh(&rcvq->lock);

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

		       udp_lib_checksum_complete(skb)) {

			UDP_INC_STATS_BH(UDP_MIB_INERRORS, is_lite);

			UDP_INC_STATS_BH(sock_net(sk),

					UDP_MIB_INERRORS, is_lite);

			__skb_unlink(skb, rcvq);

			kfree_skb(skb);

		}

net/rxrpc/ar-input.c

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <net/af_rxrpc.h>

#include <net/ip.h>

#include <net/udp.h>

#include <net/net_namespace.h>

#include "ar-internal.h"



unsigned long rxrpc_ack_timeout = 1;
@@ -708,12 +709,12 @@ void rxrpc_data_ready(struct sock *sk, int count) 
	if (skb_checksum_complete(skb)) {

		rxrpc_free_skb(skb);

		rxrpc_put_local(local);

		UDP_INC_STATS_BH(UDP_MIB_INERRORS, 0);

		UDP_INC_STATS_BH(&init_net, UDP_MIB_INERRORS, 0);

		_leave(" [CSUM failed]");

		return;

	}



	UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS, 0);

	UDP_INC_STATS_BH(&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 */