All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 4/6] netfilter: flowtable: Fix missing flush hardware on table free
Date: Fri, 31 Jan 2020 20:24:26 +0100	[thread overview]
Message-ID: <20200131192428.167274-5-pablo@netfilter.org> (raw)
In-Reply-To: <20200131192428.167274-1-pablo@netfilter.org>

From: Paul Blakey <paulb@mellanox.com>

If entries exist when freeing a hardware offload enabled table,
we queue work for hardware while running the gc iteration.

Execute it (flush) after queueing.

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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index 14a069c72bb2..8af28e10b4e6 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -553,6 +553,7 @@ void nf_flow_table_free(struct nf_flowtable *flow_table)
 	cancel_delayed_work_sync(&flow_table->gc_work);
 	nf_flow_table_iterate(flow_table, nf_flow_table_do_cleanup, NULL);
 	nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, flow_table);
+	nf_flow_table_offload_flush(flow_table);
 	rhashtable_destroy(&flow_table->rhashtable);
 }
 EXPORT_SYMBOL_GPL(nf_flow_table_free);
-- 
2.11.0


  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 ` [PATCH 3/6] netfilter: flowtable: Fix hardware flush order on nf_flow_table_cleanup Pablo Neira Ayuso
2020-01-31 19:24 ` Pablo Neira Ayuso [this message]
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-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.