ipvs: make ip_vs_svc_table and ip_vs_svc_fwm_table per netns
Subsystems (5)
PATCH v3 1/1 ipvs: make ip_vs_svc_table and ip_vs_svc_fwm_table per netns
From: Jiejian Wu <[email protected]>
Current ipvs uses one global mutex "__ip_vs_mutex" to keep the global "ip_vs_svc_table" and "ip_vs_svc_fwm_table" safe. But when there are tens of thousands of services from different netns in the table, it takes a long time to look up the table, for example, using "ipvsadm -ln" from different netns simultaneously.
We make "ip_vs_svc_table" and "ip_vs_svc_fwm_table" per netns, and we add "service_mutex" per netns to keep these two tables safe instead of the global "__ip_vs_mutex" in current version. To this end, looking up services from different netns simultaneously will not get stuck, shortening the time consumption in large-scale deployment. It can be reproduced using the simple scripts below.
init.sh: #!/bin/bash
for((i=1;i<=4;i++));do
ip netns add ns$i
ip netns exec ns$i ip link set dev lo up
ip netns exec ns$i sh add-services.sh
done
add-services.sh: #!/bin/bash
for((i=0;i<30000;i++)); do
ipvsadm -A -t 10.10.10.10:$((80+$i)) -s rr
done
runtest.sh: #!/bin/bash for((i=1;i<4;i++));do
ip netns exec ns$i ipvsadm -ln > /dev/null &
done
ip netns exec ns4 ipvsadm -ln > /dev/null
Run "sh init.sh" to initiate the network environment. Then run "time ./runtest.sh" to evaluate the time consumption. Our testbed is a 4-core Intel Xeon ECS. The result of the original version is around 8 seconds, while the result of the modified version is only 0.8 seconds.
---
v3:
* fix complains of checkpatch
v2:
* remove global __ip_vs_mutex in ip_vs_est.c
* remove ip_vs_ prefix for svc_table and svc_fwm_table
* remove redundant "svc->ipvs == ipvs" checks
--- include/net/ip_vs.h | 13 +++ net/netfilter/ipvs/ip_vs_ctl.c | 167 ++++++++++++++------------------- net/netfilter/ipvs/ip_vs_est.c | 18 ++-- 3 files changed, 94 insertions(+), 104 deletions(-)
include/net/ip_vs.h +13 -0
@@ -33,6 +33,12 @@#define IP_VS_HDR_INVERSE 1#define IP_VS_HDR_ICMP 2 +/* +* Hash table: for virtual service lookups +*/ +#define IP_VS_SVC_TAB_BITS 8 +#define IP_VS_SVC_TAB_SIZE BIT(IP_VS_SVC_TAB_BITS) +#define IP_VS_SVC_TAB_MASK (IP_VS_SVC_TAB_SIZE - 1)/* Generic access of ipvs struct */ static inline struct netns_ipvs *net_ipvs (struct net * net)
@@ -1041,6 +1047,13 @@ struct netns_ipvs {*/ unsigned int mixed_address_family_dests;unsigned int hooks_afmask;/* &1=AF_INET, &2=AF_INET6 */ + +/* the service mutex that protect svc_table and svc_fwm_table */ +struct mutex service_mutex; +/* the service table hashed by <protocol, addr, port> */ +struct hlist_head svc_table[IP_VS_SVC_TAB_SIZE ]; +/* the service table hashed by fwmark */ +struct hlist_head svc_fwm_table[IP_VS_SVC_TAB_SIZE ]; };#define DEFAULT_SYNC_THRESHOLD 3
net/netfilter/ipvs/ip_vs_ctl.c +72 -95
423 lines not on this page · raw message
net/netfilter/ipvs/ip_vs_est.c +9 -9
@@ -601,7 +601,7 @@ static void ip_vs_est_drain_temp_list(struct netns_ipvs *ipvs)while (1 ) {int max =16 ; -mutex_lock (&__ip_vs_mutex); +mutex_lock (&ipvs->service_mutex);while (max-- >0 ) { est = hlist_entry_safe(ipvs->est_temp_list.first,
@@ -621,12 +621,12 @@ static void ip_vs_est_drain_temp_list(struct netns_ipvs *ipvs) } goto unlock; } -mutex_unlock (&__ip_vs_mutex); +mutex_unlock (&ipvs->service_mutex);cond_resched (); } unlock: -mutex_unlock (&__ip_vs_mutex); +mutex_unlock (&ipvs->service_mutex); }/* Calculate limits for all kthreads */
@@ -646,9 +646,9 @@ static int ip_vs_est_calc_limits(struct netns_ipvs *ipvs, int *chain_max)u64 val;INIT_HLIST_HEAD (&chain); -mutex_lock (&__ip_vs_mutex); +mutex_lock (&ipvs->service_mutex); kd = ipvs->est_kt_arr[0 ]; -mutex_unlock (&__ip_vs_mutex); +mutex_unlock (&ipvs->service_mutex); s = kd ? kd->calc_stats :NULL ;if (!s) goto out;
@@ -747,7 +747,7 @@ static void ip_vs_est_calc_phase(struct netns_ipvs *ipvs)if (!ip_vs_est_calc_limits (ipvs, &chain_max))return ; -mutex_lock (&__ip_vs_mutex); +mutex_lock (&ipvs->service_mutex);/* Stop all other tasks, so that we can immediately move the * estimators to est_temp_list without RCU grace period
@@ -814,9 +814,9 @@ static void ip_vs_est_calc_phase(struct netns_ipvs *ipvs)/* Give chance estimators to be added (to est_temp_list) * and deleted (releasing kthread contexts) */ -mutex_unlock (&__ip_vs_mutex); +mutex_unlock (&ipvs->service_mutex);cond_resched (); -mutex_lock (&__ip_vs_mutex); +mutex_lock (&ipvs->service_mutex);/* Current kt released ? */ if (id >= ipvs->est_kt_count)
@@ -892,7 +892,7 @@ static void ip_vs_est_calc_phase(struct netns_ipvs *ipvs)mutex_unlock (&ipvs->est_mutex); unlock: -mutex_unlock (&__ip_vs_mutex); +mutex_unlock (&ipvs->service_mutex); }void ip_vs_zero_estimator (struct ip_vs_stats *stats)
Signature · 1 line
2.19.1.6.gb485710b
Julian Anastasov
maintainerHello,
Quoted 33 lines · Dust Li
From: Jiejian Wu <[email protected]>
Current ipvs uses one global mutex "
__ip_vs_mutex" to keep the global "ip_vs_svc_table" and "ip_vs_svc_fwm_table" safe. But when there are tens of thousands of services from different netns in the table, it takes a long time to look up the table, for example, using "ipvsadm -ln" from different netns simultaneously.We make "
ip_vs_svc_table" and "ip_vs_svc_fwm_table" per netns, and we add "service_mutex" per netns to keep these two tables safe instead of the global "__ip_vs_mutex" in current version. To this end, looking up services from different netns simultaneously will not get stuck, shortening the time consumption in large-scale deployment. It can be reproduced using the simple scripts below.
init.sh: #!/bin/bash
for((i=1;i<=4;i++));do
ip netns add ns$i
ip netns exec ns$i ip link set dev lo up
ip netns exec ns$i shadd-services.sh
done
add-services.sh: #!/bin/bash
for((i=0;i<30000;i++)); doipvsadm -A -t 10.10.10.10:$((80+$i)) -s rrdone
runtest.sh: #!/bin/bash for((i=1;i<4;i++));do
ip netns exec ns$i ipvsadm -ln >/dev/null&
done
ip netns exec ns4 ipvsadm -ln >/dev/null
Quoted 8 lines
Run "sh
init.sh" to initiate the network environment. Then run "time ./runtest.sh" to evaluate the time consumption. Our testbed is a 4-core Intel Xeon ECS. The result of the original version is around 8 seconds, while the result of the modified version is only 0.8 seconds.Signed-off-by Jiejian Wu <[email protected]>Co-developed-by Dust Li <[email protected]>Signed-off-by Dust Li <[email protected]>
Looks good to me, thanks! I'm taking this patch and
will repost it together with other related patches.
Quoted 8 lines
---
v3:
* fix complains of checkpatch
v2:
* remove global__ip_vs_mutexinip_vs_est.c
* removeip_vs_prefix forsvc_tableandsvc_fwm_table
* remove redundant "svc->ipvs== ipvs" checks
---
Regards