netfilter: nf_conncount: reduce unnecessary GC
Subsystems (2)
PATCH 1/1 netfilter: nf_conncount: reduce unnecessary GC
Currently nf_conncount can trigger garbage collection (GC) at multiple places. Each GC process takes a spin_lock_bh to traverse the nf_conncount_list. We found that when testing port scanning use two parallel nmap, because the number of connection increase fast, the nf_conncount_count and its subsequent call to __nf_conncount_add take too much time, causing several CPU lockup. This happens when user set the conntrack limit to +20,000, because the larger the limit, the longer the list that GC has to traverse.
The patch mitigate the performance issue by avoiding unnecessary GC with a timestamp. Whenever nf_conncount has done a GC, a timestamp is updated, and beforce the next time GC is triggered, we make sure it's more than a jiffies.
By doin this we can greatly reduce the CPU cycles and avoid the softirq lockup.
To reproduce it in OVS,
$ ovs-appctl dpctl/ct-set-limits zone=1,limit=20000 $ ovs-appctl dpctl/ct-get-limits
At another machine, runs two nmap
$ nmap -p1- <IP> $ nmap -p1- <IP>
--- include/net/netfilter/nf_conntrack_count.h | 1 + net/netfilter/nf_conncount.c | 12 ++++++++++++ 2 files changed, 13 insertions(+)
include/net/netfilter/nf_conntrack_count.h +1 -0
@@ -12,6 +12,7 @@ struct nf_conncount_list {spinlock_t list_lock;struct list_head head;/* connections with the same filtering key */ unsigned int count;/* length of list */ +unsigned long last_gc;/* jiffies at most recent gc */ }; struct nf_conncount_data *nf_conncount_init(struct net *net, unsigned int family,
net/netfilter/nf_conncount.c +12 -0
@@ -134,6 +134,9 @@ static int __nf_conncount_add(struct net *net,/* check the saved connections */ list_for_each_entry_safe (conn, conn_n, &list->head, node) { +if (time_after_eq (list->last_gc, jiffies)) +break ; +if (collect >CONNCOUNT_GC_MAX_NODES )break ;
@@ -190,6 +193,7 @@ static int __nf_conncount_add(struct net *net, conn->jiffies32 = (u32 )jiffies;list_add_tail (&conn->node, &list->head); list->count++; + list->last_gc = jiffies;return 0 ; }
@@ -214,6 +218,7 @@ void nf_conncount_list_init(struct nf_conncount_list *list)spin_lock_init (&list->list_lock);INIT_LIST_HEAD (&list->head); list->count =0 ; + list->last_gc = jiffies; }EXPORT_SYMBOL_GPL (nf_conncount_list_init);
@@ -231,6 +236,12 @@ bool nf_conncount_gc_list(struct net *net,if (!spin_trylock (&list->list_lock))return false; +/* don't bother if we just done GC */ +if (time_after_eq (list->last_gc, jiffies)) { +spin_unlock (&list->list_lock); +return false; + } +list_for_each_entry_safe (conn, conn_n, &list->head, node) { found =find_or_evict (net, list, conn);if (IS_ERR (found)) {
@@ -258,6 +269,7 @@ bool nf_conncount_gc_list(struct net *net,if (!list->count) ret = true; + list->last_gc = jiffies;spin_unlock (&list->list_lock);return ret;
Signature · 1 line
2.30.1 (Apple Git-130)
PATCH v2 1/1 netfilter: nf_conncount: reduce unnecessary GC
Currently nf_conncount can trigger garbage collection (GC) at multiple places. Each GC process takes a spin_lock_bh to traverse the nf_conncount_list. We found that when testing port scanning use two parallel nmap, because the number of connection increase fast, the nf_conncount_count and its subsequent call to __nf_conncount_add take too much time, causing several CPU lockup. This happens when user set the conntrack limit to +20,000, because the larger the limit, the longer the list that GC has to traverse.
The patch mitigate the performance issue by avoiding unnecessary GC with a timestamp. Whenever nf_conncount has done a GC, a timestamp is updated, and beforce the next time GC is triggered, we make sure it's more than a jiffies.
By doin this we can greatly reduce the CPU cycles and avoid the softirq lockup.
To reproduce it in OVS,
$ ovs-appctl dpctl/ct-set-limits zone=1,limit=20000 $ ovs-appctl dpctl/ct-get-limits
At another machine, runs two nmap
$ nmap -p1- <IP> $ nmap -p1- <IP>
---
v2:
- use u32 jiffies in struct nf_conncount_list now its 4-byte list_lock followed by 4-byte last_ct
- move the timestamp check before lock at nf_conncount_gc_list and use READ_ONCE
- move the timestamp check out of list for each loop in __nf_conncount_add
--- include/net/netfilter/nf_conntrack_count.h | 1 + net/netfilter/nf_conncount.c | 11 +++++++++++ 2 files changed, 12 insertions(+)
include/net/netfilter/nf_conntrack_count.h +1 -0
@@ -10,6 +10,7 @@ struct nf_conncount_data;struct nf_conncount_list {spinlock_t list_lock; +u32 last_gc;/* jiffies at most recent gc */ struct list_head head;/* connections with the same filtering key */ unsigned int count;/* length of list */ };
net/netfilter/nf_conncount.c +11 -0
@@ -132,6 +132,9 @@ static int __nf_conncount_add(struct net *net,struct nf_conn *found_ct;unsigned int collect =0 ; +if (time_is_after_eq_jiffies ((unsigned long )list->last_gc)) + goto add_new_node; +/* check the saved connections */ list_for_each_entry_safe (conn, conn_n, &list->head, node) {if (collect >CONNCOUNT_GC_MAX_NODES )
@@ -177,6 +180,7 @@ static int __nf_conncount_add(struct net *net,nf_ct_put (found_ct); } +add_new_node:if (WARN_ON_ONCE (list->count >INT_MAX ))return -EOVERFLOW ;
@@ -190,6 +194,7 @@ static int __nf_conncount_add(struct net *net, conn->jiffies32 = (u32 )jiffies;list_add_tail (&conn->node, &list->head); list->count++; + list->last_gc = (u32 )jiffies;return 0 ; }
@@ -214,6 +219,7 @@ void nf_conncount_list_init(struct nf_conncount_list *list)spin_lock_init (&list->list_lock);INIT_LIST_HEAD (&list->head); list->count =0 ; + list->last_gc = (u32 )jiffies; }EXPORT_SYMBOL_GPL (nf_conncount_list_init);
@@ -227,6 +233,10 @@ bool nf_conncount_gc_list(struct net *net,unsigned int collected =0 ;bool ret = false; +/* don't bother if we just did GC */ +if (time_is_after_eq_jiffies ((unsigned long )READ_ONCE (list->last_gc))) +return false; +/* don't bother if other cpu is already doing GC */ if (!spin_trylock (&list->list_lock))return false;
@@ -258,6 +268,7 @@ bool nf_conncount_gc_list(struct net *net,if (!list->count) ret = true; + list->last_gc = (u32 )jiffies;spin_unlock (&list->list_lock);return ret;
Signature · 1 line
2.30.1 (Apple Git-130)