netfilter: x_tables: speed up iptables-restore

PATCH In review Florian Westphal 2 participants 4 messages Oct 11, 2017 – Oct 24, 2017

Subsystems (2)

Networking netfilter

lore

Share & tools

lore

Florian Westphal

author maintainer

2017-10-11 23:13 UTC #0 lore raw

v4 cover netfilter: x_tables: speed up iptables-restore

iptables-restore can take quite a long time when sytem is busy, in order of half a minute or more.

The main reason for this is the way ip(6)tables performs table swap:

When xt_replace_table assigns the new ruleset pointer, it does not wait for other processors to finish with old ruleset.

Instead it relies on the counter sequence lock in get_counters().

This works but this is costly if system is busy as each counter read operation can possibly be restarted indefinitely.

Instead, make xt_replace_table wait until all processors are known to not use the old ruleset anymore.

This allows to read the old counters without any locking, no cpu is using the ruleset anymore so counters can't change either.

Florian Westphal

author maintainer

2017-10-11 23:13 UTC #1 lore raw

PATCH v4 1/2 netfilter: x_tables: make xt_replace_table wait until old rules are not used anymore

xt_replace_table relies on table replacement counter retrieval (which uses xt_recseq to synchronize pcpu counters).

This is fine, however with large rule set get_counters() can take a very long time -- it needs to synchronize all counters because it has to assume concurrent modifications can occur.

Make xt_replace_table synchronize by itself by waiting until all cpus had an even seqcount.

This allows a followup patch to copy the counters of the old ruleset without any synchonization after xt_replace_table has completed.

Cc Dan Williams <[email protected]>

Reviewed-by Eric Dumazet <[email protected]>

Signed-off-by Florian Westphal <[email protected]>

---
v4: add smb_wmb to make sure ->private is visible before checking xt_recseq
v3: also continue if seq has changed in any way

 net/netfilter/x_tables.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

net/netfilter/x_tables.c +18 -3

index c83a3b5e1c6c..a164e5123d59 100644
@@ -1153,6 +1153,7 @@ xt_replace_table(struct xt_table *table,
 	      int *error)
 {
 	struct xt_table_info *private;
+	unsigned int cpu;
 	int ret;
 
 	ret = xt_jumpstack_alloc(newinfo);

@@ -1182,14 +1183,28 @@ xt_replace_table(struct xt_table *table,
 	smp_wmb();
 	table->private = newinfo;
 
+	/* make sure all cpus see new ->private value */
+	smp_wmb();
+
 	/*
 	 * Even though table entries have now been swapped, other CPU's
-	 * may still be using the old entries. This is okay, because
-	 * resynchronization happens because of the locking done
-	 * during the get_counters() routine.
+	 * may still be using the old entries...
 	 */
 	local_bh_enable();
 
+	/* ... so wait for even xt_recseq on all cpus */
+	for_each_possible_cpu(cpu) {
+		seqcount_t *s = &per_cpu(xt_recseq, cpu);
+		u32 seq = raw_read_seqcount(s);
+
+		if (seq & 1) {
+			do {
+				cond_resched();
+				cpu_relax();
+			} while (seq == raw_read_seqcount(s));
+		}
+	}
+
 #ifdef CONFIG_AUDIT
 	if (audit_enabled) {
 		audit_log(current->audit_context, GFP_KERNEL,

Signature · 1 line

2.13.6

Florian Westphal

author maintainer

2017-10-11 23:13 UTC #2 lore raw

PATCH v4 2/2 netfilter: x_tables: don't use seqlock when fetching old counters

In reply to Florian Westphal

after previous commit xt_replace_table will wait until all cpus had even seqcount (i.e., no cpu is accessing old ruleset).

Add a 'old' counter retrival version that doesn't synchronize counters. Its not needed, the old counters are not in use anymore at this point.

This speeds up table replacement on busy systems with large tables (and many cores).

Cc Dan Williams <[email protected]>

Cc Eric Dumazet <[email protected]>

Signed-off-by Florian Westphal <[email protected]>

---
no changes since v1.

 net/ipv4/netfilter/arp_tables.c | 22 ++++++++++++++++++++--
 net/ipv4/netfilter/ip_tables.c  | 23 +++++++++++++++++++++--
 net/ipv6/netfilter/ip6_tables.c | 22 ++++++++++++++++++++--
 3 files changed, 61 insertions(+), 6 deletions(-)

net/ipv4/netfilter/arp_tables.c +20 -2

index 9e2770fd00be..f88221aebc9d 100644
@@ -634,6 +634,25 @@ static void get_counters(const struct xt_table_info *t,
 	}
 }
 
+static void get_old_counters(const struct xt_table_info *t,
+			     struct xt_counters counters[])
+{
+	struct arpt_entry *iter;
+	unsigned int cpu, i;
+
+	for_each_possible_cpu(cpu) {
+		i = 0;
+		xt_entry_foreach(iter, t->entries, t->size) {
+			struct xt_counters *tmp;
+
+			tmp = xt_get_per_cpu_counter(&iter->counters, cpu);
+			ADD_COUNTER(counters[i], tmp->bcnt, tmp->pcnt);
+			++i;
+		}
+		cond_resched();
+	}
+}
+
 static struct xt_counters *alloc_counters(const struct xt_table *table)
 {
 	unsigned int countersize;

@@ -910,8 +929,7 @@ static int __do_replace(struct net *net, const char *name,
 	    (newinfo->number <= oldinfo->initial_entries))
 		module_put(t->me);
 
-	/* Get the old counters, and synchronize with replace */
-	get_counters(oldinfo, counters);
+	get_old_counters(oldinfo, counters);
 
 	/* Decrease module usage counts and free resource */
 	loc_cpu_old_entry = oldinfo->entries;

net/ipv4/netfilter/ip_tables.c +21 -2

index 39286e543ee6..4cbe5e80f3bf 100644
@@ -781,6 +781,26 @@ get_counters(const struct xt_table_info *t,
 	}
 }
 
+static void get_old_counters(const struct xt_table_info *t,
+			     struct xt_counters counters[])
+{
+	struct ipt_entry *iter;
+	unsigned int cpu, i;
+
+	for_each_possible_cpu(cpu) {
+		i = 0;
+		xt_entry_foreach(iter, t->entries, t->size) {
+			const struct xt_counters *tmp;
+
+			tmp = xt_get_per_cpu_counter(&iter->counters, cpu);
+			ADD_COUNTER(counters[i], tmp->bcnt, tmp->pcnt);
+			++i; /* macro does multi eval of i */
+		}
+
+		cond_resched();
+	}
+}
+
 static struct xt_counters *alloc_counters(const struct xt_table *table)
 {
 	unsigned int countersize;

@@ -1070,8 +1090,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
 	    (newinfo->number <= oldinfo->initial_entries))
 		module_put(t->me);
 
-	/* Get the old counters, and synchronize with replace */
-	get_counters(oldinfo, counters);
+	get_old_counters(oldinfo, counters);
 
 	/* Decrease module usage counts and free resource */
 	xt_entry_foreach(iter, oldinfo->entries, oldinfo->size)

net/ipv6/netfilter/ip6_tables.c +20 -2

index 01bd3ee5ebc6..f06e25065a34 100644
@@ -800,6 +800,25 @@ get_counters(const struct xt_table_info *t,
 	}
 }
 
+static void get_old_counters(const struct xt_table_info *t,
+			     struct xt_counters counters[])
+{
+	struct ip6t_entry *iter;
+	unsigned int cpu, i;
+
+	for_each_possible_cpu(cpu) {
+		i = 0;
+		xt_entry_foreach(iter, t->entries, t->size) {
+			const struct xt_counters *tmp;
+
+			tmp = xt_get_per_cpu_counter(&iter->counters, cpu);
+			ADD_COUNTER(counters[i], tmp->bcnt, tmp->pcnt);
+			++i;
+		}
+		cond_resched();
+	}
+}
+
 static struct xt_counters *alloc_counters(const struct xt_table *table)
 {
 	unsigned int countersize;

@@ -1090,8 +1109,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
 	    (newinfo->number <= oldinfo->initial_entries))
 		module_put(t->me);
 
-	/* Get the old counters, and synchronize with replace */
-	get_counters(oldinfo, counters);
+	get_old_counters(oldinfo, counters);
 
 	/* Decrease module usage counts and free resource */
 	xt_entry_foreach(iter, oldinfo->entries, oldinfo->size)

Signature · 1 line

2.13.6

Pablo Neira Ayuso

maintainer

2017-10-24 16:04 UTC #3 lore raw

In reply to Florian Westphal

Quoted 10 lines · Florian Westphal

iptables-restore can take quite a long time when sytem is busy, in order of half a minute or more.
The main reason for this is the way ip(6)tables performs table swap:
When xt_replace_table assigns the new ruleset pointer, it does not wait for other processors to finish with old ruleset.
Instead it relies on the counter sequence lock in get_counters().

Quoted 8 lines

This works but this is costly if system is busy as each counter read operation can possibly be restarted indefinitely.
Instead, make xt_replace_table wait until all processors are known to not use the old ruleset anymore.
This allows to read the old counters without any locking, no cpu is using the ruleset anymore so counters can't change either.

Series applied, thanks.