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

Commit 763f8d0e authored by Hans Schillstrom's avatar Hans Schillstrom Committed by Simon Horman
Browse files

IPVS: netns, svc counters moved in ip_vs_ctl,c 



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: default avatarHans Schillstrom <hans.schillstrom@ericsson.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent f2431e6e

include/net/netns/ip_vs.h

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ struct netns_ipvs { 
	struct lock_class_key	ctl_key;	/* ctl_mutex debuging */

	/* Trash for destinations */

	struct list_head	dest_trash;

	/* Service counters */

	atomic_t		ftpsvc_counter;

	atomic_t		nullsvc_counter;



	/* sys-ctl struct */

	struct ctl_table_header	*sysctl_hdr;

net/netfilter/ipvs/ip_vs_ctl.c

+9 −12
Original line number Diff line number Diff line
@@ -254,12 +254,6 @@ static struct list_head ip_vs_svc_table[IP_VS_SVC_TAB_SIZE]; 
/* the service table hashed by fwmark */

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
@@ -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)

{

	struct ip_vs_service *svc;

	struct netns_ipvs *ipvs = net_ipvs(net);



	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

	    && protocol == IPPROTO_TCP

	    && atomic_read(&ip_vs_ftpsvc_counter)

	    && atomic_read(&ipvs->ftpsvc_counter)

	    && (vport == FTPDATA || ntohs(vport) >= PROT_SOCK)) {

		/*

		 * 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

	    && atomic_read(&ip_vs_nullsvc_counter)) {

	    && atomic_read(&ipvs->nullsvc_counter)) {

		/*

		 * 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 */

	if (svc->port == FTPPORT)

		atomic_inc(&ip_vs_ftpsvc_counter);

		atomic_inc(&ipvs->ftpsvc_counter);

	else if (svc->port == 0)

		atomic_inc(&ip_vs_nullsvc_counter);

		atomic_inc(&ipvs->nullsvc_counter);



	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

	 */

	if (svc->port == FTPPORT)

		atomic_dec(&ip_vs_ftpsvc_counter);

		atomic_dec(&ipvs->ftpsvc_counter);

	else if (svc->port == 0)

		atomic_dec(&ip_vs_nullsvc_counter);

		atomic_dec(&ipvs->nullsvc_counter);



	/*

	 *    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->dest_trash);

	atomic_set(&ipvs->ftpsvc_counter, 0);

	atomic_set(&ipvs->nullsvc_counter, 0);



	/* procfs stats */

	ipvs->tot_stats = kzalloc(sizeof(struct ip_vs_stats), GFP_KERNEL);