From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 3/6] netfilter: flowtable: Fix hardware flush order on nf_flow_table_cleanup
Date: Fri, 31 Jan 2020 20:24:25 +0100 [thread overview]
Message-ID: <20200131192428.167274-4-pablo@netfilter.org> (raw)
In-Reply-To: <20200131192428.167274-1-pablo@netfilter.org>
From: Paul Blakey <paulb@mellanox.com>
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: c29f74e0df7a ("netfilter: nf_flow_table: hardware offload support")
Signed-off-by: Paul Blakey <paulb@mellanox.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_flow_table_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index 7e91989a1b55..14a069c72bb2 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -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)
--
2.11.0
next prev parent reply other threads:[~2020-01-31 19:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-31 19:24 [PATCH 0/6] Netfilter fixes for net Pablo Neira Ayuso
2020-01-31 19:24 ` [PATCH 1/6] netfilter: ipset: fix suspicious RCU usage in find_set_and_id Pablo Neira Ayuso
2020-02-01 20:57 ` Jakub Kicinski
2020-02-01 21:05 ` Jakub Kicinski
2020-02-01 21:11 ` Jozsef Kadlecsik
2020-02-02 4:21 ` Jakub Kicinski
2020-01-31 19:24 ` [PATCH 2/6] netfilter: Use kvcalloc Pablo Neira Ayuso
2020-01-31 19:24 ` Pablo Neira Ayuso [this message]
2020-01-31 19:24 ` [PATCH 4/6] netfilter: flowtable: Fix missing flush hardware on table free Pablo Neira Ayuso
2020-01-31 19:24 ` [PATCH 5/6] netfilter: flowtable: Fix setting forgotten NF_FLOW_HW_DEAD flag Pablo Neira Ayuso
2020-01-31 19:24 ` [PATCH 6/6] netfilter: nf_flowtable: fix documentation Pablo Neira Ayuso
2020-02-01 20:59 ` [PATCH 0/6] Netfilter fixes for net Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200131192428.167274-4-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).