diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-27 20:21:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-27 20:21:48 -0500 |
| commit | 8eb4adf60b8a2e0857643910c01aac98fe613466 (patch) | |
| tree | 9ceb2f84e28ab1c94156a88ecc1dbbbef7374c98 /net/core | |
| parent | e824265d632629c3d2583d86b8a816e886a5136c (diff) | |
| parent | 6b226487815574193c1da864f2eac274781a2b0c (diff) | |
| download | linux-stable-8eb4adf60b8a2e0857643910c01aac98fe613466.tar.gz linux-stable-8eb4adf60b8a2e0857643910c01aac98fe613466.tar.bz2 linux-stable-8eb4adf60b8a2e0857643910c01aac98fe613466.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2016-11-25
1) Fix a refcount leak in vti6.
From Nicolas Dichtel.
2) Fix a wrong if statement in xfrm_sk_policy_lookup.
From Florian Westphal.
3) The flowcache watermarks are per cpu. Take this into
account when comparing to the threshold where we
refusing new allocations. From Miroslav Urbanek.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/flow.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index 3937b1b68d5b..18e8893d4be5 100644 --- a/net/core/flow.c +++ b/net/core/flow.c @@ -95,7 +95,6 @@ static void flow_cache_gc_task(struct work_struct *work) list_for_each_entry_safe(fce, n, &gc_list, u.gc_list) { flow_entry_kill(fce, xfrm); atomic_dec(&xfrm->flow_cache_gc_count); - WARN_ON(atomic_read(&xfrm->flow_cache_gc_count) < 0); } } @@ -236,9 +235,8 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, if (fcp->hash_count > fc->high_watermark) flow_cache_shrink(fc, fcp); - if (fcp->hash_count > 2 * fc->high_watermark || - atomic_read(&net->xfrm.flow_cache_gc_count) > fc->high_watermark) { - atomic_inc(&net->xfrm.flow_cache_genid); + if (atomic_read(&net->xfrm.flow_cache_gc_count) > + 2 * num_online_cpus() * fc->high_watermark) { flo = ERR_PTR(-ENOBUFS); goto ret_object; } |