AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

IPVS: netns, svc counters moved in ip_vs_ctl,c

Browse Source 
Last two global vars to be moved,
ip_vs_ftpsvc_counter and ip_vs_nullsvc_counter.

[horms@verge.net.au: removed whitespace-change-only hunk]
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Hans Schillstrom 2011-01-03 14:45:01 +01:00 committed by Simon Horman
parent f2431e6e92
commit 763f8d0ed4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/netns/ip_vs.h
View File

@ -84,6 +84,9 @@ struct netns_ipvs {
struct lock_class_key ctl_key; /* ctl_mutex debuging */ struct lock_class_key ctl_key; /* ctl_mutex debuging */
/* Trash for destinations */ /* Trash for destinations */
struct list_head dest_trash; struct list_head dest_trash;
/* Service counters */
atomic_t ftpsvc_counter;
atomic_t nullsvc_counter;
/* sys-ctl struct */ /* sys-ctl struct */
struct ctl_table_header *sysctl_hdr; struct ctl_table_header *sysctl_hdr;

21
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -254,12 +254,6 @@ static struct list_head ip_vs_svc_table[IP_VS_SVC_TAB_SIZE];
/* the service table hashed by fwmark */ /* the service table hashed by fwmark */
static struct list_head ip_vs_svc_fwm_table[IP_VS_SVC_TAB_SIZE]; static struct list_head ip_vs_svc_fwm_table[IP_VS_SVC_TAB_SIZE];
/*
* FTP & NULL virtual service counters
*/
static atomic_t ip_vs_ftpsvc_counter = ATOMIC_INIT(0);
static atomic_t ip_vs_nullsvc_counter = ATOMIC_INIT(0);
/* /*
* Returns hash value for virtual service * Returns hash value for virtual service
@ -409,6 +403,7 @@ ip_vs_service_get(struct net *net, int af, __u32 fwmark, __u16 protocol,
const union nf_inet_addr *vaddr, __be16 vport) const union nf_inet_addr *vaddr, __be16 vport)
{ {
struct ip_vs_service *svc; struct ip_vs_service *svc;
struct netns_ipvs *ipvs = net_ipvs(net);
read_lock(&__ip_vs_svc_lock); read_lock(&__ip_vs_svc_lock);
@ -427,7 +422,7 @@ ip_vs_service_get(struct net *net, int af, __u32 fwmark, __u16 protocol,
if (svc == NULL if (svc == NULL
&& protocol == IPPROTO_TCP && protocol == IPPROTO_TCP
&& atomic_read(&ip_vs_ftpsvc_counter) && atomic_read(&ipvs->ftpsvc_counter)
&& (vport == FTPDATA || ntohs(vport) >= PROT_SOCK)) { && (vport == FTPDATA || ntohs(vport) >= PROT_SOCK)) {
/* /*
* Check if ftp service entry exists, the packet * Check if ftp service entry exists, the packet
@ -437,7 +432,7 @@ ip_vs_service_get(struct net *net, int af, __u32 fwmark, __u16 protocol,
} }
if (svc == NULL if (svc == NULL
&& atomic_read(&ip_vs_nullsvc_counter)) { && atomic_read(&ipvs->nullsvc_counter)) {
/* /*
* Check if the catch-all port (port zero) exists * Check if the catch-all port (port zero) exists
*/ */
@ -1173,9 +1168,9 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u,
/* Update the virtual service counters */ /* Update the virtual service counters */
if (svc->port == FTPPORT) if (svc->port == FTPPORT)
atomic_inc(&ip_vs_ftpsvc_counter); atomic_inc(&ipvs->ftpsvc_counter);
else if (svc->port == 0) else if (svc->port == 0)
atomic_inc(&ip_vs_nullsvc_counter); atomic_inc(&ipvs->nullsvc_counter);
ip_vs_new_estimator(net, &svc->stats); ip_vs_new_estimator(net, &svc->stats);
@ -1359,9 +1354,9 @@ static void __ip_vs_del_service(struct ip_vs_service *svc)
* Update the virtual service counters * Update the virtual service counters
*/ */
if (svc->port == FTPPORT) if (svc->port == FTPPORT)
atomic_dec(&ip_vs_ftpsvc_counter); atomic_dec(&ipvs->ftpsvc_counter);
else if (svc->port == 0) else if (svc->port == 0)
atomic_dec(&ip_vs_nullsvc_counter); atomic_dec(&ipvs->nullsvc_counter);
/* /*
* Free the service if nobody refers to it * Free the service if nobody refers to it
@ -3501,6 +3496,8 @@ int __net_init __ip_vs_control_init(struct net *net)
INIT_LIST_HEAD(&ipvs->rs_table[idx]); INIT_LIST_HEAD(&ipvs->rs_table[idx]);
INIT_LIST_HEAD(&ipvs->dest_trash); INIT_LIST_HEAD(&ipvs->dest_trash);
atomic_set(&ipvs->ftpsvc_counter, 0);
atomic_set(&ipvs->nullsvc_counter, 0);
/* procfs stats */ /* procfs stats */
ipvs->tot_stats = kzalloc(sizeof(struct ip_vs_stats), GFP_KERNEL); ipvs->tot_stats = kzalloc(sizeof(struct ip_vs_stats), GFP_KERNEL);