diff options
author | Florian Westphal <fw@strlen.de> | 2017-07-17 07:57:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-07-18 14:13:41 -0400 |
commit | 09c7570480f7544ffbf8e6db365208b0b0c154c6 (patch) | |
tree | 65c8b2560b2c819b8948244fa707d4fa128b4da9 /net/key | |
parent | bd45c539bf56650fb8fbab09c36f4b9afcbd4e1c (diff) |
xfrm: remove flow cache
After rcu conversions performance degradation in forward tests isn't that
noticeable anymore.
See next patch for some numbers.
A followup patcg could then also remove genid from the policies
as we do not cache bundles anymore.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r-- | net/key/af_key.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index ca9d3ae665e7..10d7133e4fe9 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -2398,8 +2398,6 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, const struct sa | |||
2398 | 2398 | ||
2399 | out: | 2399 | out: |
2400 | xfrm_pol_put(xp); | 2400 | xfrm_pol_put(xp); |
2401 | if (err == 0) | ||
2402 | xfrm_garbage_collect(net); | ||
2403 | return err; | 2401 | return err; |
2404 | } | 2402 | } |
2405 | 2403 | ||
@@ -2650,8 +2648,6 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, const struct sadb_ | |||
2650 | 2648 | ||
2651 | out: | 2649 | out: |
2652 | xfrm_pol_put(xp); | 2650 | xfrm_pol_put(xp); |
2653 | if (delete && err == 0) | ||
2654 | xfrm_garbage_collect(net); | ||
2655 | return err; | 2651 | return err; |
2656 | } | 2652 | } |
2657 | 2653 | ||
@@ -2751,8 +2747,6 @@ static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, const struct sad | |||
2751 | int err, err2; | 2747 | int err, err2; |
2752 | 2748 | ||
2753 | err = xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, true); | 2749 | err = xfrm_policy_flush(net, XFRM_POLICY_TYPE_MAIN, true); |
2754 | if (!err) | ||
2755 | xfrm_garbage_collect(net); | ||
2756 | err2 = unicast_flush_resp(sk, hdr); | 2750 | err2 = unicast_flush_resp(sk, hdr); |
2757 | if (err || err2) { | 2751 | if (err || err2) { |
2758 | if (err == -ESRCH) /* empty table - old silent behavior */ | 2752 | if (err == -ESRCH) /* empty table - old silent behavior */ |