lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 125/542] netfilter: flowtable: Fix missing flush hardware on table free
    Date
    From: Paul Blakey <paulb@mellanox.com>

    [ Upstream commit 0f34f30a1be80f3f59efeaab596396bc698e7337 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.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 e33a73cb1f42e..640a46fd710d2 100644
    --- a/net/netfilter/nf_flow_table_core.c
    +++ b/net/netfilter/nf_flow_table_core.c
    @@ -554,6 +554,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.20.1
    \
     
     \ /
      Last update: 2020-02-14 16:52    [W:3.198 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site