Commit 91bfaa15 authored Jan 30, 2020 by Paul Blakey Committed by Pablo Neira Ayuso Jan 31, 2020

netfilter: flowtable: Fix hardware flush order on nf_flow_table_cleanup

On netdev down event, nf_flow_table_cleanup() is called for the relevant
device and it cleans all the tables that are on that device.
If one of those tables has hardware offload flag,
nf_flow_table_iterate_cleanup flushes hardware and then runs the gc.
But the gc can queue more hardware work, which will take time to execute.

Instead first add the work, then flush it, to execute it now.

Fixes: c29f74e0 ("netfilter: nf_flow_table: hardware offload support")
Signed-off-by: Paul Blakey <paulb@mellanox.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent b9e0102a

net/netfilter/nf_flow_table_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -529,9 +529,9 @@ static void nf_flow_table_do_cleanup(struct flow_offload flow, void data)
		static void nf_flow_table_iterate_cleanup(struct nf_flowtable *flowtable,
		struct net_device *dev)
		{
		nf_flow_table_offload_flush(flowtable);
		nf_flow_table_iterate(flowtable, nf_flow_table_do_cleanup, dev);
		flush_delayed_work(&flowtable->gc_work);
		nf_flow_table_offload_flush(flowtable);
		}

		void nf_flow_table_cleanup(struct net_device *dev)

Admin message