Commit 210732d1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'snmp-stats-update' 



Eric Dumazet says:

====================
net: snmp: update SNMP methods

In the old days (before linux-3.0), SNMP counters were duplicated,
one set for user context, and anther one for BH context.

After commit 8f0ea0fe ("snmp: reduce percpu needs by 50%")
we have a single copy, and what really matters is preemption being
enabled or disabled, since we use this_cpu_inc() or __this_cpu_inc()
respectively.

This patch series kills the obsolete STATS_USER() helpers,
and rename all XXX_BH() helpers to __XXX() ones, to more
closely match conventions used to update per cpu variables.

This is probably going to hurt maintainers job for a while,
since cherry-picks will not be clean, but this had to be
cleaned at one point. I am so sorry guys.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2995aea5 13415e46

include/net/icmp.h

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ struct icmp_err { 


extern const struct icmp_err icmp_err_convert[];

#define ICMP_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.icmp_statistics, field)

#define ICMP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.icmp_statistics, field)

#define __ICMP_INC_STATS(net, field)	__SNMP_INC_STATS((net)->mib.icmp_statistics, field)

#define ICMPMSGOUT_INC_STATS(net, field)	SNMP_INC_STATS_ATOMIC_LONG((net)->mib.icmpmsg_statistics, field+256)

#define ICMPMSGIN_INC_STATS_BH(net, field)	SNMP_INC_STATS_ATOMIC_LONG((net)->mib.icmpmsg_statistics, field)

#define ICMPMSGIN_INC_STATS(net, field)		SNMP_INC_STATS_ATOMIC_LONG((net)->mib.icmpmsg_statistics, field)



struct dst_entry;

struct net_proto_family;

include/net/ip.h

+5 −7
Original line number Diff line number Diff line
@@ -187,17 +187,15 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, 
			   unsigned int len);



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

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

#define __IP_INC_STATS(net, field)	__SNMP_INC_STATS64((net)->mib.ip_statistics, field)

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

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

#define __IP_ADD_STATS(net, field, val) __SNMP_ADD_STATS64((net)->mib.ip_statistics, field, val)

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

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

#define __IP_UPD_PO_STATS(net, field, val) __SNMP_UPD_PO_STATS64((net)->mib.ip_statistics, field, val)

#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_USER(net, field) 	SNMP_INC_STATS_USER((net)->mib.net_statistics, field)

#define __NET_INC_STATS(net, field)	__SNMP_INC_STATS((net)->mib.net_statistics, field)

#define NET_ADD_STATS(net, field, adnd)	SNMP_ADD_STATS((net)->mib.net_statistics, field, adnd)

#define NET_ADD_STATS_BH(net, field, adnd) SNMP_ADD_STATS_BH((net)->mib.net_statistics, field, adnd)

#define NET_ADD_STATS_USER(net, field, adnd) SNMP_ADD_STATS_USER((net)->mib.net_statistics, field, adnd)

#define __NET_ADD_STATS(net, field, adnd) __SNMP_ADD_STATS((net)->mib.net_statistics, field, adnd)



u64 snmp_get_cpu_field(void __percpu *mib, int cpu, int offct);

unsigned long snmp_fold_field(void __percpu *mib, int offt);

include/net/ipv6.h

+23 −25
Original line number Diff line number Diff line
@@ -121,21 +121,21 @@ struct frag_hdr { 
extern int sysctl_mld_max_msf;

extern int sysctl_mld_qrv;



#define _DEVINC(net, statname, modifier, idev, field)			\

#define _DEVINC(net, statname, mod, idev, field)			\

({									\

	struct inet6_dev *_idev = (idev);				\

	if (likely(_idev != NULL))					\

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

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

		mod##SNMP_INC_STATS64((_idev)->stats.statname, (field));\

	mod##SNMP_INC_STATS64((net)->mib.statname##_statistics, (field));\

})



/* per device counters are atomic_long_t */

#define _DEVINCATOMIC(net, statname, modifier, idev, field)		\

#define _DEVINCATOMIC(net, statname, mod, idev, field)			\

({									\

	struct inet6_dev *_idev = (idev);				\

	if (likely(_idev != NULL))					\

		SNMP_INC_STATS_ATOMIC_LONG((_idev)->stats.statname##dev, (field)); \

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

	mod##SNMP_INC_STATS((net)->mib.statname##_statistics, (field));\

})



/* per device and per net counters are atomic_long_t */
@@ -147,46 +147,44 @@ extern int sysctl_mld_qrv; 
	SNMP_INC_STATS_ATOMIC_LONG((net)->mib.statname##_statistics, (field));\

})



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

#define _DEVADD(net, statname, mod, idev, field, val)			\

({									\

	struct inet6_dev *_idev = (idev);				\

	if (likely(_idev != NULL))					\

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

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

		mod##SNMP_ADD_STATS((_idev)->stats.statname, (field), (val)); \

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

})



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

#define _DEVUPD(net, statname, mod, 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));\

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

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

})



/* MIBs */



#define IP6_INC_STATS(net, idev,field)		\

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

#define IP6_INC_STATS_BH(net, idev,field)	\

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

		_DEVINC(net, ipv6, , idev, field)

#define __IP6_INC_STATS(net, idev,field)	\

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

#define ICMP6_INC_STATS(net, idev, field)	\

		_DEVINCATOMIC(net, icmpv6, , idev, field)

#define ICMP6_INC_STATS_BH(net, idev, field)	\

		_DEVINCATOMIC(net, icmpv6, _BH, idev, field)

#define __ICMP6_INC_STATS(net, idev, field)	\

		_DEVINCATOMIC(net, icmpv6, __, idev, field)



#define ICMP6MSGOUT_INC_STATS(net, idev, field)		\

	_DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field +256)

#define ICMP6MSGOUT_INC_STATS_BH(net, idev, field)	\

	_DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field +256)

#define ICMP6MSGIN_INC_STATS_BH(net, idev, field)	\

#define ICMP6MSGIN_INC_STATS(net, idev, field)	\

	_DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field)



struct ip6_ra_chain {

include/net/sctp/sctp.h

+3 −4
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ extern int sysctl_sctp_wmem[3]; 


/* SCTP SNMP MIB stats handlers */

#define SCTP_INC_STATS(net, field)	SNMP_INC_STATS((net)->sctp.sctp_statistics, field)

#define SCTP_INC_STATS_BH(net, field)   SNMP_INC_STATS_BH((net)->sctp.sctp_statistics, field)

#define SCTP_INC_STATS_USER(net, field) SNMP_INC_STATS_USER((net)->sctp.sctp_statistics, field)

#define __SCTP_INC_STATS(net, field)	__SNMP_INC_STATS((net)->sctp.sctp_statistics, field)

#define SCTP_DEC_STATS(net, field)	SNMP_DEC_STATS((net)->sctp.sctp_statistics, field)



/* sctp mib definitions */

include/net/snmp.h

+16 −28
Original line number Diff line number Diff line
@@ -123,12 +123,9 @@ struct linux_xfrm_mib { 
#define DECLARE_SNMP_STAT(type, name)	\

	extern __typeof__(type) __percpu *name



#define SNMP_INC_STATS_BH(mib, field)	\

#define __SNMP_INC_STATS(mib, field)	\

			__this_cpu_inc(mib->mibs[field])



#define SNMP_INC_STATS_USER(mib, field)	\

			this_cpu_inc(mib->mibs[field])



#define SNMP_INC_STATS_ATOMIC_LONG(mib, field)	\

			atomic_long_inc(&mib->mibs[field])
@@ -138,12 +135,9 @@ struct linux_xfrm_mib { 
#define SNMP_DEC_STATS(mib, field)	\

			this_cpu_dec(mib->mibs[field])



#define SNMP_ADD_STATS_BH(mib, field, addend)	\

#define __SNMP_ADD_STATS(mib, field, addend)	\

			__this_cpu_add(mib->mibs[field], addend)



#define SNMP_ADD_STATS_USER(mib, field, addend)	\

			this_cpu_add(mib->mibs[field], addend)



#define SNMP_ADD_STATS(mib, field, addend)	\

			this_cpu_add(mib->mibs[field], addend)

#define SNMP_UPD_PO_STATS(mib, basefield, addend)	\
@@ -152,7 +146,7 @@ struct linux_xfrm_mib { 
		this_cpu_inc(ptr[basefield##PKTS]);		\

		this_cpu_add(ptr[basefield##OCTETS], addend);	\

	} while (0)

#define SNMP_UPD_PO_STATS_BH(mib, basefield, addend)	\

#define __SNMP_UPD_PO_STATS(mib, basefield, addend)	\

	do { \

		__typeof__((mib->mibs) + 0) ptr = mib->mibs;	\

		__this_cpu_inc(ptr[basefield##PKTS]);		\
@@ -162,7 +156,7 @@ struct linux_xfrm_mib { 


#if BITS_PER_LONG==32



#define SNMP_ADD_STATS64_BH(mib, field, addend) 			\

#define __SNMP_ADD_STATS64(mib, field, addend) 				\

	do {								\

		__typeof__(*mib) *ptr = raw_cpu_ptr(mib);		\

		u64_stats_update_begin(&ptr->syncp);			\
@@ -170,20 +164,16 @@ struct linux_xfrm_mib { 
		u64_stats_update_end(&ptr->syncp);			\

	} while (0)



#define SNMP_ADD_STATS64_USER(mib, field, addend) 			\

#define SNMP_ADD_STATS64(mib, field, addend) 				\

	do {								\

		local_bh_disable();					\

		SNMP_ADD_STATS64_BH(mib, field, addend);		\

		local_bh_enable();					\

		preempt_disable();					\

		__SNMP_ADD_STATS64(mib, field, addend);			\

		preempt_enable();					\

	} while (0)



#define SNMP_ADD_STATS64(mib, field, addend)				\

		SNMP_ADD_STATS64_USER(mib, field, addend)



#define SNMP_INC_STATS64_BH(mib, field) SNMP_ADD_STATS64_BH(mib, field, 1)

#define SNMP_INC_STATS64_USER(mib, field) SNMP_ADD_STATS64_USER(mib, field, 1)

#define __SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1)

#define SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1)

#define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend)			\

#define __SNMP_UPD_PO_STATS64(mib, basefield, addend)			\

	do {								\

		__typeof__(*mib) *ptr;				\

		ptr = raw_cpu_ptr((mib));				\
@@ -194,20 +184,18 @@ struct linux_xfrm_mib { 
	} while (0)

#define SNMP_UPD_PO_STATS64(mib, basefield, addend)			\

	do {								\

		local_bh_disable();					\

		SNMP_UPD_PO_STATS64_BH(mib, basefield, addend);		\

		local_bh_enable();					\

		preempt_disable();					\

		__SNMP_UPD_PO_STATS64(mib, basefield, addend);		\

		preempt_enable();					\

	} while (0)

#else

#define SNMP_INC_STATS64_BH(mib, field)		SNMP_INC_STATS_BH(mib, field)

#define SNMP_INC_STATS64_USER(mib, field)	SNMP_INC_STATS_USER(mib, field)

#define __SNMP_INC_STATS64(mib, field)		__SNMP_INC_STATS(mib, field)

#define SNMP_INC_STATS64(mib, field)		SNMP_INC_STATS(mib, field)

#define SNMP_DEC_STATS64(mib, field)		SNMP_DEC_STATS(mib, field)

#define SNMP_ADD_STATS64_BH(mib, field, addend) SNMP_ADD_STATS_BH(mib, field, addend)

#define SNMP_ADD_STATS64_USER(mib, field, addend) SNMP_ADD_STATS_USER(mib, field, addend)

#define __SNMP_ADD_STATS64(mib, field, addend)	__SNMP_ADD_STATS(mib, field, addend)

#define SNMP_ADD_STATS64(mib, field, addend)	SNMP_ADD_STATS(mib, field, addend)

#define SNMP_UPD_PO_STATS64(mib, basefield, addend) SNMP_UPD_PO_STATS(mib, basefield, addend)

#define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend) SNMP_UPD_PO_STATS_BH(mib, basefield, addend)

#define __SNMP_UPD_PO_STATS64(mib, basefield, addend) __SNMP_UPD_PO_STATS(mib, basefield, addend)

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE