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

[NETFILTER]: Change tunables to __read_mostly 



Change some netfilter tunables to __read_mostly.  Also fixed some
incorrect file reference comments while I was in there.

(this will be my last __read_mostly patch unless someone points out
something else that needs it)

Signed-off-by: default avatarBrian Haley <brian.haley@hp.com>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cbf1cae

net/ipv4/netfilter/ip_conntrack_core.c

+3 −3
Original line number Diff line number Diff line
@@ -66,13 +66,13 @@ void (*ip_conntrack_destroyed)(struct ip_conntrack *conntrack) = NULL; 
LIST_HEAD(ip_conntrack_expect_list);

struct ip_conntrack_protocol *ip_ct_protos[MAX_IP_CT_PROTO];

static LIST_HEAD(helpers);

unsigned int ip_conntrack_htable_size = 0;

int ip_conntrack_max;

unsigned int ip_conntrack_htable_size __read_mostly = 0;

int ip_conntrack_max __read_mostly;

struct list_head *ip_conntrack_hash;

static kmem_cache_t *ip_conntrack_cachep __read_mostly;

static kmem_cache_t *ip_conntrack_expect_cachep __read_mostly;

struct ip_conntrack ip_conntrack_untracked;

unsigned int ip_ct_log_invalid;

unsigned int ip_ct_log_invalid __read_mostly;

static LIST_HEAD(unconfirmed);

static int ip_conntrack_vmalloc;

net/ipv4/netfilter/ip_conntrack_proto_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/netfilter.h>

#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>



unsigned int ip_ct_generic_timeout = 600*HZ;

unsigned int ip_ct_generic_timeout __read_mostly = 600*HZ;



static int generic_pkt_to_tuple(const struct sk_buff *skb,

				unsigned int dataoff,

net/ipv4/netfilter/ip_conntrack_proto_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/netfilter_ipv4/ip_conntrack_core.h>

#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>



unsigned int ip_ct_icmp_timeout = 30*HZ;

unsigned int ip_ct_icmp_timeout __read_mostly = 30*HZ;



#if 0

#define DEBUGP printk

net/ipv4/netfilter/ip_conntrack_proto_sctp.c

+7 −7
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ static const char *sctp_conntrack_names[] = { 
#define HOURS * 60 MINS

#define DAYS  * 24 HOURS



static unsigned int ip_ct_sctp_timeout_closed            =  10 SECS;

static unsigned int ip_ct_sctp_timeout_cookie_wait       =   3 SECS;

static unsigned int ip_ct_sctp_timeout_cookie_echoed     =   3 SECS;

static unsigned int ip_ct_sctp_timeout_established       =   5 DAYS;

static unsigned int ip_ct_sctp_timeout_shutdown_sent     = 300 SECS / 1000;

static unsigned int ip_ct_sctp_timeout_shutdown_recd     = 300 SECS / 1000;

static unsigned int ip_ct_sctp_timeout_shutdown_ack_sent =   3 SECS;

static unsigned int ip_ct_sctp_timeout_closed __read_mostly           = 10 SECS;

static unsigned int ip_ct_sctp_timeout_cookie_wait __read_mostly      =  3 SECS;

static unsigned int ip_ct_sctp_timeout_cookie_echoed __read_mostly    =  3 SECS;

static unsigned int ip_ct_sctp_timeout_established __read_mostly      =  5 DAYS;

static unsigned int ip_ct_sctp_timeout_shutdown_sent __read_mostly    = 300 SECS / 1000;

static unsigned int ip_ct_sctp_timeout_shutdown_recd __read_mostly    = 300 SECS / 1000;

static unsigned int ip_ct_sctp_timeout_shutdown_ack_sent __read_mostly = 3 SECS;



static const unsigned int * sctp_timeouts[]

= { NULL,                                  /* SCTP_CONNTRACK_NONE  */

net/ipv4/netfilter/ip_conntrack_proto_tcp.c

+12 −12
Original line number Diff line number Diff line
@@ -48,19 +48,19 @@ static DEFINE_RWLOCK(tcp_lock); 
/* "Be conservative in what you do, 

    be liberal in what you accept from others." 

    If it's non-zero, we mark only out of window RST segments as INVALID. */

int ip_ct_tcp_be_liberal = 0;

int ip_ct_tcp_be_liberal __read_mostly = 0;



/* When connection is picked up from the middle, how many packets are required

   to pass in each direction when we assume we are in sync - if any side uses

   window scaling, we lost the game. 

   If it is set to zero, we disable picking up already established 

   connections. */

int ip_ct_tcp_loose = 3;

int ip_ct_tcp_loose __read_mostly = 3;



/* Max number of the retransmitted packets without receiving an (acceptable) 

   ACK from the destination. If this number is reached, a shorter timer 

   will be started. */

int ip_ct_tcp_max_retrans = 3;

int ip_ct_tcp_max_retrans __read_mostly = 3;



  /* FIXME: Examine ipfilter's timeouts and conntrack transitions more

     closely.  They're more complex. --RR */
@@ -83,19 +83,19 @@ static const char *tcp_conntrack_names[] = { 
#define HOURS * 60 MINS

#define DAYS * 24 HOURS



unsigned int ip_ct_tcp_timeout_syn_sent =      2 MINS;

unsigned int ip_ct_tcp_timeout_syn_recv =     60 SECS;

unsigned int ip_ct_tcp_timeout_established =   5 DAYS;

unsigned int ip_ct_tcp_timeout_fin_wait =      2 MINS;

unsigned int ip_ct_tcp_timeout_close_wait =   60 SECS;

unsigned int ip_ct_tcp_timeout_last_ack =     30 SECS;

unsigned int ip_ct_tcp_timeout_time_wait =     2 MINS;

unsigned int ip_ct_tcp_timeout_close =        10 SECS;

unsigned int ip_ct_tcp_timeout_syn_sent __read_mostly =      2 MINS;

unsigned int ip_ct_tcp_timeout_syn_recv __read_mostly =     60 SECS;

unsigned int ip_ct_tcp_timeout_established __read_mostly =   5 DAYS;

unsigned int ip_ct_tcp_timeout_fin_wait __read_mostly =      2 MINS;

unsigned int ip_ct_tcp_timeout_close_wait __read_mostly =   60 SECS;

unsigned int ip_ct_tcp_timeout_last_ack __read_mostly =     30 SECS;

unsigned int ip_ct_tcp_timeout_time_wait __read_mostly =     2 MINS;

unsigned int ip_ct_tcp_timeout_close __read_mostly =        10 SECS;



/* RFC1122 says the R2 limit should be at least 100 seconds.

   Linux uses 15 packets as limit, which corresponds 

   to ~13-30min depending on RTO. */

unsigned int ip_ct_tcp_timeout_max_retrans =     5 MINS;

unsigned int ip_ct_tcp_timeout_max_retrans __read_mostly =   5 MINS;

 

static const unsigned int * tcp_timeouts[]

= { NULL,                              /*      TCP_CONNTRACK_NONE */

CRA Git | Maintained and supported by SUSTech CRA and CCSE