ipvs: avoid expiring many connections from timer
Subsystems (3)
Julian Anastasov
maintainerPATCH 1/1 ipvs: avoid expiring many connections from timer
Add new functions ip_vs_conn_del() and ip_vs_conn_del_put() to release many IPVS connections in process context. They are suitable for connections found in table when we do not want to overload the timers.
Currently, the change is useful for the dropentry delayed work but it will be used also in following patch when flushing connections to failed destinations.
--- net/netfilter/ipvs/ip_vs_conn.c | 53 +++++++++++++++++++++++---------- net/netfilter/ipvs/ip_vs_ctl.c | 6 ++-- 2 files changed, 42 insertions(+), 17 deletions(-)
net/netfilter/ipvs/ip_vs_conn.c +38 -15
@@ -807,6 +807,31 @@ static void ip_vs_conn_rcu_free(struct rcu_head *head)kmem_cache_free (ip_vs_conn_cachep, cp); } +/* Try to delete connection while not holding reference */ +static void ip_vs_conn_del (struct ip_vs_conn *cp) +{ +if (del_timer (&cp->timer)) { +/* Drop cp->control chain too */ +if (cp->control) + cp->timeout =0 ; +ip_vs_conn_expire (&cp->timer); + } +} + +/* Try to delete connection while holding reference */ +static void ip_vs_conn_del_put (struct ip_vs_conn *cp) +{ +if (del_timer (&cp->timer)) { +/* Drop cp->control chain too */ +if (cp->control) + cp->timeout =0 ; +__ip_vs_conn_put (cp); +ip_vs_conn_expire (&cp->timer); + }else { +__ip_vs_conn_put (cp); + } +} +static void ip_vs_conn_expire (struct timer_list *t) {struct ip_vs_conn *cp =from_timer (cp, t, timer);
@@ -827,14 +852,17 @@ static void ip_vs_conn_expire(struct timer_list *t)/* does anybody control me? */ if (ct) { +bool has_ref = !cp->timeout &&__ip_vs_conn_get (ct); +ip_vs_control_del (cp);/* Drop CTL or non-assured TPL if not used anymore */ -if (!cp->timeout && !atomic_read (&ct->n_control) && +if (has_ref && !atomic_read (&ct->n_control) && (!(ct->flags &IP_VS_CONN_F_TEMPLATE ) || !(ct->state &IP_VS_CTPL_S_ASSURED ))) {IP_VS_DBG (4 ,"drop controlling connection\n" ); - ct->timeout =0 ; -ip_vs_conn_expire_now (ct); +ip_vs_conn_del_put (ct); + }else if (has_ref) { +__ip_vs_conn_put (ct); } }
@@ -1317,8 +1345,7 @@ void ip_vs_random_dropentry(struct netns_ipvs *ipvs) drop:IP_VS_DBG (4 ,"drop connection\n" ); - cp->timeout =0 ; -ip_vs_conn_expire_now (cp); +ip_vs_conn_del (cp); }cond_resched_rcu (); }
@@ -1341,19 +1368,15 @@ static void ip_vs_conn_flush(struct netns_ipvs *ipvs)hlist_for_each_entry_rcu (cp, &ip_vs_conn_tab[idx], c_list) {if (cp->ipvs != ipvs)continue ; -/* As timers are expired in LIFO order, restart -* the timer of controlling connection first, so -* that it is expired after us. -*/ +if (atomic_read (&cp->n_control)) +continue ; cp_c = cp->control; -/* cp->control is valid only with reference to cp */ -if (cp_c &&__ip_vs_conn_get (cp)) { +IP_VS_DBG (4 ,"del connection\n" ); +ip_vs_conn_del (cp); +if (cp_c && !atomic_read (&cp_c->n_control)) {IP_VS_DBG (4 ,"del controlling connection\n" ); -ip_vs_conn_expire_now (cp_c); -__ip_vs_conn_put (cp); +ip_vs_conn_del (cp_c); } -IP_VS_DBG (4 ,"del connection\n" ); -ip_vs_conn_expire_now (cp); }cond_resched_rcu (); }
net/netfilter/ipvs/ip_vs_ctl.c +4 -2
@@ -224,7 +224,8 @@ static void defense_work_handler(struct work_struct *work)update_defense_level (ipvs);if (atomic_read (&ipvs->dropentry))ip_vs_random_dropentry (ipvs); - schedule_delayed_work(&ipvs->defense_work, DEFENSE_TIMER_PERIOD); +queue_delayed_work (system_long_wq, &ipvs->defense_work, + DEFENSE_TIMER_PERIOD); }#endif
@@ -4063,7 +4064,8 @@ static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs) ipvs->sysctl_tbl = tbl;/* Schedule defense work */ INIT_DELAYED_WORK (&ipvs->defense_work, defense_work_handler); -schedule_delayed_work (&ipvs->defense_work,DEFENSE_TIMER_PERIOD ); +queue_delayed_work (system_long_wq, &ipvs->defense_work, +DEFENSE_TIMER_PERIOD );return 0 ; }
Signature · 1 line
2.26.2
Simon Horman
maintainerHi Julian,
sorry for not noticing this earlier.
Quoted 57 lines · Julian Anastasov
Add new functions
ip_vs_conn_del()andip_vs_conn_del_put()to release many IPVS connections in process context. They are suitable for connections found in table when we do not want to overload the timers.Currently, the change is useful for the dropentry delayed work but it will be used also in following patch when flushing connections to failed destinations.
Signed-off-by Julian Anastasov <[email protected]>--- net/netfilter/ipvs/ip_vs_conn.c | 53 +++++++++++++++++++++++---------- net/netfilter/ipvs/ip_vs_ctl.c | 6 ++-- 2 files changed, 42 insertions(+), 17 deletions(-)net/netfilter/ipvs/ip_vs_conn.c +27
-0@@ -807,6 +807,31 @@ static void ip_vs_conn_rcu_free(struct rcu_head *head)kmem_cache_free (ip_vs_conn_cachep, cp); } +/* Try to delete connection while not holding reference */ +static void ip_vs_conn_del (struct ip_vs_conn *cp) +{ +if (del_timer (&cp->timer)) { +/* Drop cp->control chain too */ +if (cp->control) + cp->timeout =0 ; +ip_vs_conn_expire (&cp->timer); + } +} + +/* Try to delete connection while holding reference */ +static void ip_vs_conn_del_put (struct ip_vs_conn *cp) +{ +if (del_timer (&cp->timer)) { +/* Drop cp->control chain too */ +if (cp->control) + cp->timeout =0 ; +__ip_vs_conn_put (cp); +ip_vs_conn_expire (&cp->timer); + }else { +__ip_vs_conn_put (cp); + } +} +static void ip_vs_conn_expire (struct timer_list *t) {struct ip_vs_conn *cp =from_timer (cp, t, timer);@@ -827,14 +852,17 @@ static void ip_vs_conn_expire(struct timer_list *t)/* does anybody control me? */ if (ct) { +bool has_ref = !cp->timeout &&__ip_vs_conn_get (ct); +
net/netfilter/ipvs/ip_vs_conn.c static void ip_vs_conn_expire(struct timer_list *t) · line 863
Quoted 10 lines
net/netfilter/ipvs/ip_vs_conn.c +2
-3ip_vs_control_del (cp);/* Drop CTL or non-assured TPL if not used anymore */ -if (!cp->timeout && !atomic_read (&ct->n_control) && +if (has_ref && !atomic_read (&ct->n_control) && (!(ct->flags &IP_VS_CONN_F_TEMPLATE ) || !(ct->state &IP_VS_CTPL_S_ASSURED ))) {IP_VS_DBG (4 ,"drop controlling connection\n" ); - ct->timeout =0 ; -ip_vs_conn_expire_now (ct); +ip_vs_conn_del_put (ct);
Previously this code did not put the ct, now it does. Is that intentional.
Quoted 25 lines
net/netfilter/ipvs/ip_vs_conn.c +5
-6+ }else if (has_ref) { +__ip_vs_conn_put (ct); } }@@ -1317,8 +1345,7 @@ void ip_vs_random_dropentry(struct netns_ipvs *ipvs) drop:IP_VS_DBG (4 ,"drop connection\n" ); - cp->timeout =0 ; -ip_vs_conn_expire_now (cp); +ip_vs_conn_del (cp); }cond_resched_rcu (); }@@ -1341,19 +1368,15 @@ static void ip_vs_conn_flush(struct netns_ipvs *ipvs)hlist_for_each_entry_rcu (cp, &ip_vs_conn_tab[idx], c_list) {if (cp->ipvs != ipvs)continue ; -/* As timers are expired in LIFO order, restart -* the timer of controlling connection first, so -* that it is expired after us. -*/ +if (atomic_read (&cp->n_control)) +continue ;
net/netfilter/ipvs/ip_vs_conn.c static void ip_vs_conn_flush(struct netns_ipvs *ipvs) · line 1378
Quoted 10 lines
net/netfilter/ipvs/ip_vs_conn.c +4
-4cp_c = cp->control; -/* cp->control is valid only with reference to cp */ -if (cp_c &&__ip_vs_conn_get (cp)) { +IP_VS_DBG (4 ,"del connection\n" ); +ip_vs_conn_del (cp); +if (cp_c && !atomic_read (&cp_c->n_control)) {IP_VS_DBG (4 ,"del controlling connection\n" ); -ip_vs_conn_expire_now (cp_c); -__ip_vs_conn_put (cp); +ip_vs_conn_del (cp_c);
Conversely, previously this code put the ct, now it doesn't. Is that also intentional?
Quoted 33 lines
net/netfilter/ipvs/ip_vs_conn.c +0
-2} -IP_VS_DBG (4 ,"del connection\n" ); -ip_vs_conn_expire_now (cp); }cond_resched_rcu (); }net/netfilter/ipvs/ip_vs_ctl.c +4
-2@@ -224,7 +224,8 @@ static void defense_work_handler(struct work_struct *work)update_defense_level (ipvs);if (atomic_read (&ipvs->dropentry))ip_vs_random_dropentry (ipvs); - schedule_delayed_work(&ipvs->defense_work, DEFENSE_TIMER_PERIOD); +queue_delayed_work (system_long_wq, &ipvs->defense_work, + DEFENSE_TIMER_PERIOD); }#endif @@ -4063,7 +4064,8 @@ static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs) ipvs->sysctl_tbl = tbl;/* Schedule defense work */ INIT_DELAYED_WORK (&ipvs->defense_work, defense_work_handler); -schedule_delayed_work (&ipvs->defense_work,DEFENSE_TIMER_PERIOD ); +queue_delayed_work (system_long_wq, &ipvs->defense_work, +DEFENSE_TIMER_PERIOD );return 0 ; }Signature · 1 line
2.26.2
Julian Anastasov
maintainerHello,
Quoted 16 lines · Simon Horman
Quoted 16 lines
net/netfilter/ipvs/ip_vs_conn.c +3
-1@@ -827,14 +852,17 @@ static void ip_vs_conn_expire(struct timer_list *t)/* does anybody control me? */ if (ct) { +bool has_ref = !cp->timeout &&__ip_vs_conn_get (ct); +ip_vs_control_del (cp);/* Drop CTL or non-assured TPL if not used anymore */ - if (!cp->timeout && !atomic_read(&ct->n_control) && + if (has_ref && !atomic_read(&ct->n_control) && (!(ct->flags & IP_VS_CONN_F_TEMPLATE) ||
Quoted 8 lines
net/netfilter/ipvs/ip_vs_conn.c static void ip_vs_conn_expire(struct timer_list *t) · line 863
Quoted 5 lines
net/netfilter/ipvs/ip_vs_conn.c +1
-2!(ct->state & IP_VS_CTPL_S_ASSURED))) {IP_VS_DBG (4 ,"drop controlling connection\n" ); - ct->timeout =0 ; -ip_vs_conn_expire_now (ct); +ip_vs_conn_del_put (ct);Previously this code did not put the ct, now it does. Is that intentional.
Yes, as ip_vs_conn_expire() now can be called both in
timer and process context we need a reference for ct while calling del_timer() in ip_vs_conn_del_put(). As ct->n_control is 0 after our ip_vs_control_del(), ct can be expired by timer while we are trying to del it here.
Quoted 15 lines
Quoted 15 lines
net/netfilter/ipvs/ip_vs_conn.c +4
-6@@ -1341,19 +1368,15 @@ static void ip_vs_conn_flush(struct netns_ipvs *ipvs)hlist_for_each_entry_rcu (cp, &ip_vs_conn_tab[idx], c_list) {if (cp->ipvs != ipvs)continue ; -/* As timers are expired in LIFO order, restart -* the timer of controlling connection first, so -* that it is expired after us. -*/ +if (atomic_read (&cp->n_control)) +continue ; cp_c = cp->control; -/* cp->control is valid only with reference to cp */ -if (cp_c &&__ip_vs_conn_get (cp)) { +IP_VS_DBG (4 ,"del connection\n" ); +ip_vs_conn_del (cp);
Quoted 8 lines
net/netfilter/ipvs/ip_vs_conn.c static void ip_vs_conn_flush(struct netns_ipvs *ipvs) · line 1378
Quoted 5 lines
net/netfilter/ipvs/ip_vs_conn.c +2
-2+if (cp_c && !atomic_read (&cp_c->n_control)) {IP_VS_DBG (4 ,"del controlling connection\n" ); -ip_vs_conn_expire_now (cp_c); -__ip_vs_conn_put (cp); +ip_vs_conn_del (cp_c);Conversely, previously this code put the ct, now it doesn't. Is that also intentional?
Now we do not get reference to cp because in RCU
section the cp structure can not go away. So, we have an implicit reference to cp. Same for its cp->control (ct). The conn structures are freed later in RCU callback.
In this case we may run del_timer() after
another CPU, eg. after ip_vs_conn_expire() was already called after timer expire or after ip_vs_conn_del*(). But for us del_timer will not succeed.
Regards
--
Julian Anastasov <[email protected]>
Hi,
Quoted 65 lines · Julian Anastasov
Hello,
Quoted 16 lines · Simon Horman
Quoted 16 lines
net/netfilter/ipvs/ip_vs_conn.c +3
-1@@ -827,14 +852,17 @@ static void ip_vs_conn_expire(struct timer_list *t)/* does anybody control me? */ if (ct) { +bool has_ref = !cp->timeout &&__ip_vs_conn_get (ct); +ip_vs_control_del (cp);/* Drop CTL or non-assured TPL if not used anymore */ - if (!cp->timeout && !atomic_read(&ct->n_control) && + if (has_ref && !atomic_read(&ct->n_control) && (!(ct->flags & IP_VS_CONN_F_TEMPLATE) ||Quoted 8 lines
net/netfilter/ipvs/ip_vs_conn.c static void ip_vs_conn_expire(struct timer_list *t) · line 863
Quoted 5 lines
net/netfilter/ipvs/ip_vs_conn.c +1
-2!(ct->state & IP_VS_CTPL_S_ASSURED))) {IP_VS_DBG (4 ,"drop controlling connection\n" ); - ct->timeout =0 ; -ip_vs_conn_expire_now (ct); +ip_vs_conn_del_put (ct);Previously this code did not put the ct, now it does. Is that intentional.
Yes, as
ip_vs_conn_expire()now can be called both in
timer and process context we need a reference for ct while callingdel_timer()inip_vs_conn_del_put(). Asct->n_controlis 0 after ourip_vs_control_del(), ct can be expired by timer while we are trying to del it here.Quoted 15 lines
Quoted 15 lines
net/netfilter/ipvs/ip_vs_conn.c +4
-6@@ -1341,19 +1368,15 @@ static void ip_vs_conn_flush(struct netns_ipvs *ipvs)hlist_for_each_entry_rcu (cp, &ip_vs_conn_tab[idx], c_list) {if (cp->ipvs != ipvs)continue ; -/* As timers are expired in LIFO order, restart -* the timer of controlling connection first, so -* that it is expired after us. -*/ +if (atomic_read (&cp->n_control)) +continue ; cp_c = cp->control; -/* cp->control is valid only with reference to cp */ -if (cp_c &&__ip_vs_conn_get (cp)) { +IP_VS_DBG (4 ,"del connection\n" ); +ip_vs_conn_del (cp);Quoted 8 lines
net/netfilter/ipvs/ip_vs_conn.c static void ip_vs_conn_flush(struct netns_ipvs *ipvs) · line 1378
Quoted 5 lines
net/netfilter/ipvs/ip_vs_conn.c +2
-2+if (cp_c && !atomic_read (&cp_c->n_control)) {IP_VS_DBG (4 ,"del controlling connection\n" ); -ip_vs_conn_expire_now (cp_c); -__ip_vs_conn_put (cp); +ip_vs_conn_del (cp_c);Conversely, previously this code put the ct, now it doesn't. Is that also intentional?
Now we do not get reference to cp because in RCU
section the cp structure can not go away. So, we have an implicit reference to cp. Same for itscp->control(ct). The conn structures are freed later in RCU callback.
Quoted 4 lines
In this case we may run
del_timer()after
another CPU, eg. afterip_vs_conn_expire()was already called after timer expire or after ip_vs_conn_del*(). But for usdel_timerwill not succeed.
Thanks for the explanation. This now looks good to me.
Pablo, could you consider applying this to nf-next?
Quoted 8 lines · Julian Anastasov
Add new functions
ip_vs_conn_del()andip_vs_conn_del_put()to release many IPVS connections in process context. They are suitable for connections found in table when we do not want to overload the timers.Currently, the change is useful for the dropentry delayed work but it will be used also in following patch when flushing connections to failed destinations.
Applied, thanks.