Commit ec793e7b authored by Eric Dumazet's avatar Eric Dumazet Committed by Zheng Zengkai
Browse files

net: snmp: inline snmp_get_cpu_field() 

mainline inclusion
from mainline-v5.16-rc4
commit 59f09ae8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4Z2Z9
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=59f09ae8fac4a990070fc6bdc889d0e0118664ea



-------------------------------

This trivial function is called ~90,000 times on 256 cpus hosts,
when reading /proc/net/netstat. And this number keeps inflating.

Inlining it saves many cycles.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCao Wangbao <caowangbao@huawei.com>
Reviewed-by: default avatarWu Changye <wuchangye@huawei.com>
Reviewed-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent ea5dbd25

include/net/ip.h

+5 −1
Original line number Diff line number Diff line
@@ -291,7 +291,11 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, 
#define NET_ADD_STATS(net, field, adnd)	SNMP_ADD_STATS((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);

static inline u64 snmp_get_cpu_field(void __percpu *mib, int cpu, int offt)

{

	return  *(((unsigned long *)per_cpu_ptr(mib, cpu)) + offt);

}



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

#if BITS_PER_LONG==32

u64 snmp_get_cpu_field64(void __percpu *mib, int cpu, int offct,

net/ipv4/af_inet.c

+0 −6
Original line number Diff line number Diff line
@@ -1666,12 +1666,6 @@ int inet_ctl_sock_create(struct sock **sk, unsigned short family, 
}

EXPORT_SYMBOL_GPL(inet_ctl_sock_create);



u64 snmp_get_cpu_field(void __percpu *mib, int cpu, int offt)

{

	return  *(((unsigned long *)per_cpu_ptr(mib, cpu)) + offt);

}

EXPORT_SYMBOL_GPL(snmp_get_cpu_field);



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

{

	unsigned long res = 0;