diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-07 14:29:11 +0200 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-09-02 16:29:23 +0200 |
commit | 95acc4fe0e31ae91d485635c021d259e06785b5d (patch) | |
tree | aa079a7cb0e09c4f2ba655925095fc27186c27a9 /target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch | |
parent | 66ab1fb395f85e018cb1c6ae0d3a14aa46373f84 (diff) | |
download | upstream-95acc4fe0e31ae91d485635c021d259e06785b5d.tar.gz upstream-95acc4fe0e31ae91d485635c021d259e06785b5d.tar.bz2 upstream-95acc4fe0e31ae91d485635c021d259e06785b5d.zip |
kernel: remove support for kernel 4.14
No target uses kernel 4.14 anymore.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch b/target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch deleted file mode 100644 index 5ae917ff51..0000000000 --- a/target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Thu, 1 Feb 2018 18:49:00 +0100 -Subject: [PATCH] netfilter: nft_flow_offload: wait for garbage collector - to run after cleanup - -If netdevice goes down, then flowtable entries are scheduled to be -removed. Wait for garbage collector to have a chance to run so it can -delete them from the hashtable. - -The flush call might sleep, so hold the nfnl mutex from -nft_flow_table_iterate() instead of rcu read side lock. The use of the -nfnl mutex is also implicitly fixing races between updates via nfnetlink -and netdevice event. - -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - ---- a/net/netfilter/nf_tables_api.c -+++ b/net/netfilter/nf_tables_api.c -@@ -4913,13 +4913,13 @@ void nft_flow_table_iterate(struct net * - struct nft_flowtable *flowtable; - const struct nft_table *table; - -- rcu_read_lock(); -- list_for_each_entry_rcu(table, &net->nft.tables, list) { -- list_for_each_entry_rcu(flowtable, &table->flowtables, list) { -+ nfnl_lock(NFNL_SUBSYS_NFTABLES); -+ list_for_each_entry(table, &net->nft.tables, list) { -+ list_for_each_entry(flowtable, &table->flowtables, list) { - iter(&flowtable->data, data); - } - } -- rcu_read_unlock(); -+ nfnl_unlock(NFNL_SUBSYS_NFTABLES); - } - EXPORT_SYMBOL_GPL(nft_flow_table_iterate); - ---- a/net/netfilter/nft_flow_offload.c -+++ b/net/netfilter/nft_flow_offload.c -@@ -208,6 +208,7 @@ static void nft_flow_offload_iterate_cle - void *data) - { - nf_flow_table_iterate(flowtable, flow_offload_iterate_cleanup, data); -+ flush_delayed_work(&flowtable->gc_work); - } - - static int flow_offload_netdev_event(struct notifier_block *this, |