pull request (net-next): ipsec-next 2013-11-01
Subsystems (3)
Steffen Klassert
maintainerThis pull request has a trivial merge conflict between git commit e7d8f6c ("xfrm: Add refcount handling to queued policies") and git commit 4d53eff ("xfrm: Don't queue retransmitted packets if the original is still on the host"). It can be solved as it is currently done in linux-next.
1) Use vmalloc_node for ipcomp percpu scratches to get proper NUMA affinity, from Eric Dumazet
2) Avoid to retransmit packets if the original packet is still in the xfrm hold queue.
3) Remove unused padlen field from struct esp_data. From Mathias Krause.
4) Remove struct esp_data because now it consists of a single pointer. From Mathias Krause.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 5bf47256f5433a9a5782754664e5ea04acb0537d:
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (2013-10-19 19:52:42 -0400)
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 1c5ad13f7c2b2afe30e43858d04fff979dc9d243:
net: esp{4,6}: get rid of struct esp_data (2013-10-29 06:39:42 +0100)
----------------------------------------------------------------
Eric Dumazet (1):
xfrm: use vmalloc_node() for percpu scratches
Mathias Krause (2):
net: esp{4,6}: remove padlen from struct esp_data
net: esp{4,6}: get rid of struct esp_data
Steffen Klassert (1):
xfrm: Don't queue retransmitted packets if the original is still on the host
include/net/esp.h | 10 ---------- net/ipv4/esp4.c | 49 +++++++++++++++--------------------------------- net/ipv6/esp6.c | 48 +++++++++++++++-------------------------------- net/xfrm/xfrm_ipcomp.c | 6 ++++-- net/xfrm/xfrm_policy.c | 7 +++++++ 5 files changed, 41 insertions(+), 79 deletions(-)
Steffen Klassert
maintainerPATCH 1/4 xfrm: use vmalloc_node() for percpu scratches
From: Eric Dumazet <[email protected]>
scratches are per cpu, we can use vmalloc_node() for proper NUMA affinity.
--- net/xfrm/xfrm_ipcomp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/xfrm/xfrm_ipcomp.c +4 -2
@@ -220,8 +220,8 @@ static void ipcomp_free_scratches(void)static void *__percpu *ipcomp_alloc_scratches (void ) { -int i;void *__percpu *scratches; +int i;if (ipcomp_scratch_users++)return ipcomp_scratches;
@@ -233,7 +233,9 @@ static void * __percpu *ipcomp_alloc_scratches(void) ipcomp_scratches = scratches;for_each_possible_cpu (i) { -void *scratch =vmalloc (IPCOMP_SCRATCH_SIZE ); +void *scratch; + + scratch =vmalloc_node (IPCOMP_SCRATCH_SIZE ,cpu_to_node (i));if (!scratch)return NULL ; *per_cpu_ptr (scratches, i) = scratch;
Signature · 1 line
1.7.9.5
Re: [PATCH 1/4] xfrm: use vmalloc_node() for percpu scratches
Hello.
Quoted 17 lines · Steffen Klassert
From: Eric Dumazet <[email protected]>
scratches are per cpu, we can use
vmalloc_node()for proper NUMA affinity.Signed-off-by Eric Dumazet <[email protected]>Acked-by Herbert Xu <[email protected]>Signed-off-by Steffen Klassert <[email protected]>--- net/xfrm/xfrm_ipcomp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)net/xfrm/xfrm_ipcomp.c +0
-0
net/xfrm/xfrm_ipcomp.c static void ipcomp_free_scratches(void) · line 224
Quoted 6 lines
net/xfrm/xfrm_ipcomp.c +1
-1@@ -220,8 +220,8 @@ static void ipcomp_free_scratches(void)static void *__percpu *ipcomp_alloc_scratches (void ) { -int i;void *__percpu *scratches; +int i;
This collateral change is not described in the changelog.
WBR, Sergei
David Miller
maintainerRe: [PATCH 1/4] xfrm: use vmalloc_node() for percpu scratches
From: Sergei Shtylyov <[email protected]>
Date: Fri, 01 Nov 2013 17:02:51 +0400
Quoted 9 lines
net/xfrm/xfrm_ipcomp.c static void ipcomp_free_scratches(void) · line 224
Quoted 7 lines
net/xfrm/xfrm_ipcomp.c +1
-1@@ -220,8 +220,8 @@ static void ipcomp_free_scratches(void)static void *__percpu *ipcomp_alloc_scratches (void ) { -int i;void *__percpu *scratches; +int i;This collateral change is not described in the changelog.
Yes, but I'm not going to block this series just for this.
Steffen Klassert
maintainerPATCH 2/4 xfrm: Don't queue retransmitted packets if the original is still on the host
In reply to Steffen KlassertIt does not make sense to queue retransmitted packets if the original packet is still in some queue of this host. So add a check to xdst_queue_output() and drop the packet if the original packet is not yet sent.
--- net/xfrm/xfrm_policy.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/xfrm/xfrm_policy.c +7 -0
@@ -1832,6 +1832,13 @@ static int xdst_queue_output(struct sk_buff *skb)struct dst_entry *dst =skb_dst (skb);struct xfrm_dst *xdst = (struct xfrm_dst *) dst;struct xfrm_policy_queue *pq = &xdst->pols[0 ]->polq; +const struct sk_buff *fclone = skb +1 ; + +if (unlikely (skb->fclone ==SKB_FCLONE_ORIG && + fclone->fclone ==SKB_FCLONE_CLONE )) { +kfree_skb (skb); +return 0 ; + }if (pq->hold_queue.qlen >XFRM_MAX_QUEUE_LEN ) {kfree_skb (skb);
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 3/4 net: esp{4,6}: remove padlen from struct esp_data
In reply to Steffen KlassertFrom: Mathias Krause <[email protected]>
The padlen member of struct esp_data is always zero. Get rid of it.
--- include/net/esp.h | 3 --- net/ipv4/esp4.c | 9 +-------- net/ipv6/esp6.c | 9 +-------- 3 files changed, 2 insertions(+), 19 deletions(-)
include/net/esp.h +0 -3
@@ -6,9 +6,6 @@struct crypto_aead ;struct esp_data { -/* 0..255 */ -int padlen; -/* Confidentiality & Integrity */ struct crypto_aead *aead; };
net/ipv4/esp4.c +1 -8
@@ -154,8 +154,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) } blksize =ALIGN (crypto_aead_blocksize (aead),4 ); clen =ALIGN (skb->len +2 + tfclen, blksize); -if (esp->padlen) - clen =ALIGN (clen, esp->padlen); plen = clen - skb->len - tfclen; err =skb_cow_data (skb, tfclen + plen + alen, &trailer);
@@ -461,7 +459,6 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu) {struct esp_data *esp = x->data;u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 ); -u32 align =max_t (u32, blksize, esp->padlen);unsigned int net_adj;switch (x->props.mode) {
@@ -477,7 +474,7 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu) }return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - - net_adj) & ~(align -1 )) + net_adj -2 ; + net_adj) & ~(blksize -1 )) + net_adj -2 ; }static void esp4_err (struct sk_buff *skb,u32 info)
@@ -659,8 +656,6 @@ static int esp_init_state(struct xfrm_state *x) aead = esp->aead; - esp->padlen =0 ; - x->props.header_len =sizeof (struct ip_esp_hdr ) +crypto_aead_ivsize (aead);if (x->props.mode ==XFRM_MODE_TUNNEL )
@@ -683,8 +678,6 @@ static int esp_init_state(struct xfrm_state *x) } align =ALIGN (crypto_aead_blocksize (aead),4 ); -if (esp->padlen) - align =max_t (u32, align, esp->padlen); x->props.trailer_len = align +1 +crypto_aead_authsize (esp->aead); error:
net/ipv6/esp6.c +1 -8
@@ -181,8 +181,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) } blksize =ALIGN (crypto_aead_blocksize (aead),4 ); clen =ALIGN (skb->len +2 + tfclen, blksize); -if (esp->padlen) - clen =ALIGN (clen, esp->padlen); plen = clen - skb->len - tfclen; err =skb_cow_data (skb, tfclen + plen + alen, &trailer);
@@ -416,7 +414,6 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu) {struct esp_data *esp = x->data;u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 ); -u32 align =max_t (u32, blksize, esp->padlen);unsigned int net_adj;if (x->props.mode !=XFRM_MODE_TUNNEL )
@@ -425,7 +422,7 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu) net_adj =0 ;return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - - net_adj) & ~(align -1 )) + net_adj -2 ; + net_adj) & ~(blksize -1 )) + net_adj -2 ; } static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
@@ -606,8 +603,6 @@ static int esp6_init_state(struct xfrm_state *x) aead = esp->aead; - esp->padlen =0 ; - x->props.header_len =sizeof (struct ip_esp_hdr ) +crypto_aead_ivsize (aead);switch (x->props.mode) {
@@ -626,8 +621,6 @@ static int esp6_init_state(struct xfrm_state *x) } align =ALIGN (crypto_aead_blocksize (aead),4 ); -if (esp->padlen) - align =max_t (u32, align, esp->padlen); x->props.trailer_len = align +1 +crypto_aead_authsize (esp->aead); error:
Signature · 1 line
1.7.9.5
Steffen Klassert
maintainerPATCH 4/4 net: esp{4,6}: get rid of struct esp_data
In reply to Steffen KlassertFrom: Mathias Krause <[email protected]>
struct esp_data consists of a single pointer, vanishing the need for it to be a structure. Fold the pointer into 'data' direcly, removing one level of pointer indirection.
--- include/net/esp.h | 7 ------- net/ipv4/esp4.c | 40 ++++++++++++++-------------------------- net/ipv6/esp6.c | 39 ++++++++++++++------------------------- 3 files changed, 28 insertions(+), 58 deletions(-)
include/net/esp.h +0 -7
@@ -3,13 +3,6 @@#include <linux/skbuff.h> -struct crypto_aead ; - -struct esp_data { -/* Confidentiality & Integrity */ -struct crypto_aead *aead; -}; -void *pskb_put (struct sk_buff *skb,struct sk_buff *tail,int len);struct ip_esp_hdr ;
net/ipv4/esp4.c +14 -26
@@ -121,7 +121,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)struct aead_givcrypt_request *req;struct scatterlist *sg;struct scatterlist *asg; -struct esp_data *esp;struct sk_buff *trailer;void *tmp;u8 *iv;
@@ -139,8 +138,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)/* skb is pure payload to encrypt */ - esp = x->data; - aead = esp->aead; + aead = x->data; alen =crypto_aead_authsize (aead); tfclen =0 ;
@@ -278,8 +276,7 @@ static int esp_input_done2(struct sk_buff *skb, int err) {const struct iphdr *iph;struct xfrm_state *x =xfrm_input_state (skb); -struct esp_data *esp = x->data; -struct crypto_aead *aead = esp->aead; +struct crypto_aead *aead = x->data;int alen =crypto_aead_authsize (aead);int hlen =sizeof (struct ip_esp_hdr ) +crypto_aead_ivsize (aead);int elen = skb->len - hlen;
@@ -374,8 +371,7 @@ static void esp_input_done(struct crypto_async_request *base, int err)static int esp_input (struct xfrm_state *x,struct sk_buff *skb) {struct ip_esp_hdr *esph; -struct esp_data *esp = x->data; -struct crypto_aead *aead = esp->aead; +struct crypto_aead *aead = x->data;struct aead_request *req;struct sk_buff *trailer;int elen = skb->len -sizeof (*esph) -crypto_aead_ivsize (aead);
@@ -457,8 +453,8 @@ out:static u32 esp4_get_mtu (struct xfrm_state *x,int mtu) { -struct esp_data *esp = x->data; -u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 ); +struct crypto_aead *aead = x->data; +u32 blksize =ALIGN (crypto_aead_blocksize (aead),4 );unsigned int net_adj;switch (x->props.mode) {
@@ -473,7 +469,7 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)BUG (); } -return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - +return ((mtu - x->props.header_len -crypto_aead_authsize (aead) - net_adj) & ~(blksize -1 )) + net_adj -2 ; }
@@ -508,18 +504,16 @@ static void esp4_err(struct sk_buff *skb, u32 info)static void esp_destroy (struct xfrm_state *x) { -struct esp_data *esp = x->data; +struct crypto_aead *aead = x->data; -if (!esp) +if (!aead)return ; -crypto_free_aead (esp->aead); -kfree (esp); +crypto_free_aead (aead); }static int esp_init_aead (struct xfrm_state *x) { -struct esp_data *esp = x->data;struct crypto_aead *aead;int err;
@@ -528,7 +522,7 @@ static int esp_init_aead(struct xfrm_state *x)if (IS_ERR (aead)) goto error; - esp->aead = aead; + x->data = aead; err =crypto_aead_setkey (aead, x->aead->alg_key, (x->aead->alg_key_len +7 ) /8 );
@@ -545,7 +539,6 @@ error:static int esp_init_authenc (struct xfrm_state *x) { -struct esp_data *esp = x->data;struct crypto_aead *aead;struct crypto_authenc_key_param *param;struct rtattr *rta;
@@ -580,7 +573,7 @@ static int esp_init_authenc(struct xfrm_state *x)if (IS_ERR (aead)) goto error; - esp->aead = aead; + x->data = aead; keylen = (x->aalg ? (x->aalg->alg_key_len +7 ) /8 :0 ) + (x->ealg->alg_key_len +7 ) /8 +RTA_SPACE (sizeof (*param));
@@ -635,16 +628,11 @@ error:static int esp_init_state (struct xfrm_state *x) { -struct esp_data *esp;struct crypto_aead *aead;u32 align;int err; - esp =kzalloc (sizeof (*esp),GFP_KERNEL ); -if (esp ==NULL ) -return -ENOMEM ; - - x->data = esp; + x->data =NULL ;if (x->aead) err =esp_init_aead (x);
@@ -654,7 +642,7 @@ static int esp_init_state(struct xfrm_state *x)if (err) goto error; - aead = esp->aead; + aead = x->data; x->props.header_len =sizeof (struct ip_esp_hdr ) +crypto_aead_ivsize (aead);
@@ -678,7 +666,7 @@ static int esp_init_state(struct xfrm_state *x) } align =ALIGN (crypto_aead_blocksize (aead),4 ); - x->props.trailer_len = align +1 +crypto_aead_authsize (esp->aead); + x->props.trailer_len = align +1 +crypto_aead_authsize (aead); error:return err;
net/ipv6/esp6.c +14 -25
@@ -164,10 +164,9 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)u8 *iv;u8 *tail;__be32 *seqhi; -struct esp_data *esp = x->data;/* skb is pure payload to encrypt */ - aead = esp->aead; + aead = x->data; alen =crypto_aead_authsize (aead); tfclen =0 ;
@@ -269,8 +268,7 @@ error:static int esp_input_done2 (struct sk_buff *skb,int err) {struct xfrm_state *x =xfrm_input_state (skb); -struct esp_data *esp = x->data; -struct crypto_aead *aead = esp->aead; +struct crypto_aead *aead = x->data;int alen =crypto_aead_authsize (aead);int hlen =sizeof (struct ip_esp_hdr ) +crypto_aead_ivsize (aead);int elen = skb->len - hlen;
@@ -323,8 +321,7 @@ static void esp_input_done(struct crypto_async_request *base, int err)static int esp6_input (struct xfrm_state *x,struct sk_buff *skb) {struct ip_esp_hdr *esph; -struct esp_data *esp = x->data; -struct crypto_aead *aead = esp->aead; +struct crypto_aead *aead = x->data;struct aead_request *req;struct sk_buff *trailer;int elen = skb->len -sizeof (*esph) -crypto_aead_ivsize (aead);
@@ -412,8 +409,8 @@ out:static u32 esp6_get_mtu (struct xfrm_state *x,int mtu) { -struct esp_data *esp = x->data; -u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 ); +struct crypto_aead *aead = x->data; +u32 blksize =ALIGN (crypto_aead_blocksize (aead),4 );unsigned int net_adj;if (x->props.mode !=XFRM_MODE_TUNNEL )
@@ -421,7 +418,7 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)else net_adj =0 ; -return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - +return ((mtu - x->props.header_len -crypto_aead_authsize (aead) - net_adj) & ~(blksize -1 )) + net_adj -2 ; }
@@ -452,18 +449,16 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,static void esp6_destroy (struct xfrm_state *x) { -struct esp_data *esp = x->data; +struct crypto_aead *aead = x->data; -if (!esp) +if (!aead)return ; -crypto_free_aead (esp->aead); -kfree (esp); +crypto_free_aead (aead); }static int esp_init_aead (struct xfrm_state *x) { -struct esp_data *esp = x->data;struct crypto_aead *aead;int err;
@@ -472,7 +467,7 @@ static int esp_init_aead(struct xfrm_state *x)if (IS_ERR (aead)) goto error; - esp->aead = aead; + x->data = aead; err =crypto_aead_setkey (aead, x->aead->alg_key, (x->aead->alg_key_len +7 ) /8 );
@@ -489,7 +484,6 @@ error:static int esp_init_authenc (struct xfrm_state *x) { -struct esp_data *esp = x->data;struct crypto_aead *aead;struct crypto_authenc_key_param *param;struct rtattr *rta;
@@ -524,7 +518,7 @@ static int esp_init_authenc(struct xfrm_state *x)if (IS_ERR (aead)) goto error; - esp->aead = aead; + x->data = aead; keylen = (x->aalg ? (x->aalg->alg_key_len +7 ) /8 :0 ) + (x->ealg->alg_key_len +7 ) /8 +RTA_SPACE (sizeof (*param));
@@ -579,7 +573,6 @@ error:static int esp6_init_state (struct xfrm_state *x) { -struct esp_data *esp;struct crypto_aead *aead;u32 align;int err;
@@ -587,11 +580,7 @@ static int esp6_init_state(struct xfrm_state *x)if (x->encap)return -EINVAL ; - esp =kzalloc (sizeof (*esp),GFP_KERNEL ); -if (esp ==NULL ) -return -ENOMEM ; - - x->data = esp; + x->data =NULL ;if (x->aead) err =esp_init_aead (x);
@@ -601,7 +590,7 @@ static int esp6_init_state(struct xfrm_state *x)if (err) goto error; - aead = esp->aead; + aead = x->data; x->props.header_len =sizeof (struct ip_esp_hdr ) +crypto_aead_ivsize (aead);
@@ -621,7 +610,7 @@ static int esp6_init_state(struct xfrm_state *x) } align =ALIGN (crypto_aead_blocksize (aead),4 ); - x->props.trailer_len = align +1 +crypto_aead_authsize (esp->aead); + x->props.trailer_len = align +1 +crypto_aead_authsize (aead); error:return err;
Signature · 1 line
1.7.9.5
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Fri, 1 Nov 2013 08:50:53 +0100
Quoted 12 lines
This pull request has a trivial merge conflict between git commit e7d8f6c ("xfrm: Add refcount handling to queued policies") and git commit 4d53eff ("xfrm: Don't queue retransmitted packets if the original is still on the host"). It can be solved as it is currently done in linux-next.
1) Use
vmalloc_nodefor ipcomp percpu scratches to get proper NUMA affinity, from Eric Dumazet2) Avoid to retransmit packets if the original packet is still in the xfrm hold queue.
Quoted 7 lines
3) Remove unused padlen field from struct
esp_data. From Mathias Krause.4) Remove struct
esp_databecause now it consists of a single pointer. From Mathias Krause.Please pull or let me know if there are problems.
Pulled, thanks a lot.