Commit edf391ff authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

snmp: add missing counters for RFC 4293 

The IP MIB (RFC 4293) defines stats for InOctets, OutOctets, InMcastOctets and
OutMcastOctets:
http://tools.ietf.org/html/rfc4293


But it seems we don't track those in any way that easy to separate from other
protocols.  This patch adds those missing counters to the stats file. Tested
successfully by me

With help from Eric Dumazet.

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06bd12c3

include/linux/snmp.h

+8 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
enum

enum

{

{

	IPSTATS_MIB_NUM = 0,

	IPSTATS_MIB_NUM = 0,

	IPSTATS_MIB_INRECEIVES,			/* InReceives */

	IPSTATS_MIB_INPKTS,			/* InReceives */

	IPSTATS_MIB_INHDRERRORS,		/* InHdrErrors */

	IPSTATS_MIB_INHDRERRORS,		/* InHdrErrors */

	IPSTATS_MIB_INTOOBIGERRORS,		/* InTooBigErrors */

	IPSTATS_MIB_INTOOBIGERRORS,		/* InTooBigErrors */

	IPSTATS_MIB_INNOROUTES,			/* InNoRoutes */

	IPSTATS_MIB_INNOROUTES,			/* InNoRoutes */
@@ -28,7 +28,7 @@ enum 
	IPSTATS_MIB_INDISCARDS,			/* InDiscards */

	IPSTATS_MIB_INDISCARDS,			/* InDiscards */

	IPSTATS_MIB_INDELIVERS,			/* InDelivers */

	IPSTATS_MIB_INDELIVERS,			/* InDelivers */

	IPSTATS_MIB_OUTFORWDATAGRAMS,		/* OutForwDatagrams */

	IPSTATS_MIB_OUTFORWDATAGRAMS,		/* OutForwDatagrams */

	IPSTATS_MIB_OUTREQUESTS,		/* OutRequests */

	IPSTATS_MIB_OUTPKTS,			/* OutRequests */

	IPSTATS_MIB_OUTDISCARDS,		/* OutDiscards */

	IPSTATS_MIB_OUTDISCARDS,		/* OutDiscards */

	IPSTATS_MIB_OUTNOROUTES,		/* OutNoRoutes */

	IPSTATS_MIB_OUTNOROUTES,		/* OutNoRoutes */

	IPSTATS_MIB_REASMTIMEOUT,		/* ReasmTimeout */

	IPSTATS_MIB_REASMTIMEOUT,		/* ReasmTimeout */
@@ -42,6 +42,12 @@ enum 
	IPSTATS_MIB_OUTMCASTPKTS,		/* OutMcastPkts */

	IPSTATS_MIB_OUTMCASTPKTS,		/* OutMcastPkts */

	IPSTATS_MIB_INBCASTPKTS,		/* InBcastPkts */

	IPSTATS_MIB_INBCASTPKTS,		/* InBcastPkts */

	IPSTATS_MIB_OUTBCASTPKTS,		/* OutBcastPkts */

	IPSTATS_MIB_OUTBCASTPKTS,		/* OutBcastPkts */

	IPSTATS_MIB_INOCTETS,			/* InOctets */

	IPSTATS_MIB_OUTOCTETS,			/* OutOctets */

	IPSTATS_MIB_INMCASTOCTETS,		/* InMcastOctets */

	IPSTATS_MIB_OUTMCASTOCTETS,		/* OutMcastOctets */

	IPSTATS_MIB_INBCASTOCTETS,		/* InBcastOctets */

	IPSTATS_MIB_OUTBCASTOCTETS,		/* OutBcastOctets */

	__IPSTATS_MIB_MAX

	__IPSTATS_MIB_MAX

};

};

include/net/ip.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -168,7 +168,10 @@ struct ipv4_config 
extern struct ipv4_config ipv4_config;

extern struct ipv4_config ipv4_config;

#define IP_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.ip_statistics, field)

#define IP_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.ip_statistics, field)

#define IP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.ip_statistics, field)

#define IP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.ip_statistics, field)

#define IP_ADD_STATS(net, field, val)	SNMP_ADD_STATS((net)->mib.ip_statistics, field, val)

#define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH((net)->mib.ip_statistics, field, val)

#define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH((net)->mib.ip_statistics, field, val)

#define IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS((net)->mib.ip_statistics, field, val)

#define IP_UPD_PO_STATS_BH(net, field, val) SNMP_UPD_PO_STATS_BH((net)->mib.ip_statistics, field, val)

#define NET_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.net_statistics, field)

#define NET_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.net_statistics, field)

#define NET_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.net_statistics, field)

#define NET_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.net_statistics, field)

#define NET_INC_STATS_USER(net, field) 	SNMP_INC_STATS_USER((net)->mib.net_statistics, field)

#define NET_INC_STATS_USER(net, field) 	SNMP_INC_STATS_USER((net)->mib.net_statistics, field)

include/net/ipv6.h

+14 −1
Original line number Original line Diff line number Diff line
@@ -126,15 +126,28 @@ extern struct ctl_path net_ipv6_ctl_path[]; 
	SNMP_ADD_STATS##modifier((net)->mib.statname##_statistics, (field), (val));\

	SNMP_ADD_STATS##modifier((net)->mib.statname##_statistics, (field), (val));\

})

})





#define _DEVUPD(net, statname, modifier, idev, field, val)		\

({									\

	struct inet6_dev *_idev = (idev);				\

	if (likely(_idev != NULL))					\

		SNMP_UPD_PO_STATS##modifier((_idev)->stats.statname, field, (val)); \

	SNMP_UPD_PO_STATS##modifier((net)->mib.statname##_statistics, field, (val));\

})



/* MIBs */

/* MIBs */





#define IP6_INC_STATS(net, idev,field)		\

#define IP6_INC_STATS(net, idev,field)		\

		_DEVINC(net, ipv6, , idev, field)

		_DEVINC(net, ipv6, , idev, field)

#define IP6_INC_STATS_BH(net, idev,field)	\

#define IP6_INC_STATS_BH(net, idev,field)	\

		_DEVINC(net, ipv6, _BH, idev, field)

		_DEVINC(net, ipv6, _BH, idev, field)

#define IP6_ADD_STATS(net, idev,field,val)	\

		_DEVADD(net, ipv6, , idev, field, val)

#define IP6_ADD_STATS_BH(net, idev,field,val)	\

#define IP6_ADD_STATS_BH(net, idev,field,val)	\

		_DEVADD(net, ipv6, _BH, idev, field, val)

		_DEVADD(net, ipv6, _BH, idev, field, val)



#define IP6_UPD_PO_STATS(net, idev,field,val)   \

		_DEVUPD(net, ipv6, , idev, field, val)

#define IP6_UPD_PO_STATS_BH(net, idev,field,val)   \

		_DEVUPD(net, ipv6, _BH, idev, field, val)

#define ICMP6_INC_STATS(net, idev, field)	\

#define ICMP6_INC_STATS(net, idev, field)	\

		_DEVINC(net, icmpv6, , idev, field)

		_DEVINC(net, icmpv6, , idev, field)

#define ICMP6_INC_STATS_BH(net, idev, field)	\

#define ICMP6_INC_STATS_BH(net, idev, field)	\

include/net/snmp.h

+18 −1
Original line number Original line Diff line number Diff line
@@ -153,6 +153,11 @@ struct linux_xfrm_mib { 
		per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field]--; \

		per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field]--; \

		put_cpu(); \

		put_cpu(); \

	} while (0)

	} while (0)

#define SNMP_ADD_STATS(mib, field, addend) 	\

	do { \

		per_cpu_ptr(mib[!in_softirq()], get_cpu())->mibs[field] += addend; \

		put_cpu(); \

	} while (0)

#define SNMP_ADD_STATS_BH(mib, field, addend) 	\

#define SNMP_ADD_STATS_BH(mib, field, addend) 	\

	(per_cpu_ptr(mib[0], raw_smp_processor_id())->mibs[field] += addend)

	(per_cpu_ptr(mib[0], raw_smp_processor_id())->mibs[field] += addend)

#define SNMP_ADD_STATS_USER(mib, field, addend) 	\

#define SNMP_ADD_STATS_USER(mib, field, addend) 	\
@@ -160,5 +165,17 @@ struct linux_xfrm_mib { 
		per_cpu_ptr(mib[1], get_cpu())->mibs[field] += addend; \

		per_cpu_ptr(mib[1], get_cpu())->mibs[field] += addend; \

		put_cpu(); \

		put_cpu(); \

	} while (0)

	} while (0)



#define SNMP_UPD_PO_STATS(mib, basefield, addend)	\

	do { \

		__typeof__(mib[0]) ptr = per_cpu_ptr(mib[!in_softirq()], get_cpu());\

		ptr->mibs[basefield##PKTS]++; \

		ptr->mibs[basefield##OCTETS] += addend;\

		put_cpu(); \

	} while (0)

#define SNMP_UPD_PO_STATS_BH(mib, basefield, addend)	\

	do { \

		__typeof__(mib[0]) ptr = per_cpu_ptr(mib[!in_softirq()], raw_smp_processor_id());\

		ptr->mibs[basefield##PKTS]++; \

		ptr->mibs[basefield##OCTETS] += addend;\

	} while (0)

#endif
 
#endif

net/ipv4/ip_input.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -358,10 +358,12 @@ static int ip_rcv_finish(struct sk_buff *skb) 
		goto drop;

		goto drop;





	rt = skb->rtable;

	rt = skb->rtable;

	if (rt->rt_type == RTN_MULTICAST)

	if (rt->rt_type == RTN_MULTICAST) {

		IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCASTPKTS);

		IP_UPD_PO_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INMCAST,

	else if (rt->rt_type == RTN_BROADCAST)

				skb->len);

		IP_INC_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCASTPKTS);

	} else if (rt->rt_type == RTN_BROADCAST)

		IP_UPD_PO_STATS_BH(dev_net(rt->u.dst.dev), IPSTATS_MIB_INBCAST,

				skb->len);





	return dst_input(skb);

	return dst_input(skb);
@@ -384,7 +386,8 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
	if (skb->pkt_type == PACKET_OTHERHOST)

	if (skb->pkt_type == PACKET_OTHERHOST)

		goto drop;

		goto drop;





	IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INRECEIVES);



	IP_UPD_PO_STATS_BH(dev_net(dev), IPSTATS_MIB_IN, skb->len);





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

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

		IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);

		IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);

CRA Git | Maintained and supported by SUSTech CRA and CCSE