pull request (net-next): ipsec-next 2014-02-24
Subsystems (4)
Steffen Klassert
maintainer1) Introduce skb_to_sgvec_nomark function to add further data to the sg list without calling sg_unmark_end first. Needed to add extended sequence number informations. From Fan Du.
2) Add IPsec extended sequence numbers support to the Authentication Header protocol for ipv4 and ipv6. From Fan Du.
3) Make the IPsec flowcache namespace aware, from Fan Du.
4) Avoid creating temporary SA for every packet when no key manager is registered. From Horia Geanta.
5) Support filtering of SA dumps to show only the SAs that match a given filter. From Nicolas Dichtel.
6) Remove caching of xfrm_policy_sk_bundles. The cached socket policy bundles are never used, instead we create a new cache entry whenever xfrm_lookup() is called on a socket policy. Most protocols cache the used routes to the socket, so this caching is not needed.
7) Fix a forgotten SADB_X_EXT_FILTER length check in pfkey, from Nicolas Dichtel.
8) Cleanup error handling of xfrm_state_clone.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 738b52bb9845da183b6ff46a8f685b56a63379d1:
Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze (2014-02-11 12:24:35 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
for you to fetch changes up to cc9ab60e57964d463ff31b9621c8d7e786aee042:
xfrm: Cleanup error handling of xfrm_state_clone (2014-02-21 07:53:28 +0100)
----------------------------------------------------------------
Fan Du (8):
skbuff: Introduce skb_to_sgvec_nomark to map skb without mark new end {IPv4,xfrm} Add ESN support for AH egress part {IPv4,xfrm} Add ESN support for AH ingress part {IPv6,xfrm} Add ESN support for AH egress part {IPv6,xfrm} Add ESN support for AH ingress part
xfrm: Don't prohibit AH from using ESN feature
flowcache: Make flow cache name space aware
flowcache: Bring net/core/flow.c under IPsec maintain scope
Horia Geanta (1):
xfrm: avoid creating temporary SA when there are no listeners
Nicolas Dichtel (2):
ipsec: add support of limited SA dump
pfkey: fix SADB_X_EXT_FILTER length check
Steffen Klassert (2):
xfrm: Remove caching of xfrm_policy_sk_bundles
xfrm: Cleanup error handling of xfrm_state_clone
MAINTAINERS | 1 + include/linux/skbuff.h | 2 + include/net/flow.h | 5 +- include/net/flowcache.h | 25 ++++++++ include/net/netns/xfrm.h | 12 +++- include/net/xfrm.h | 25 ++++++-- include/uapi/linux/pfkeyv2.h | 15 ++++- include/uapi/linux/xfrm.h | 10 +++ net/core/flow.c | 127 ++++++++++++++++++--------------------- net/core/skbuff.c | 26 ++++++++ net/ipv4/ah4.c | 53 ++++++++++++---- net/ipv6/ah6.c | 56 +++++++++++++---- net/key/af_key.c | 39 +++++++++++- net/xfrm/xfrm_policy.c | 35 ++--------- net/xfrm/xfrm_state.c | 72 ++++++++++++++++++---- net/xfrm/xfrm_user.c | 37 +++++++++++- security/selinux/include/xfrm.h | 5 +- 17 files changed, 396 insertions(+), 149 deletions(-) create mode 100644 include/net/flowcache.h
Steffen Klassert
maintainerPATCH 1/13 skbuff: Introduce skb_to_sgvec_nomark to map skb without mark new end
From: Fan Du <[email protected]>
As compared with skb_to_sgvec, skb_to_sgvec_nomark only map skb to given sglist without mark the sg which contain last skb data as the end. So the caller can mannipulate sg list as will when padding new data after the first call without calling sg_unmark_end to expend sg list.
--- include/linux/skbuff.h | 2 ++ net/core/skbuff.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+)
include/linux/skbuff.h +2 -0
@@ -691,6 +691,8 @@ struct sk_buff *skb_realloc_headroom(struct sk_buff *skb, unsigned int headroom);struct sk_buff *skb_copy_expand (const struct sk_buff *skb,int newheadroom,int newtailroom,gfp_t priority); +int skb_to_sgvec_nomark (struct sk_buff *skb,struct scatterlist *sg, +int offset,int len);int skb_to_sgvec (struct sk_buff *skb,struct scatterlist *sg,int offset,int len);int skb_cow_data (struct sk_buff *skb,int tailbits,struct sk_buff **trailer);
net/core/skbuff.c +26 -0
@@ -3281,6 +3281,32 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)return elt; } +/* As compared with skb_to_sgvec, skb_to_sgvec_nomark only map skb to given +* sglist without mark the sg which contain last skb data as the end. +* So the caller can mannipulate sg list as will when padding new data after +* the first call without calling sg_unmark_end to expend sg list. +* +* Scenario to use skb_to_sgvec_nomark: +* 1. sg_init_table +* 2. skb_to_sgvec_nomark(payload1) +* 3. skb_to_sgvec_nomark(payload2) +* +* This is equivalent to: +* 1. sg_init_table +* 2. skb_to_sgvec(payload1) +* 3. sg_unmark_end +* 4. skb_to_sgvec(payload2) +* +* When mapping mutilple payload conditionally, skb_to_sgvec_nomark +* is more preferable. +*/ +int skb_to_sgvec_nomark (struct sk_buff *skb,struct scatterlist *sg, +int offset,int len) +{ +return __skb_to_sgvec (skb, sg, offset, len); +} +EXPORT_SYMBOL_GPL (skb_to_sgvec_nomark); +int skb_to_sgvec (struct sk_buff *skb,struct scatterlist *sg,int offset,int len) {int nsg =__skb_to_sgvec (skb, sg, offset, len);
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 2/13 {IPv4,xfrm} Add ESN support for AH egress part
In reply to Steffen KlassertFrom: Fan Du <[email protected]>
This patch add esn support for AH output stage by attaching upper 32bits sequence number right after packet payload as specified by RFC 4302.
Then the ICV value will guard upper 32bits sequence number as well when packet going out.
--- net/ipv4/ah4.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
net/ipv4/ah4.c +20 -6
@@ -155,6 +155,10 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)struct iphdr *iph, *top_iph;struct ip_auth_hdr *ah;struct ah_data *ahp; +int seqhi_len =0 ; +__be32 *seqhi; +int sglists =0 ; +struct scatterlist *seqhisg; ahp = x->data; ahash = ahp->ahash;
@@ -167,14 +171,19 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb) ah =ip_auth_hdr (skb); ihl =ip_hdrlen (skb); +if (x->props.flags &XFRM_STATE_ESN ) { + sglists =1 ; + seqhi_len =sizeof (*seqhi); + } err = -ENOMEM ; - iph =ah_alloc_tmp (ahash, nfrags, ihl); + iph =ah_alloc_tmp (ahash, nfrags + sglists, ihl + seqhi_len);if (!iph) goto out; - - icv =ah_tmp_icv (ahash, iph, ihl); + seqhi = (__be32 *)((char *)iph + ihl); + icv =ah_tmp_icv (ahash, seqhi, seqhi_len); req =ah_tmp_req (ahash, icv); sg =ah_req_sg (ahash, req); + seqhisg = sg + nfrags;memset (ah->auth_data,0 , ahp->icv_trunc_len);
@@ -210,10 +219,15 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb) ah->spi = x->id.spi; ah->seq_no =htonl (XFRM_SKB_CB (skb)->seq.output.low); -sg_init_table (sg, nfrags); -skb_to_sgvec (skb, sg,0 , skb->len); +sg_init_table (sg, nfrags + sglists); +skb_to_sgvec_nomark (skb, sg,0 , skb->len); -ahash_request_set_crypt (req, sg, icv, skb->len); +if (x->props.flags &XFRM_STATE_ESN ) { +/* Attach seqhi sg right after packet payload */ + *seqhi =htonl (XFRM_SKB_CB (skb)->seq.output.hi); +sg_set_buf (seqhisg, seqhi, seqhi_len); + } +ahash_request_set_crypt (req, sg, icv, skb->len + seqhi_len);ahash_request_set_callback (req,0 , ah_output_done, skb);AH_SKB_CB (skb)->tmp = iph;
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 3/13 {IPv4,xfrm} Add ESN support for AH ingress part
In reply to Steffen KlassertFrom: Fan Du <[email protected]>
This patch add esn support for AH input stage by attaching upper 32bits sequence number right after packet payload as specified by RFC 4302.
Then the ICV value will guard upper 32bits sequence number as well when packet getting in.
--- net/ipv4/ah4.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-)
net/ipv4/ah4.c +22 -5
@@ -309,6 +309,10 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)struct ip_auth_hdr *ah;struct ah_data *ahp;int err = -ENOMEM ; +int seqhi_len =0 ; +__be32 *seqhi; +int sglists =0 ; +struct scatterlist *seqhisg;if (!pskb_may_pull (skb,sizeof (*ah))) goto out;
@@ -349,14 +353,22 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) iph =ip_hdr (skb); ihl =ip_hdrlen (skb); - work_iph =ah_alloc_tmp (ahash, nfrags, ihl + ahp->icv_trunc_len); +if (x->props.flags &XFRM_STATE_ESN ) { + sglists =1 ; + seqhi_len =sizeof (*seqhi); + } + + work_iph =ah_alloc_tmp (ahash, nfrags + sglists, ihl + + ahp->icv_trunc_len + seqhi_len);if (!work_iph) goto out; - auth_data =ah_tmp_auth (work_iph, ihl); + seqhi = (__be32 *)((char *)work_iph + ihl); + auth_data =ah_tmp_auth (seqhi, seqhi_len); icv =ah_tmp_icv (ahash, auth_data, ahp->icv_trunc_len); req =ah_tmp_req (ahash, icv); sg =ah_req_sg (ahash, req); + seqhisg = sg + nfrags;memcpy (work_iph, iph, ihl);memcpy (auth_data, ah->auth_data, ahp->icv_trunc_len);
@@ -375,10 +387,15 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)skb_push (skb, ihl); -sg_init_table (sg, nfrags); -skb_to_sgvec (skb, sg,0 , skb->len); +sg_init_table (sg, nfrags + sglists); +skb_to_sgvec_nomark (skb, sg,0 , skb->len); -ahash_request_set_crypt (req, sg, icv, skb->len); +if (x->props.flags &XFRM_STATE_ESN ) { +/* Attach seqhi sg right after packet payload */ + *seqhi =XFRM_SKB_CB (skb)->seq.input.hi; +sg_set_buf (seqhisg, seqhi, seqhi_len); + } +ahash_request_set_crypt (req, sg, icv, skb->len + seqhi_len);ahash_request_set_callback (req,0 , ah_input_done, skb);AH_SKB_CB (skb)->tmp = work_iph;
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 4/13 {IPv6,xfrm} Add ESN support for AH egress part
In reply to Steffen KlassertFrom: Fan Du <[email protected]>
This patch add esn support for AH output stage by attaching upper 32bits sequence number right after packet payload as specified by RFC 4302.
Then the ICV value will guard upper 32bits sequence number as well when packet going out.
--- net/ipv6/ah6.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
net/ipv6/ah6.c +21 -5
@@ -346,6 +346,10 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)struct ip_auth_hdr *ah;struct ah_data *ahp;struct tmp_ext *iph_ext; +int seqhi_len =0 ; +__be32 *seqhi; +int sglists =0 ; +struct scatterlist *seqhisg; ahp = x->data; ahash = ahp->ahash;
@@ -359,15 +363,22 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)if (extlen) extlen +=sizeof (*iph_ext); +if (x->props.flags &XFRM_STATE_ESN ) { + sglists =1 ; + seqhi_len =sizeof (*seqhi); + } err = -ENOMEM ; - iph_base =ah_alloc_tmp (ahash, nfrags,IPV6HDR_BASELEN + extlen); + iph_base =ah_alloc_tmp (ahash, nfrags + sglists,IPV6HDR_BASELEN + + extlen + seqhi_len);if (!iph_base) goto out; iph_ext =ah_tmp_ext (iph_base); - icv =ah_tmp_icv (ahash, iph_ext, extlen); + seqhi = (__be32 *)((char *)iph_ext + extlen); + icv =ah_tmp_icv (ahash, seqhi, seqhi_len); req =ah_tmp_req (ahash, icv); sg =ah_req_sg (ahash, req); + seqhisg = sg + nfrags; ah =ip_auth_hdr (skb);memset (ah->auth_data,0 , ahp->icv_trunc_len);
@@ -411,10 +422,15 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) ah->spi = x->id.spi; ah->seq_no =htonl (XFRM_SKB_CB (skb)->seq.output.low); -sg_init_table (sg, nfrags); -skb_to_sgvec (skb, sg,0 , skb->len); +sg_init_table (sg, nfrags + sglists); +skb_to_sgvec_nomark (skb, sg,0 , skb->len); -ahash_request_set_crypt (req, sg, icv, skb->len); +if (x->props.flags &XFRM_STATE_ESN ) { +/* Attach seqhi sg right after packet payload */ + *seqhi =htonl (XFRM_SKB_CB (skb)->seq.output.hi); +sg_set_buf (seqhisg, seqhi, seqhi_len); + } +ahash_request_set_crypt (req, sg, icv, skb->len + seqhi_len);ahash_request_set_callback (req,0 , ah6_output_done, skb);AH_SKB_CB (skb)->tmp = iph_base;
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 5/13 {IPv6,xfrm} Add ESN support for AH ingress part
In reply to Steffen KlassertFrom: Fan Du <[email protected]>
This patch add esn support for AH input stage by attaching upper 32bits sequence number right after packet payload as specified by RFC 4302.
Then the ICV value will guard upper 32bits sequence number as well when packet going in.
--- net/ipv6/ah6.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
net/ipv6/ah6.c +24 -6
@@ -530,6 +530,10 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)int nexthdr;int nfrags;int err = -ENOMEM ; +int seqhi_len =0 ; +__be32 *seqhi; +int sglists =0 ; +struct scatterlist *seqhisg;if (!pskb_may_pull (skb,sizeof (struct ip_auth_hdr ))) goto out;
@@ -566,14 +570,22 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)skb_push (skb, hdr_len); - work_iph =ah_alloc_tmp (ahash, nfrags, hdr_len + ahp->icv_trunc_len); +if (x->props.flags &XFRM_STATE_ESN ) { + sglists =1 ; + seqhi_len =sizeof (*seqhi); + } + + work_iph =ah_alloc_tmp (ahash, nfrags + sglists, hdr_len + + ahp->icv_trunc_len + seqhi_len);if (!work_iph) goto out; - auth_data =ah_tmp_auth (work_iph, hdr_len); - icv =ah_tmp_icv (ahash, auth_data, ahp->icv_trunc_len); + auth_data =ah_tmp_auth ((u8 *)work_iph, hdr_len); + seqhi = (__be32 *)(auth_data + ahp->icv_trunc_len); + icv =ah_tmp_icv (ahash, seqhi, seqhi_len); req =ah_tmp_req (ahash, icv); sg =ah_req_sg (ahash, req); + seqhisg = sg + nfrags;memcpy (work_iph, ip6h, hdr_len);memcpy (auth_data, ah->auth_data, ahp->icv_trunc_len);
@@ -588,10 +600,16 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) ip6h->flow_lbl[2 ] =0 ; ip6h->hop_limit =0 ; -sg_init_table (sg, nfrags); -skb_to_sgvec (skb, sg,0 , skb->len); +sg_init_table (sg, nfrags + sglists); +skb_to_sgvec_nomark (skb, sg,0 , skb->len); + +if (x->props.flags &XFRM_STATE_ESN ) { +/* Attach seqhi sg right after packet payload */ + *seqhi =XFRM_SKB_CB (skb)->seq.input.hi; +sg_set_buf (seqhisg, seqhi, seqhi_len); + } -ahash_request_set_crypt (req, sg, icv, skb->len); +ahash_request_set_crypt (req, sg, icv, skb->len + seqhi_len);ahash_request_set_callback (req,0 , ah6_input_done, skb);AH_SKB_CB (skb)->tmp = work_iph;
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 6/13 xfrm: Don't prohibit AH from using ESN feature
In reply to Steffen KlassertFrom: Fan Du <[email protected]>
Clear checking when user try to use ESN through netlink keymgr for AH. As only ESP and AH support ESN feature according to RFC.
--- net/xfrm/xfrm_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/xfrm/xfrm_user.c +2 -1
@@ -142,7 +142,8 @@ static inline int verify_replay(struct xfrm_usersa_info *p,if (!rt)return 0 ; -if (p->id.proto !=IPPROTO_ESP ) +/* As only ESP and AH support ESN feature. */ +if ((p->id.proto !=IPPROTO_ESP ) && (p->id.proto !=IPPROTO_AH ))return -EINVAL ;if (p->replay_window !=0 )
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 7/13 flowcache: Make flow cache name space aware
In reply to Steffen KlassertFrom: Fan Du <[email protected]>
Inserting a entry into flowcache, or flushing flowcache should be based on per net scope. The reason to do so is flushing operation from fat netns crammed with flow entries will also making the slim netns with only a few flow cache entries go away in original implementation.
Since flowcache is tightly coupled with IPsec, so it would be easier to put flow cache global parameters into xfrm namespace part. And one last thing needs to do is bumping flow cache genid, and flush flow cache should also be made in per net style.
--- include/net/flow.h | 5 +- include/net/flowcache.h | 25 ++++++++ include/net/netns/xfrm.h | 11 ++++ net/core/flow.c | 127 ++++++++++++++++++--------------------- net/xfrm/xfrm_policy.c | 7 ++- security/selinux/include/xfrm.h | 5 +- 6 files changed, 103 insertions(+), 77 deletions(-) create mode 100644 include/net/flowcache.h
include/net/flow.h +3 -2
@@ -218,9 +218,10 @@ struct flow_cache_object *flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir, flow_resolve_t resolver, void *ctx); +int flow_cache_init (struct net *net); -void flow_cache_flush (void ); -void flow_cache_flush_deferred (void ); +void flow_cache_flush (struct net *net); +void flow_cache_flush_deferred (struct net *net);extern atomic_t flow_cache_genid;#endif
include/net/flowcache.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef _NET_FLOWCACHE_H +#define _NET_FLOWCACHE_H + +#include <linux/interrupt.h> +#include <linux/types.h> +#include <linux/timer.h> +#include <linux/notifier.h> + +struct flow_cache_percpu { +struct hlist_head *hash_table; +int hash_count; +u32 hash_rnd; +int hash_rnd_recalc; +struct tasklet_struct flush_tasklet; +}; + +struct flow_cache { +u32 hash_shift; +struct flow_cache_percpu __percpu *percpu; +struct notifier_block hotcpu_notifier; +int low_watermark; +int high_watermark; +struct timer_list rnd_timer; +}; +#endif /* _NET_FLOWCACHE_H */
include/net/netns/xfrm.h +11 -0
@@ -6,6 +6,7 @@#include <linux/workqueue.h> #include <linux/xfrm.h> #include <net/dst_ops.h> +#include <net/flowcache.h> struct ctl_table_header ;
@@ -61,6 +62,16 @@ struct netns_xfrm {spinlock_t xfrm_policy_sk_bundle_lock;rwlock_t xfrm_policy_lock;struct mutex xfrm_cfg_mutex; + +/* flow cache part */ +struct flow_cache flow_cache_global; +struct kmem_cache *flow_cachep; +atomic_t flow_cache_genid; +struct list_head flow_cache_gc_list; +spinlock_t flow_cache_gc_lock; +struct work_struct flow_cache_gc_work; +struct work_struct flow_cache_flush_work; + struct mutex flow_flush_sem; };#endif
net/core/flow.c +57 -70
282 lines not on this page · raw message
net/xfrm/xfrm_policy.c +4 -3
@@ -661,7 +661,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)hlist_add_head (&policy->bydst, chain);xfrm_pol_hold (policy); net->xfrm.policy_count[dir]++; -atomic_inc (&flow_cache_genid); +atomic_inc (&net->xfrm.flow_cache_genid);/* After previous checking, family can either be AF_INET or AF_INET6 */ if (policy->family ==AF_INET )
@@ -2567,14 +2567,14 @@ static void __xfrm_garbage_collect(struct net *net)void xfrm_garbage_collect (struct net *net) { -flow_cache_flush (); +flow_cache_flush (net);__xfrm_garbage_collect (net); }EXPORT_SYMBOL (xfrm_garbage_collect);static void xfrm_garbage_collect_deferred (struct net *net) { -flow_cache_flush_deferred (); +flow_cache_flush_deferred (net);__xfrm_garbage_collect (net); }
@@ -2947,6 +2947,7 @@ static int __net_init xfrm_net_init(struct net *net)spin_lock_init (&net->xfrm.xfrm_policy_sk_bundle_lock);mutex_init (&net->xfrm.xfrm_cfg_mutex); +flow_cache_init (net);return 0 ; out_sysctl:
security/selinux/include/xfrm.h +3 -2
@@ -45,10 +45,11 @@ static inline void selinux_xfrm_notify_policyload(void) {struct net *net; -atomic_inc (&flow_cache_genid);rtnl_lock (); -for_each_net (net) +for_each_net (net) { +atomic_inc (&net->xfrm.flow_cache_genid);rt_genid_bump_all (net); + }rtnl_unlock (); }#else
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 8/13 flowcache: Bring net/core/flow.c under IPsec maintain scope
In reply to Steffen KlassertFrom: Fan Du <[email protected]>
As flow cache is mainly manipulated from IPsec.
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -5992,6 +5992,7 @@ L: [email protected] T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git S: Maintained +F: net/core/flow.c F: net/xfrm/ F: net/key/ F: net/ipv4/xfrm*
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 9/13 xfrm: avoid creating temporary SA when there are no listeners
In reply to Steffen KlassertFrom: Horia Geanta <[email protected]>
In the case when KMs have no listeners, km_query() will fail and temporary SAs are garbage collected immediately after their allocation. This causes strain on memory allocation, leading even to OOM since temporary SA alloc/free cycle is performed for every packet and garbage collection does not keep up the pace.
The sane thing to do is to make sure we have audience before temporary SA allocation.
--- include/net/xfrm.h | 15 +++++++++++++++ net/key/af_key.c | 19 +++++++++++++++++++ net/xfrm/xfrm_state.c | 31 +++++++++++++++++++++++++++++++ net/xfrm/xfrm_user.c | 6 ++++++ 4 files changed, 71 insertions(+)
include/net/xfrm.h +15 -0
@@ -594,6 +594,7 @@ struct xfrm_mgr {const struct xfrm_migrate *m, int num_bundles, const struct xfrm_kmaddress *k); +bool (*is_alive)(const struct km_event *c); };int xfrm_register_km (struct xfrm_mgr *km);
@@ -1646,6 +1647,20 @@ static inline int xfrm_aevent_is_on(struct net *net)rcu_read_unlock (); return ret; } + +static inline int xfrm_acquire_is_on (struct net *net) +{ +struct sock *nlsk; +int ret =0 ; + +rcu_read_lock (); + nlsk =rcu_dereference (net->xfrm.nlsk); +if (nlsk) + ret =netlink_has_listeners (nlsk,XFRMNLGRP_ACQUIRE ); +rcu_read_unlock (); + +return ret; +}#endif static inline int xfrm_alg_len (const struct xfrm_algo *alg)
net/key/af_key.c +19 -0
@@ -3059,6 +3059,24 @@ static u32 get_acqseq(void)return res; } +static bool pfkey_is_alive (const struct km_event *c) +{ +struct netns_pfkey *net_pfkey =net_generic (c->net, pfkey_net_id); +struct sock *sk; +bool is_alive = false; + +rcu_read_lock (); +sk_for_each_rcu (sk, &net_pfkey->table) { +if (pfkey_sk (sk)->registered) { + is_alive = true; +break ; + } + } +rcu_read_unlock (); + +return is_alive; +} +static int pfkey_send_acquire (struct xfrm_state *x,struct xfrm_tmpl *t,struct xfrm_policy *xp) {struct sk_buff *skb;
@@ -3784,6 +3802,7 @@ static struct xfrm_mgr pfkeyv2_mgr = .new_mapping = pfkey_send_new_mapping, .notify_policy = pfkey_send_policy_notify, .migrate = pfkey_send_migrate, + .is_alive = pfkey_is_alive, };static int __net_init pfkey_net_init (struct net *net)
net/xfrm/xfrm_state.c +31 -0
@@ -161,6 +161,7 @@ static DEFINE_SPINLOCK(xfrm_state_gc_lock);int __xfrm_state_delete (struct xfrm_state *x);int km_query (struct xfrm_state *x,struct xfrm_tmpl *t,struct xfrm_policy *pol); +bool km_is_alive (const struct km_event *c);void km_state_expired (struct xfrm_state *x,int hard,u32 portid);static DEFINE_SPINLOCK (xfrm_type_lock);
@@ -788,6 +789,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr,struct xfrm_state *best =NULL ;u32 mark = pol->mark.v & pol->mark.m;unsigned short encap_family = tmpl->encap_family; +struct km_event c; to_put =NULL ;
@@ -832,6 +834,17 @@ found: error = -EEXIST ; goto out; } + + c.net = net; +/* If the KMs have no listeners (yet...), avoid allocating an SA +* for each and every packet - garbage collection might not +* handle the flood. +*/ +if (!km_is_alive (&c)) { + error = -ESRCH ; + goto out; + } + x =xfrm_state_alloc (net);if (x ==NULL ) { error = -ENOMEM ;
@@ -1793,6 +1806,24 @@ int km_report(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address }EXPORT_SYMBOL (km_report); +bool km_is_alive (const struct km_event *c) +{ +struct xfrm_mgr *km; +bool is_alive = false; + +rcu_read_lock (); +list_for_each_entry_rcu (km, &xfrm_km_list, list) { +if (km->is_alive && km->is_alive (c)) { + is_alive = true; +break ; + } + } +rcu_read_unlock (); + +return is_alive; +} +EXPORT_SYMBOL (km_is_alive); +int xfrm_user_policy (struct sock *sk,int optname,u8 __user *optval,int optlen) {int err;
net/xfrm/xfrm_user.c +6 -0
@@ -2982,6 +2982,11 @@ static int xfrm_send_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,return nlmsg_multicast (net->xfrm.nlsk, skb,0 ,XFRMNLGRP_MAPPING ,GFP_ATOMIC ); } +static bool xfrm_is_alive (const struct km_event *c) +{ +return (bool )xfrm_acquire_is_on (c->net); +} +static struct xfrm_mgr netlink_mgr = { .id ="netlink" , .notify = xfrm_send_state_notify,
@@ -2991,6 +2996,7 @@ static struct xfrm_mgr netlink_mgr = { .report = xfrm_send_report, .migrate = xfrm_send_migrate, .new_mapping = xfrm_send_mapping, + .is_alive = xfrm_is_alive, };static int __net_init xfrm_user_net_init (struct net *net)
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 10/13 ipsec: add support of limited SA dump
In reply to Steffen KlassertFrom: Nicolas Dichtel <[email protected]>
The goal of this patch is to allow userland to dump only a part of SA by specifying a filter during the dump.
The kernel is in charge to filter SA, this avoids to generate useless netlink traffic (it save also some cpu cycles). This is particularly useful when there is a big number of SA set on the system.
Note that I removed the union in struct xfrm_state_walk to fix a problem on arm. struct netlink_callback->args is defined as a array of 6 long and the first long is used in xfrm code to flag the cb as initialized. Hence, we must have:sizeof(struct xfrm_state_walk) <= sizeof(long) * 5.
With the union, it was false on arm (sizeof(struct xfrm_state_walk) was sizeof(long) * 7), due to the padding.
In fact, whatever the arch is, this union seems useless, there will be always padding after it. Removing it will not increase the size of this struct (and reduce it on arm).
--- include/net/xfrm.h | 10 +++++----- include/uapi/linux/pfkeyv2.h | 15 ++++++++++++++- include/uapi/linux/xfrm.h | 10 ++++++++++ net/key/af_key.c | 19 ++++++++++++++++++- net/xfrm/xfrm_state.c | 25 ++++++++++++++++++++++++- net/xfrm/xfrm_user.c | 28 +++++++++++++++++++++++++++- 6 files changed, 98 insertions(+), 9 deletions(-)
include/net/xfrm.h +5 -5
@@ -118,11 +118,10 @@struct xfrm_state_walk {struct list_head all;u8 state; -union { -u8 dying; -u8 proto; - }; +u8 dying; +u8 proto;u32 seq; +struct xfrm_filter *filter; };/* Full description of state of transformer. */
@@ -1406,7 +1405,8 @@ static inline void xfrm_sysctl_fini(struct net *net) }#endif -void xfrm_state_walk_init (struct xfrm_state_walk *walk,u8 proto); +void xfrm_state_walk_init (struct xfrm_state_walk *walk,u8 proto, +struct xfrm_filter *filter);int xfrm_state_walk (struct net *net,struct xfrm_state_walk *walk,int (*func)(struct xfrm_state *,int ,void *),void *);void xfrm_state_walk_done (struct xfrm_state_walk *walk,struct net *net);
include/uapi/linux/pfkeyv2.h +14 -1
@@ -235,6 +235,18 @@ struct sadb_x_kmaddress { } __attribute__((packed));/* sizeof(struct sadb_x_kmaddress) == 8 */ +/* To specify the SA dump filter */ +struct sadb_x_filter { +__u16 sadb_x_filter_len; +__u16 sadb_x_filter_exttype; +__u32 sadb_x_filter_saddr[4 ]; +__u32 sadb_x_filter_daddr[4 ]; +__u16 sadb_x_filter_family; +__u8 sadb_x_filter_splen; +__u8 sadb_x_filter_dplen; +} __attribute__((packed)); +/* sizeof(struct sadb_x_filter) == 40 */ +/* Message types */ #define SADB_RESERVED 0#define SADB_GETSPI 1
@@ -358,7 +370,8 @@ struct sadb_x_kmaddress {#define SADB_X_EXT_SEC_CTX 24/* Used with MIGRATE to pass @ to IKE for negotiation */ #define SADB_X_EXT_KMADDRESS 25 -#define SADB_EXT_MAX 25 +#define SADB_X_EXT_FILTER 26 +#define SADB_EXT_MAX 26/* Identity Extension values */ #define SADB_IDENTTYPE_RESERVED 0
include/uapi/linux/xfrm.h +10 -0
@@ -298,6 +298,8 @@ enum xfrm_attr_type_t {XFRMA_TFCPAD ,/* __u32 */ XFRMA_REPLAY_ESN_VAL ,/* struct xfrm_replay_esn */ XFRMA_SA_EXTRA_FLAGS ,/* __u32 */ +XFRMA_PROTO ,/* __u8 */ +XFRMA_FILTER ,/* struct xfrm_filter */ __XFRMA_MAX#define XFRMA_MAX (__XFRMA_MAX - 1)
@@ -474,6 +476,14 @@ struct xfrm_user_mapping {__be16 new_sport; }; +struct xfrm_filter { +xfrm_address_t saddr; +xfrm_address_t daddr; +__u16 family; +__u8 splen; +__u8 dplen; +}; +#ifndef __KERNEL__/* backwards compatibility for userspace */ #define XFRMGRP_ACQUIRE 1
net/key/af_key.c +18 -1
@@ -1798,6 +1798,7 @@ static void pfkey_dump_sa_done(struct pfkey_sock *pfk)static int pfkey_dump (struct sock *sk,struct sk_buff *skb,const struct sadb_msg *hdr,void *const *ext_hdrs) {u8 proto; +struct xfrm_filter *filter =NULL ;struct pfkey_sock *pfk =pfkey_sk (sk);if (pfk->dump.dump !=NULL )
@@ -1807,11 +1808,27 @@ static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_msif (proto ==0 )return -EINVAL ; +if (ext_hdrs[SADB_X_EXT_FILTER -1 ]) { +struct sadb_x_filter *xfilter = ext_hdrs[SADB_X_EXT_FILTER -1 ]; + + filter =kmalloc (sizeof (*filter),GFP_KERNEL ); +if (filter ==NULL ) +return -ENOMEM ; + +memcpy (&filter->saddr, &xfilter->sadb_x_filter_saddr, +sizeof (xfrm_address_t)); +memcpy (&filter->daddr, &xfilter->sadb_x_filter_daddr, +sizeof (xfrm_address_t)); + filter->family = xfilter->sadb_x_filter_family; + filter->splen = xfilter->sadb_x_filter_splen; + filter->dplen = xfilter->sadb_x_filter_dplen; + } + pfk->dump.msg_version = hdr->sadb_msg_version; pfk->dump.msg_portid = hdr->sadb_msg_pid; pfk->dump.dump = pfkey_dump_sa; pfk->dump.done = pfkey_dump_sa_done; -xfrm_state_walk_init (&pfk->dump.u.state, proto); +xfrm_state_walk_init (&pfk->dump.u.state, proto, filter);return pfkey_do_dump (pfk); }
net/xfrm/xfrm_state.c +24 -1
@@ -1603,6 +1603,23 @@ unlock: }EXPORT_SYMBOL (xfrm_alloc_spi); +static bool __xfrm_state_filter_match (struct xfrm_state *x, +struct xfrm_filter *filter) +{ +if (filter) { +if ((filter->family ==AF_INET || + filter->family ==AF_INET6 ) && + x->props.family != filter->family) +return false; + +return addr_match (&x->props.saddr, &filter->saddr, + filter->splen) && +addr_match (&x->id.daddr, &filter->daddr, + filter->dplen); + } +return true; +} +int xfrm_state_walk (struct net *net,struct xfrm_state_walk *walk,int (*func)(struct xfrm_state *,int ,void *),void *data)
@@ -1625,6 +1642,8 @@ int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk, state = container_of(x, struct xfrm_state, km);if (!xfrm_id_proto_match (state->id.proto, walk->proto))continue ; +if (!__xfrm_state_filter_match (state, walk->filter)) +continue ; err =func (state, walk->seq, data);if (err) {list_move_tail (&walk->all, &x->all);
@@ -1643,17 +1662,21 @@ out: }EXPORT_SYMBOL (xfrm_state_walk); -void xfrm_state_walk_init (struct xfrm_state_walk *walk,u8 proto) +void xfrm_state_walk_init (struct xfrm_state_walk *walk,u8 proto, +struct xfrm_filter *filter) {INIT_LIST_HEAD (&walk->all); walk->proto = proto; walk->state =XFRM_STATE_DEAD ; walk->seq =0 ; + walk->filter = filter; }EXPORT_SYMBOL (xfrm_state_walk_init);void xfrm_state_walk_done (struct xfrm_state_walk *walk,struct net *net) { +kfree (walk->filter); +if (list_empty (&walk->all))return ;
net/xfrm/xfrm_user.c +27 -1
@@ -887,6 +887,7 @@ static int xfrm_dump_sa_done(struct netlink_callback *cb)return 0 ; } +static const struct nla_policy xfrma_policy[XFRMA_MAX +1 ];static int xfrm_dump_sa (struct sk_buff *skb,struct netlink_callback *cb) {struct net *net =sock_net (skb->sk);
@@ -902,8 +903,31 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb) info.nlmsg_flags =NLM_F_MULTI ;if (!cb->args[0 ]) { +struct nlattr *attrs[XFRMA_MAX +1 ]; +struct xfrm_filter *filter =NULL ; +u8 proto =0 ; +int err; + cb->args[0 ] =1 ; -xfrm_state_walk_init (walk,0 ); + + err =nlmsg_parse (cb->nlh,0 , attrs,XFRMA_MAX , + xfrma_policy); +if (err <0 ) +return err; + +if (attrs[XFRMA_FILTER ]) { + filter =kmalloc (sizeof (*filter),GFP_KERNEL ); +if (filter ==NULL ) +return -ENOMEM ; + +memcpy (filter,nla_data (attrs[XFRMA_FILTER ]), +sizeof (*filter)); + } + +if (attrs[XFRMA_PROTO ]) + proto =nla_get_u8 (attrs[XFRMA_PROTO ]); + +xfrm_state_walk_init (walk, proto, filter); } (void )xfrm_state_walk (net, walk, dump_one_state, &info);
@@ -2309,6 +2333,8 @@ static const struct nla_policy xfrma_policy[XFRMA_MAX+1] = { [XFRMA_TFCPAD] = { .type = NLA_U32 }, [XFRMA_REPLAY_ESN_VAL] = { .len = sizeof(struct xfrm_replay_state_esn) }, [XFRMA_SA_EXTRA_FLAGS] = { .type = NLA_U32 }, + [XFRMA_PROTO] = { .type = NLA_U8 }, + [XFRMA_FILTER] = { .len = sizeof(struct xfrm_filter) }, }; static const struct xfrm_link {
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 11/13 xfrm: Remove caching of xfrm_policy_sk_bundles
In reply to Steffen KlassertWe currently cache socket policy bundles at xfrm_policy_sk_bundles. These cached bundles are never used. Instead we create and cache a new one whenever xfrm_lookup() is called on a socket policy.
Most protocols cache the used routes to the socket, so let's remove the unused caching of socket policy bundles in xfrm.
--- include/net/netns/xfrm.h | 1 - net/xfrm/xfrm_policy.c | 28 ---------------------------- 2 files changed, 29 deletions(-)
include/net/netns/xfrm.h +0 -1
@@ -59,7 +59,6 @@ struct netns_xfrm {struct dst_ops xfrm6_dst_ops;#endif spinlock_t xfrm_state_lock; -spinlock_t xfrm_policy_sk_bundle_lock;rwlock_t xfrm_policy_lock;struct mutex xfrm_cfg_mutex;
net/xfrm/xfrm_policy.c +0 -28
@@ -39,8 +39,6 @@#define XFRM_QUEUE_TMO_MAX ((unsigned)(60*HZ))#define XFRM_MAX_QUEUE_LEN 100 -static struct dst_entry *xfrm_policy_sk_bundles; -static DEFINE_SPINLOCK (xfrm_policy_afinfo_lock);static struct xfrm_policy_afinfo __rcu *xfrm_policy_afinfo[NPROTO ]__read_mostly ;
@@ -2109,13 +2107,6 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, goto no_transform; } -dst_hold (&xdst->u.dst); - -spin_lock_bh (&net->xfrm.xfrm_policy_sk_bundle_lock); - xdst->u.dst.next = xfrm_policy_sk_bundles; - xfrm_policy_sk_bundles = &xdst->u.dst; -spin_unlock_bh (&net->xfrm.xfrm_policy_sk_bundle_lock); - route = xdst->route; } }
@@ -2549,33 +2540,15 @@ static struct dst_entry *xfrm_negative_advice(struct dst_entry *dst)return dst; } -static void __xfrm_garbage_collect (struct net *net) -{ -struct dst_entry *head, *next; - -spin_lock_bh (&net->xfrm.xfrm_policy_sk_bundle_lock); - head = xfrm_policy_sk_bundles; - xfrm_policy_sk_bundles =NULL ; -spin_unlock_bh (&net->xfrm.xfrm_policy_sk_bundle_lock); - -while (head) { - next = head->next; -dst_free (head); - head = next; - } -} -void xfrm_garbage_collect (struct net *net) {flow_cache_flush (net); -__xfrm_garbage_collect (net); }EXPORT_SYMBOL (xfrm_garbage_collect);static void xfrm_garbage_collect_deferred (struct net *net) {flow_cache_flush_deferred (net); -__xfrm_garbage_collect (net); }static void xfrm_init_pmtu (struct dst_entry *dst)
@@ -2944,7 +2917,6 @@ static int __net_init xfrm_net_init(struct net *net)/* Initialize the per-net locks here */ spin_lock_init (&net->xfrm.xfrm_state_lock);rwlock_init (&net->xfrm.xfrm_policy_lock); -spin_lock_init (&net->xfrm.xfrm_policy_sk_bundle_lock);mutex_init (&net->xfrm.xfrm_cfg_mutex);flow_cache_init (net);
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 12/13 pfkey: fix SADB_X_EXT_FILTER length check
In reply to Steffen KlassertFrom: Nicolas Dichtel <[email protected]>
This patch fixes commit d3623099d350 ("ipsec: add support of limited SA dump").
sadb_ext_min_len array should be updated with the new type (SADB_X_EXT_FILTER).
--- net/key/af_key.c | 1 + 1 file changed, 1 insertion(+)
net/key/af_key.c +1 -0
@@ -365,6 +365,7 @@ static const u8 sadb_ext_min_len[] = { [SADB_X_EXT_NAT_T_OA] = (u8) sizeof(struct sadb_address), [SADB_X_EXT_SEC_CTX] = (u8) sizeof(struct sadb_x_sec_ctx), [SADB_X_EXT_KMADDRESS] = (u8) sizeof(struct sadb_x_kmaddress), + [SADB_X_EXT_FILTER] = (u8) sizeof(struct sadb_x_filter), };/* Verify sadb_address_{len,prefixlen} against sa_family. */
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 13/13 xfrm: Cleanup error handling of xfrm_state_clone
In reply to Steffen KlassertThe error pointer passed to xfrm_state_clone() is unchecked, so remove it and indicate an error by returning a null pointer.
--- net/xfrm/xfrm_state.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
net/xfrm/xfrm_state.c +5 -11
@@ -1148,10 +1148,9 @@ out:EXPORT_SYMBOL (xfrm_state_add);#ifdef CONFIG_XFRM_MIGRATE -static struct xfrm_state *xfrm_state_clone (struct xfrm_state *orig,int *errp) +static struct xfrm_state *xfrm_state_clone (struct xfrm_state *orig) {struct net *net =xs_net (orig); -int err = -ENOMEM ;struct xfrm_state *x =xfrm_state_alloc (net);if (!x) goto out;
@@ -1200,15 +1199,13 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, int *errp) }if (orig->replay_esn) { - err =xfrm_replay_clone (x, orig); -if (err) +if (xfrm_replay_clone (x, orig)) goto error; }memcpy (&x->mark, &orig->mark,sizeof (x->mark)); - err =xfrm_init_state (x); -if (err) +if (xfrm_init_state (x) <0 ) goto error; x->props.flags = orig->props.flags;
@@ -1223,8 +1220,6 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, int *errp) error:xfrm_state_put (x); out: -if (errp) - *errp = err;return NULL ; }
@@ -1276,9 +1271,8 @@ struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x, struct xfrm_migrate *m) {struct xfrm_state *xc; -int err; - xc =xfrm_state_clone (x, &err); + xc =xfrm_state_clone (x);if (!xc)return NULL ;
@@ -1291,7 +1285,7 @@ struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x,state is to be updated as it is a part of triplet */ xfrm_state_insert (xc); }else { -if ((err =xfrm_state_add (xc)) <0 ) +if (xfrm_state_add (xc) <0 ) goto error; }
Signature · 1 line
1.7.9.5
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Mon, 24 Feb 2014 10:59:48 +0100
Quoted 20 lines
1) Introduce
skb_to_sgvec_nomarkfunction to add further data to the sg list without callingsg_unmark_endfirst. Needed to add extended sequence number informations. From Fan Du.2) Add IPsec extended sequence numbers support to the Authentication Header protocol for ipv4 and ipv6. From Fan Du.
3) Make the IPsec flowcache namespace aware, from Fan Du.
4) Avoid creating temporary SA for every packet when no key manager is registered. From Horia Geanta.
5) Support filtering of SA dumps to show only the SAs that match a given filter. From Nicolas Dichtel.
6) Remove caching of
xfrm_policy_sk_bundles. The cached socket policy bundles are never used, instead we create a new cache entry wheneverxfrm_lookup()is called on a socket policy. Most protocols cache the used routes to the socket, so this caching is not needed.
Quoted 6 lines
7) Fix a forgotten
SADB_X_EXT_FILTERlength check in pfkey, from Nicolas Dichtel.8) Cleanup error handling of
xfrm_state_clone.Please pull or let me know if there are problems.
Pulled, thanks a lot Steffen.