Commit 483a47d2 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

ipv6: added net argument to IP6_INC_STATS_BH 



Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bd653c8

include/net/ipv6.h

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ipv6_statistics); 


#define IP6_INC_STATS(net, idev,field)	({ (void)(net); \

		_DEVINC(ipv6, , idev, field); })

#define IP6_INC_STATS_BH(idev,field)	_DEVINC(ipv6, _BH, idev, field)

#define IP6_INC_STATS_BH(net, idev,field) ({ (void)(net); \

		_DEVINC(ipv6, _BH, idev, field); })

#define IP6_ADD_STATS_BH(idev,field,val) _DEVADD(ipv6, _BH, idev, field, val)



DECLARE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);

net/ipv6/exthdrs.c

+24 −18
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int ipv6_destopt_rcv(struct sk_buff *skb) 
	if (!pskb_may_pull(skb, skb_transport_offset(skb) + 8) ||

	    !pskb_may_pull(skb, (skb_transport_offset(skb) +

				 ((skb_transport_header(skb)[1] + 1) << 3)))) {

		IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

		IP6_INC_STATS_BH(dev_net(skb->dst->dev), ip6_dst_idev(skb->dst),

				 IPSTATS_MIB_INHDRERRORS);

		kfree_skb(skb);

		return -1;
@@ -301,7 +301,8 @@ static int ipv6_destopt_rcv(struct sk_buff *skb) 
		return 1;

	}



	IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_INHDRERRORS);

	IP6_INC_STATS_BH(dev_net(dst->dev),

			 ip6_dst_idev(dst), IPSTATS_MIB_INHDRERRORS);

	dst_release(dst);

	return -1;

}
@@ -319,7 +320,8 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	int n, i;

	struct ipv6_rt_hdr *hdr;

	struct rt0_hdr *rthdr;

	int accept_source_route = dev_net(skb->dev)->ipv6.devconf_all->accept_source_route;

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

	int accept_source_route = net->ipv6.devconf_all->accept_source_route;



	idev = in6_dev_get(skb->dev);

	if (idev) {
@@ -331,7 +333,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	if (!pskb_may_pull(skb, skb_transport_offset(skb) + 8) ||

	    !pskb_may_pull(skb, (skb_transport_offset(skb) +

				 ((skb_transport_header(skb)[1] + 1) << 3)))) {

		IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

		IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

				 IPSTATS_MIB_INHDRERRORS);

		kfree_skb(skb);

		return -1;
@@ -341,7 +343,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 


	if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr) ||

	    skb->pkt_type != PACKET_HOST) {

		IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

		IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

				 IPSTATS_MIB_INADDRERRORS);

		kfree_skb(skb);

		return -1;
@@ -356,7 +358,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
			 * processed by own

			 */

			if (!addr) {

				IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

				IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

						 IPSTATS_MIB_INADDRERRORS);

				kfree_skb(skb);

				return -1;
@@ -382,7 +384,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
			goto unknown_rh;

		/* Silently discard invalid RTH type 2 */

		if (hdr->hdrlen != 2 || hdr->segments_left != 1) {

			IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

					 IPSTATS_MIB_INHDRERRORS);

			kfree_skb(skb);

			return -1;
@@ -401,7 +403,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	n = hdr->hdrlen >> 1;



	if (hdr->segments_left > n) {

		IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

		IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

				 IPSTATS_MIB_INHDRERRORS);

		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,

				  ((&hdr->segments_left) -
@@ -415,7 +417,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	if (skb_cloned(skb)) {

		/* the copy is a forwarded packet */

		if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {

			IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

					 IPSTATS_MIB_OUTDISCARDS);

			kfree_skb(skb);

			return -1;
@@ -438,13 +440,13 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
		if (xfrm6_input_addr(skb, (xfrm_address_t *)addr,

				     (xfrm_address_t *)&ipv6_hdr(skb)->saddr,

				     IPPROTO_ROUTING) < 0) {

			IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

					 IPSTATS_MIB_INADDRERRORS);

			kfree_skb(skb);

			return -1;

		}

		if (!ipv6_chk_home_addr(dev_net(skb->dst->dev), addr)) {

			IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

					 IPSTATS_MIB_INADDRERRORS);

			kfree_skb(skb);

			return -1;
@@ -456,7 +458,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	}



	if (ipv6_addr_is_multicast(addr)) {

		IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

		IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

				 IPSTATS_MIB_INADDRERRORS);

		kfree_skb(skb);

		return -1;
@@ -476,7 +478,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 


	if (skb->dst->dev->flags&IFF_LOOPBACK) {

		if (ipv6_hdr(skb)->hop_limit <= 1) {

			IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst),

					 IPSTATS_MIB_INHDRERRORS);

			icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,

				    0, skb->dev);
@@ -492,7 +494,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	return -1;



unknown_rh:

	IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INHDRERRORS);

	IP6_INC_STATS_BH(net, ip6_dst_idev(skb->dst), IPSTATS_MIB_INHDRERRORS);

	icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,

			  (&hdr->type) - skb_network_header(skb));

	return -1;
@@ -579,29 +581,33 @@ static int ipv6_hop_jumbo(struct sk_buff *skb, int optoff) 
{

	const unsigned char *nh = skb_network_header(skb);

	u32 pkt_len;

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



	if (nh[optoff + 1] != 4 || (optoff & 3) != 2) {

		LIMIT_NETDEBUG(KERN_DEBUG "ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n",

			       nh[optoff+1]);

		IP6_INC_STATS_BH(ipv6_skb_idev(skb),

		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),

				 IPSTATS_MIB_INHDRERRORS);

		goto drop;

	}



	pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));

	if (pkt_len <= IPV6_MAXPLEN) {

		IP6_INC_STATS_BH(ipv6_skb_idev(skb), IPSTATS_MIB_INHDRERRORS);

		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),

				 IPSTATS_MIB_INHDRERRORS);

		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);

		return 0;

	}

	if (ipv6_hdr(skb)->payload_len) {

		IP6_INC_STATS_BH(ipv6_skb_idev(skb), IPSTATS_MIB_INHDRERRORS);

		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),

				 IPSTATS_MIB_INHDRERRORS);

		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff);

		return 0;

	}



	if (pkt_len > skb->len - sizeof(struct ipv6hdr)) {

		IP6_INC_STATS_BH(ipv6_skb_idev(skb), IPSTATS_MIB_INTRUNCATEDPKTS);

		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),

				 IPSTATS_MIB_INTRUNCATEDPKTS);

		goto drop;

	}

net/ipv6/ip6_input.c

+16 −11
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 
	struct ipv6hdr *hdr;

	u32 		pkt_len;

	struct inet6_dev *idev;

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



	if (skb->pkt_type == PACKET_OTHERHOST) {

		kfree_skb(skb);
@@ -69,11 +70,11 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 


	idev = __in6_dev_get(skb->dev);



	IP6_INC_STATS_BH(idev, IPSTATS_MIB_INRECEIVES);

	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INRECEIVES);



	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL ||

	    !idev || unlikely(idev->cnf.disable_ipv6)) {

		IP6_INC_STATS_BH(idev, IPSTATS_MIB_INDISCARDS);

		IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDISCARDS);

		rcu_read_unlock();

		goto out;

	}
@@ -118,11 +119,12 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 
	/* pkt_len may be zero if Jumbo payload option is present */

	if (pkt_len || hdr->nexthdr != NEXTHDR_HOP) {

		if (pkt_len + sizeof(struct ipv6hdr) > skb->len) {

			IP6_INC_STATS_BH(idev, IPSTATS_MIB_INTRUNCATEDPKTS);

			IP6_INC_STATS_BH(net,

					 idev, IPSTATS_MIB_INTRUNCATEDPKTS);

			goto drop;

		}

		if (pskb_trim_rcsum(skb, pkt_len + sizeof(struct ipv6hdr))) {

			IP6_INC_STATS_BH(idev, IPSTATS_MIB_INHDRERRORS);

			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);

			goto drop;

		}

		hdr = ipv6_hdr(skb);
@@ -130,7 +132,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 


	if (hdr->nexthdr == NEXTHDR_HOP) {

		if (ipv6_parse_hopopts(skb) < 0) {

			IP6_INC_STATS_BH(idev, IPSTATS_MIB_INHDRERRORS);

			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);

			rcu_read_unlock();

			return 0;

		}
@@ -141,7 +143,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 
	return NF_HOOK(PF_INET6, NF_INET_PRE_ROUTING, skb, dev, NULL,

		       ip6_rcv_finish);

err:

	IP6_INC_STATS_BH(idev, IPSTATS_MIB_INHDRERRORS);

	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);

drop:

	rcu_read_unlock();

	kfree_skb(skb);
@@ -161,6 +163,7 @@ static int ip6_input_finish(struct sk_buff *skb) 
	int nexthdr, raw;

	u8 hash;

	struct inet6_dev *idev;

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



	/*

	 *	Parse extension headers
@@ -205,24 +208,25 @@ static int ip6_input_finish(struct sk_buff *skb) 
		if (ret > 0)

			goto resubmit;

		else if (ret == 0)

			IP6_INC_STATS_BH(idev, IPSTATS_MIB_INDELIVERS);

			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDELIVERS);

	} else {

		if (!raw) {

			if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {

				IP6_INC_STATS_BH(idev, IPSTATS_MIB_INUNKNOWNPROTOS);

				IP6_INC_STATS_BH(net, idev,

						 IPSTATS_MIB_INUNKNOWNPROTOS);

				icmpv6_send(skb, ICMPV6_PARAMPROB,

					    ICMPV6_UNK_NEXTHDR, nhoff,

					    skb->dev);

			}

		} else

			IP6_INC_STATS_BH(idev, IPSTATS_MIB_INDELIVERS);

			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDELIVERS);

		kfree_skb(skb);

	}

	rcu_read_unlock();

	return 0;



discard:

	IP6_INC_STATS_BH(idev, IPSTATS_MIB_INDISCARDS);

	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDISCARDS);

	rcu_read_unlock();

	kfree_skb(skb);

	return 0;
@@ -240,7 +244,8 @@ int ip6_mc_input(struct sk_buff *skb) 
	struct ipv6hdr *hdr;

	int deliver;



	IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS);

	IP6_INC_STATS_BH(dev_net(skb->dst->dev),

			 ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS);



	hdr = ipv6_hdr(skb);

	deliver = ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL);

net/ipv6/ip6_output.c

+11 −7
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ static int ip6_output_finish(struct sk_buff *skb) 
	else if (dst->neighbour)

		return dst->neighbour->output(skb);



	IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);

	IP6_INC_STATS_BH(dev_net(dst->dev),

			 ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);

	kfree_skb(skb);

	return -EINVAL;
@@ -458,7 +459,8 @@ int ip6_forward(struct sk_buff *skb) 
		skb->dev = dst->dev;

		icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,

			    0, skb->dev);

		IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_INHDRERRORS);

		IP6_INC_STATS_BH(net,

				 ip6_dst_idev(dst), IPSTATS_MIB_INHDRERRORS);



		kfree_skb(skb);

		return -ETIMEDOUT;
@@ -527,8 +529,10 @@ int ip6_forward(struct sk_buff *skb) 
		/* Again, force OUTPUT device used as source address */

		skb->dev = dst->dev;

		icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, dst_mtu(dst), skb->dev);

		IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_INTOOBIGERRORS);

		IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_FRAGFAILS);

		IP6_INC_STATS_BH(net,

				 ip6_dst_idev(dst), IPSTATS_MIB_INTOOBIGERRORS);

		IP6_INC_STATS_BH(net,

				 ip6_dst_idev(dst), IPSTATS_MIB_FRAGFAILS);

		kfree_skb(skb);

		return -EMSGSIZE;

	}
@@ -544,12 +548,12 @@ int ip6_forward(struct sk_buff *skb) 


	hdr->hop_limit--;



	IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);

	return NF_HOOK(PF_INET6, NF_INET_FORWARD, skb, skb->dev, dst->dev,

		       ip6_forward_finish);



error:

	IP6_INC_STATS_BH(ip6_dst_idev(dst), IPSTATS_MIB_INADDRERRORS);

	IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_INADDRERRORS);

drop:

	kfree_skb(skb);

	return -EINVAL;
@@ -991,7 +995,7 @@ static int ip6_dst_lookup_tail(struct sock *sk, 


out_err_release:

	if (err == -ENETUNREACH)

		IP6_INC_STATS_BH(NULL, IPSTATS_MIB_OUTNOROUTES);

		IP6_INC_STATS_BH(net, NULL, IPSTATS_MIB_OUTNOROUTES);

	dst_release(*dst);

	*dst = NULL;

	return err;

net/ipv6/ip6mr.c

+2 −1
Original line number Diff line number Diff line
@@ -1383,7 +1383,8 @@ int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg) 


static inline int ip6mr_forward2_finish(struct sk_buff *skb)

{

	IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP6_INC_STATS_BH(dev_net(skb->dst->dev), ip6_dst_idev(skb->dst),

			 IPSTATS_MIB_OUTFORWDATAGRAMS);

	return dst_output(skb);

}