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

Commit ab32ea5d authored by Brian Haley's avatar Brian Haley Committed by David S. Miller
Browse files

[NET/IPV4/IPV6]: Change some sysctl variables to __read_mostly 



Change net/core, ipv4 and ipv6 sysctl variables to __read_mostly.

Couldn't actually measure any performance increase while testing (.3%
I consider noise), but seems like the right thing to do.

Signed-off-by: default avatarBrian Haley <brian.haley@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56fc85ac

net/core/neighbour.c

+1 −1
Original line number Diff line number Diff line
@@ -2451,7 +2451,7 @@ static struct neigh_sysctl_table { 
	ctl_table		neigh_neigh_dir[2];

	ctl_table		neigh_proto_dir[2];

	ctl_table		neigh_root_dir[2];

} neigh_sysctl_template = {

} neigh_sysctl_template __read_mostly = {

	.neigh_vars = {

		{

			.ctl_name	= NET_NEIGH_MCAST_SOLICIT,

net/core/sock.c

+5 −5
Original line number Diff line number Diff line
@@ -187,13 +187,13 @@ static struct lock_class_key af_callback_keys[AF_MAX]; 
#define SK_RMEM_MAX		(_SK_MEM_OVERHEAD * _SK_MEM_PACKETS)



/* Run time adjustable parameters. */

__u32 sysctl_wmem_max = SK_WMEM_MAX;

__u32 sysctl_rmem_max = SK_RMEM_MAX;

__u32 sysctl_wmem_default = SK_WMEM_MAX;

__u32 sysctl_rmem_default = SK_RMEM_MAX;

__u32 sysctl_wmem_max __read_mostly = SK_WMEM_MAX;

__u32 sysctl_rmem_max __read_mostly = SK_RMEM_MAX;

__u32 sysctl_wmem_default __read_mostly = SK_WMEM_MAX;

__u32 sysctl_rmem_default __read_mostly = SK_RMEM_MAX;



/* Maximal space eaten by iovec or ancilliary data plus some space */

int sysctl_optmem_max = sizeof(unsigned long)*(2*UIO_MAXIOV + 512);

int sysctl_optmem_max __read_mostly = sizeof(unsigned long)*(2*UIO_MAXIOV+512);



static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)

{

net/ipv4/af_inet.c

+2 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ int inet_release(struct socket *sock) 
}



/* It is off by default, see below. */

int sysctl_ip_nonlocal_bind;

int sysctl_ip_nonlocal_bind __read_mostly;



int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)

{
@@ -987,7 +987,7 @@ void inet_unregister_protosw(struct inet_protosw *p) 
 *      Shall we try to damage output packets if routing dev changes?

 */



int sysctl_ip_dynaddr;

int sysctl_ip_dynaddr __read_mostly;



static int inet_sk_reselect_saddr(struct sock *sk)

{

net/ipv4/icmp.c

+6 −6
Original line number Diff line number Diff line
@@ -187,11 +187,11 @@ struct icmp_err icmp_err_convert[] = { 
};



/* Control parameters for ECHO replies. */

int sysctl_icmp_echo_ignore_all;

int sysctl_icmp_echo_ignore_broadcasts = 1;

int sysctl_icmp_echo_ignore_all __read_mostly;

int sysctl_icmp_echo_ignore_broadcasts __read_mostly = 1;



/* Control parameter - ignore bogus broadcast responses? */

int sysctl_icmp_ignore_bogus_error_responses = 1;

int sysctl_icmp_ignore_bogus_error_responses __read_mostly = 1;



/*

 * 	Configurable global rate limit.
@@ -205,9 +205,9 @@ int sysctl_icmp_ignore_bogus_error_responses = 1; 
 *	time exceeded (11), parameter problem (12)

 */



int sysctl_icmp_ratelimit = 1 * HZ;

int sysctl_icmp_ratemask = 0x1818;

int sysctl_icmp_errors_use_inbound_ifaddr;

int sysctl_icmp_ratelimit __read_mostly = 1 * HZ;

int sysctl_icmp_ratemask __read_mostly = 0x1818;

int sysctl_icmp_errors_use_inbound_ifaddr __read_mostly;



/*

 *	ICMP control array. This specifies what to do with each ICMP.

net/ipv4/igmp.c

+2 −2
Original line number Diff line number Diff line
@@ -1397,8 +1397,8 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr) 
/*

 *	Join a socket to a group

 */

int sysctl_igmp_max_memberships = IP_MAX_MEMBERSHIPS;

int sysctl_igmp_max_msf = IP_MAX_MSF;

int sysctl_igmp_max_memberships __read_mostly = IP_MAX_MEMBERSHIPS;

int sysctl_igmp_max_msf __read_mostly = IP_MAX_MSF;





static int ip_mc_del1_src(struct ip_mc_list *pmc, int sfmode,