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

Commit 1823e4c8 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

snmp: add align parameter to snmp_mib_init() 



In preparation for 64bit snmp counters for some mibs,
add an 'align' parameter to snmp_mib_init(), instead
of assuming mibs only contain 'unsigned long' fields.

Callers can use __alignof__(type) to provide correct
alignment.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
CC: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
CC: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eaa0bd8

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ extern struct ipv4_config ipv4_config; 
#define NET_ADD_STATS_USER(net, field, adnd) SNMP_ADD_STATS_USER((net)->mib.net_statistics, field, adnd)



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

extern int snmp_mib_init(void __percpu *ptr[2], size_t mibsize);

extern int snmp_mib_init(void __percpu *ptr[2], size_t mibsize, size_t align);

extern void snmp_mib_free(void __percpu *ptr[2]);



extern struct local_ports {

net/dccp/proto.c

+2 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,8 @@ EXPORT_SYMBOL_GPL(dccp_shutdown); 
static inline int dccp_mib_init(void)

{

	return snmp_mib_init((void __percpu **)dccp_statistics,

			     sizeof(struct dccp_mib));

			     sizeof(struct dccp_mib),

			     __alignof__(struct dccp_mib));

}



static inline void dccp_mib_exit(void)

net/ipv4/af_inet.c

+17 −10
Original line number Diff line number Diff line
@@ -1427,13 +1427,13 @@ unsigned long snmp_fold_field(void __percpu *mib[], int offt) 
}

EXPORT_SYMBOL_GPL(snmp_fold_field);



int snmp_mib_init(void __percpu *ptr[2], size_t mibsize)

int snmp_mib_init(void __percpu *ptr[2], size_t mibsize, size_t align)

{

	BUG_ON(ptr == NULL);

	ptr[0] = __alloc_percpu(mibsize, __alignof__(unsigned long));

	ptr[0] = __alloc_percpu(mibsize, align);

	if (!ptr[0])

		goto err0;

	ptr[1] = __alloc_percpu(mibsize, __alignof__(unsigned long));

	ptr[1] = __alloc_percpu(mibsize, align);

	if (!ptr[1])

		goto err1;

	return 0;
@@ -1490,25 +1490,32 @@ static const struct net_protocol icmp_protocol = { 
static __net_init int ipv4_mib_init_net(struct net *net)

{

	if (snmp_mib_init((void __percpu **)net->mib.tcp_statistics,

			  sizeof(struct tcp_mib)) < 0)

			  sizeof(struct tcp_mib),

			  __alignof__(struct tcp_mib)) < 0)

		goto err_tcp_mib;

	if (snmp_mib_init((void __percpu **)net->mib.ip_statistics,

			  sizeof(struct ipstats_mib)) < 0)

			  sizeof(struct ipstats_mib),

			  __alignof__(struct ipstats_mib)) < 0)

		goto err_ip_mib;

	if (snmp_mib_init((void __percpu **)net->mib.net_statistics,

			  sizeof(struct linux_mib)) < 0)

			  sizeof(struct linux_mib),

			  __alignof__(struct linux_mib)) < 0)

		goto err_net_mib;

	if (snmp_mib_init((void __percpu **)net->mib.udp_statistics,

			  sizeof(struct udp_mib)) < 0)

			  sizeof(struct udp_mib),

			  __alignof__(struct udp_mib)) < 0)

		goto err_udp_mib;

	if (snmp_mib_init((void __percpu **)net->mib.udplite_statistics,

			  sizeof(struct udp_mib)) < 0)

			  sizeof(struct udp_mib),

			  __alignof__(struct udp_mib)) < 0)

		goto err_udplite_mib;

	if (snmp_mib_init((void __percpu **)net->mib.icmp_statistics,

			  sizeof(struct icmp_mib)) < 0)

			  sizeof(struct icmp_mib),

			  __alignof__(struct icmp_mib)) < 0)

		goto err_icmp_mib;

	if (snmp_mib_init((void __percpu **)net->mib.icmpmsg_statistics,

			  sizeof(struct icmpmsg_mib)) < 0)

			  sizeof(struct icmpmsg_mib),

			  __alignof__(struct icmpmsg_mib)) < 0)

		goto err_icmpmsg_mib;



	tcp_mib_init(net);

net/ipv6/addrconf.c

+6 −3
Original line number Diff line number Diff line
@@ -284,13 +284,16 @@ static void addrconf_mod_timer(struct inet6_ifaddr *ifp, 
static int snmp6_alloc_dev(struct inet6_dev *idev)

{

	if (snmp_mib_init((void __percpu **)idev->stats.ipv6,

			  sizeof(struct ipstats_mib)) < 0)

			  sizeof(struct ipstats_mib),

			  __alignof__(struct ipstats_mib)) < 0)

		goto err_ip;

	if (snmp_mib_init((void __percpu **)idev->stats.icmpv6,

			  sizeof(struct icmpv6_mib)) < 0)

			  sizeof(struct icmpv6_mib),

			  __alignof__(struct icmpv6_mib)) < 0)

		goto err_icmp;

	if (snmp_mib_init((void __percpu **)idev->stats.icmpv6msg,

			  sizeof(struct icmpv6msg_mib)) < 0)

			  sizeof(struct icmpv6msg_mib),

			  __alignof__(struct icmpv6msg_mib)) < 0)

		goto err_icmpmsg;



	return 0;

net/ipv6/af_inet6.c

+10 −5
Original line number Diff line number Diff line
@@ -971,19 +971,24 @@ static void ipv6_packet_cleanup(void) 
static int __net_init ipv6_init_mibs(struct net *net)

{

	if (snmp_mib_init((void __percpu **)net->mib.udp_stats_in6,

			  sizeof (struct udp_mib)) < 0)

			  sizeof(struct udp_mib),

			  __alignof__(struct udp_mib)) < 0)

		return -ENOMEM;

	if (snmp_mib_init((void __percpu **)net->mib.udplite_stats_in6,

			  sizeof (struct udp_mib)) < 0)

			  sizeof(struct udp_mib),

			  __alignof__(struct udp_mib)) < 0)

		goto err_udplite_mib;

	if (snmp_mib_init((void __percpu **)net->mib.ipv6_statistics,

			  sizeof(struct ipstats_mib)) < 0)

			  sizeof(struct ipstats_mib),

			  __alignof__(struct ipstats_mib)) < 0)

		goto err_ip_mib;

	if (snmp_mib_init((void __percpu **)net->mib.icmpv6_statistics,

			  sizeof(struct icmpv6_mib)) < 0)

			  sizeof(struct icmpv6_mib),

			  __alignof__(struct icmpv6_mib)) < 0)

		goto err_icmp_mib;

	if (snmp_mib_init((void __percpu **)net->mib.icmpv6msg_statistics,

			  sizeof(struct icmpv6msg_mib)) < 0)

			  sizeof(struct icmpv6msg_mib),

			  __alignof__(struct icmpv6msg_mib)) < 0)

		goto err_icmpmsg_mib;

	return 0;