summaryrefslogtreecommitdiff
path: root/net/netfilter
diff options
context:
space:
mode:
authorRoi Dayan <roid@mellanox.com>2020-08-03 10:33:05 +0300
committerPablo Neira Ayuso <pablo@netfilter.org>2020-08-03 12:37:24 +0200
commit4203b19c27967d9eff6928f6a733f81892ffc592 (patch)
tree1b281055be62ca298f4adf0b6921518c29fb32ef /net/netfilter
parent73f9407b3eb893bc8a82293cc8d4dfa3db079c0b (diff)
netfilter: flowtable: Set offload timeout when adding flow
On heavily loaded systems the GC can take time to go over all existing conns and reset their timeout. At that time other calls like from nf_conntrack_in() can call of nf_ct_is_expired() and see the conn as expired. To fix this when we set the offload bit we should also reset the timeout instead of counting on GC to finish first iteration over all conns before the initial timeout. Fixes: 90964016e5d3 ("netfilter: nf_conntrack: add IPS_OFFLOAD status bit") Signed-off-by: Roi Dayan <roid@mellanox.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_flow_table_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index b1eb5272b379..4f7a567c536e 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -243,6 +243,8 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)
return err;
}
+ nf_ct_offload_timeout(flow->ct);
+
if (nf_flowtable_hw_offload(flow_table)) {
__set_bit(NF_FLOW_HW, &flow->flags);
nf_flow_offload_add(flow_table, flow);