Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04cdf13e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next 



Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2017-02-01

1) Some typo fixes, from Alexander Alemayhu.

2) Don't acquire state lock in get_mtu functions.
   The only rece against a dead state does not matter.
   From Florian Westphal.

3) Remove xfrm4_state_fini, it is unused for more than
   10 years. From Florian Westphal.

4) Various rcu usage improvements. From Florian Westphal.

5) Properly handle crypto arrors in ah4/ah6.
   From Gilad Ben-Yossef.

6) Try to avoid skb linearization in esp4 and esp6.

7) The esp trailer is now set up in different places,
   add a helper for this.

8) With the upcomming usage of gro_cells in IPsec,
   a gro merged skb can have a secpath. Drop it
   before freeing or reusing the skb.

9) Add a xfrm dummy network device for napi. With
   this we can use gro_cells from within xfrm,
   it allows IPsec GRO without impact on the generic
   networking code.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 624374a5 1995876a

include/net/xfrm.h

+3 −1
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ struct xfrm_state { 
	/* Last used time */

	unsigned long		lastused;



	struct page_frag xfrag;



	/* Reference to data common to all the instances of this

	 * transformer. */

	const struct xfrm_type	*type;
@@ -343,7 +345,7 @@ struct xfrm_state_afinfo { 
int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);

int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);

struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned int family);

void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo);

struct xfrm_state_afinfo *xfrm_state_afinfo_get_rcu(unsigned int family);



struct xfrm_input_afinfo {

	unsigned int		family;

net/core/dev.c

+2 −0
Original line number Diff line number Diff line
@@ -4593,6 +4593,7 @@ static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb) 
	case GRO_MERGED_FREE:

		if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD) {

			skb_dst_drop(skb);

			secpath_reset(skb);

			kmem_cache_free(skbuff_head_cache, skb);

		} else {

			__kfree_skb(skb);
@@ -4633,6 +4634,7 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) 
	skb->encapsulation = 0;

	skb_shinfo(skb)->gso_type = 0;

	skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));

	secpath_reset(skb);



	napi->skb = skb;

}

net/ipv4/ah4.c

+3 −0
Original line number Diff line number Diff line
@@ -270,6 +270,9 @@ static void ah_input_done(struct crypto_async_request *base, int err) 
	int ihl = ip_hdrlen(skb);

	int ah_hlen = (ah->hdrlen + 2) << 2;



	if (err)

		goto out;



	work_iph = AH_SKB_CB(skb)->tmp;

	auth_data = ah_tmp_auth(work_iph, ihl);

	icv = ah_tmp_icv(ahp->ahash, auth_data, ahp->icv_trunc_len);

net/ipv4/esp4.c

+258 −74
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <net/protocol.h>

#include <net/udp.h>



#include <linux/highmem.h>



struct esp_skb_cb {

	struct xfrm_skb_cb xfrm;

	void *tmp;
@@ -92,11 +94,40 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead, 
			     __alignof__(struct scatterlist));

}



static void esp_ssg_unref(struct xfrm_state *x, void *tmp)

{

	struct esp_output_extra *extra = esp_tmp_extra(tmp);

	struct crypto_aead *aead = x->data;

	int extralen = 0;

	u8 *iv;

	struct aead_request *req;

	struct scatterlist *sg;



	if (x->props.flags & XFRM_STATE_ESN)

		extralen += sizeof(*extra);



	extra = esp_tmp_extra(tmp);

	iv = esp_tmp_iv(aead, tmp, extralen);

	req = esp_tmp_req(aead, iv);



	/* Unref skb_frag_pages in the src scatterlist if necessary.

	 * Skip the first sg which comes from skb->data.

	 */

	if (req->src != req->dst)

		for (sg = sg_next(req->src); sg; sg = sg_next(sg))

			put_page(sg_page(sg));

}



static void esp_output_done(struct crypto_async_request *base, int err)

{

	struct sk_buff *skb = base->data;

	void *tmp;

	struct dst_entry *dst = skb_dst(skb);

	struct xfrm_state *x = dst->xfrm;



	kfree(ESP_SKB_CB(skb)->tmp);

	tmp = ESP_SKB_CB(skb)->tmp;

	esp_ssg_unref(x, tmp);

	kfree(tmp);

	xfrm_output_resume(skb, err);

}
@@ -120,6 +151,29 @@ static void esp_output_restore_header(struct sk_buff *skb) 
				sizeof(__be32));

}



static struct ip_esp_hdr *esp_output_set_extra(struct sk_buff *skb,

					       struct ip_esp_hdr *esph,

					       struct esp_output_extra *extra)

{

	struct xfrm_state *x = skb_dst(skb)->xfrm;



	/* For ESN we move the header forward by 4 bytes to

	 * accomodate the high bits.  We will move it back after

	 * encryption.

	 */

	if ((x->props.flags & XFRM_STATE_ESN)) {

		extra->esphoff = (unsigned char *)esph -

				 skb_transport_header(skb);

		esph = (struct ip_esp_hdr *)((unsigned char *)esph - 4);

		extra->seqhi = esph->spi;

		esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.hi);

	}



	esph->spi = x->id.spi;



	return esph;

}



static void esp_output_done_esn(struct crypto_async_request *base, int err)

{

	struct sk_buff *skb = base->data;
@@ -128,18 +182,36 @@ static void esp_output_done_esn(struct crypto_async_request *base, int err) 
	esp_output_done(base, err);

}



static void esp_output_fill_trailer(u8 *tail, int tfclen, int plen, __u8 proto)

{

	/* Fill padding... */

	if (tfclen) {

		memset(tail, 0, tfclen);

		tail += tfclen;

	}

	do {

		int i;

		for (i = 0; i < plen - 2; i++)

			tail[i] = i + 1;

	} while (0);

	tail[plen - 2] = plen - 2;

	tail[plen - 1] = proto;

}



static int esp_output(struct xfrm_state *x, struct sk_buff *skb)

{

	int err;

	struct esp_output_extra *extra;

	int err = -ENOMEM;

	struct ip_esp_hdr *esph;

	struct crypto_aead *aead;

	struct aead_request *req;

	struct scatterlist *sg;

	struct scatterlist *sg, *dsg;

	struct sk_buff *trailer;

	struct page *page;

	void *tmp;

	u8 *iv;

	u8 *tail;

	u8 *vaddr;

	int blksize;

	int clen;

	int alen;
@@ -149,7 +221,9 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
	int nfrags;

	int assoclen;

	int extralen;

	int tailen;

	__be64 seqno;

	__u8 proto = *skb_mac_header(skb);



	/* skb is pure payload to encrypt */
@@ -169,12 +243,7 @@ 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);

	plen = clen - skb->len - tfclen;



	err = skb_cow_data(skb, tfclen + plen + alen, &trailer);

	if (err < 0)

		goto error;

	nfrags = err;



	tailen = tfclen + plen + alen;

	assoclen = sizeof(*esph);

	extralen = 0;
@@ -183,35 +252,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
		assoclen += sizeof(__be32);

	}



	tmp = esp_alloc_tmp(aead, nfrags, extralen);

	if (!tmp) {

		err = -ENOMEM;

		goto error;

	}



	extra = esp_tmp_extra(tmp);

	iv = esp_tmp_iv(aead, tmp, extralen);

	req = esp_tmp_req(aead, iv);

	sg = esp_req_sg(aead, req);



	/* Fill padding... */

	tail = skb_tail_pointer(trailer);

	if (tfclen) {

		memset(tail, 0, tfclen);

		tail += tfclen;

	}

	do {

		int i;

		for (i = 0; i < plen - 2; i++)

			tail[i] = i + 1;

	} while (0);

	tail[plen - 2] = plen - 2;

	tail[plen - 1] = *skb_mac_header(skb);

	pskb_put(skb, trailer, clen - skb->len + alen);



	skb_push(skb, -skb_network_offset(skb));

	esph = ip_esp_hdr(skb);

	*skb_mac_header(skb) = IPPROTO_ESP;

	esph = ip_esp_hdr(skb);



	/* this is non-NULL only with UDP Encapsulation */

	if (x->encap) {
@@ -230,7 +272,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
		uh = (struct udphdr *)esph;

		uh->source = sport;

		uh->dest = dport;

		uh->len = htons(skb->len - skb_transport_offset(skb));

		uh->len = htons(skb->len + tailen

				- skb_transport_offset(skb));

		uh->check = 0;



		switch (encap_type) {
@@ -248,31 +291,148 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
		*skb_mac_header(skb) = IPPROTO_UDP;

	}



	if (!skb_cloned(skb)) {

		if (tailen <= skb_availroom(skb)) {

			nfrags = 1;

			trailer = skb;

			tail = skb_tail_pointer(trailer);



			goto skip_cow;

		} else if ((skb_shinfo(skb)->nr_frags < MAX_SKB_FRAGS)

			   && !skb_has_frag_list(skb)) {

			int allocsize;

			struct sock *sk = skb->sk;

			struct page_frag *pfrag = &x->xfrag;



			allocsize = ALIGN(tailen, L1_CACHE_BYTES);



			spin_lock_bh(&x->lock);



			if (unlikely(!skb_page_frag_refill(allocsize, pfrag, GFP_ATOMIC))) {

				spin_unlock_bh(&x->lock);

				goto cow;

			}



			page = pfrag->page;

			get_page(page);



			vaddr = kmap_atomic(page);



			tail = vaddr + pfrag->offset;



			esp_output_fill_trailer(tail, tfclen, plen, proto);



			kunmap_atomic(vaddr);



			nfrags = skb_shinfo(skb)->nr_frags;



			__skb_fill_page_desc(skb, nfrags, page, pfrag->offset,

					     tailen);

			skb_shinfo(skb)->nr_frags = ++nfrags;



			pfrag->offset = pfrag->offset + allocsize;

			nfrags++;



			skb->len += tailen;

			skb->data_len += tailen;

			skb->truesize += tailen;

			if (sk)

				atomic_add(tailen, &sk->sk_wmem_alloc);



			skb_push(skb, -skb_network_offset(skb));



			esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);

			esph->spi = x->id.spi;



	aead_request_set_callback(req, 0, esp_output_done, skb);

			tmp = esp_alloc_tmp(aead, nfrags + 2, extralen);

			if (!tmp) {

				spin_unlock_bh(&x->lock);

				err = -ENOMEM;

				goto error;

			}



	/* For ESN we move the header forward by 4 bytes to

	 * accomodate the high bits.  We will move it back after

	 * encryption.

	 */

	if ((x->props.flags & XFRM_STATE_ESN)) {

		extra->esphoff = (unsigned char *)esph -

				 skb_transport_header(skb);

		esph = (struct ip_esp_hdr *)((unsigned char *)esph - 4);

		extra->seqhi = esph->spi;

		esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.hi);

		aead_request_set_callback(req, 0, esp_output_done_esn, skb);

			extra = esp_tmp_extra(tmp);

			iv = esp_tmp_iv(aead, tmp, extralen);

			req = esp_tmp_req(aead, iv);

			sg = esp_req_sg(aead, req);

			dsg = &sg[nfrags];



			esph = esp_output_set_extra(skb, esph, extra);



			sg_init_table(sg, nfrags);

			skb_to_sgvec(skb, sg,

				     (unsigned char *)esph - skb->data,

				     assoclen + ivlen + clen + alen);



			allocsize = ALIGN(skb->data_len, L1_CACHE_BYTES);



			if (unlikely(!skb_page_frag_refill(allocsize, pfrag, GFP_ATOMIC))) {

				spin_unlock_bh(&x->lock);

				err = -ENOMEM;

				goto error;

			}



			skb_shinfo(skb)->nr_frags = 1;



			page = pfrag->page;

			get_page(page);

			/* replace page frags in skb with new page */

			__skb_fill_page_desc(skb, 0, page, pfrag->offset, skb->data_len);

			pfrag->offset = pfrag->offset + allocsize;



			sg_init_table(dsg, skb_shinfo(skb)->nr_frags + 1);

			skb_to_sgvec(skb, dsg,

				     (unsigned char *)esph - skb->data,

				     assoclen + ivlen + clen + alen);



			spin_unlock_bh(&x->lock);



			goto skip_cow2;

		}

	}



cow:

	err = skb_cow_data(skb, tailen, &trailer);

	if (err < 0)

		goto error;

	nfrags = err;

	tail = skb_tail_pointer(trailer);

	esph = ip_esp_hdr(skb);



skip_cow:

	esp_output_fill_trailer(tail, tfclen, plen, proto);



	pskb_put(skb, trailer, clen - skb->len + alen);

	skb_push(skb, -skb_network_offset(skb));

	esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);

	esph->spi = x->id.spi;



	tmp = esp_alloc_tmp(aead, nfrags, extralen);

	if (!tmp) {

		err = -ENOMEM;

		goto error;

	}



	extra = esp_tmp_extra(tmp);

	iv = esp_tmp_iv(aead, tmp, extralen);

	req = esp_tmp_req(aead, iv);

	sg = esp_req_sg(aead, req);

	dsg = sg;



	esph = esp_output_set_extra(skb, esph, extra);



	sg_init_table(sg, nfrags);

	skb_to_sgvec(skb, sg,

		     (unsigned char *)esph - skb->data,

		     assoclen + ivlen + clen + alen);



	aead_request_set_crypt(req, sg, sg, ivlen + clen, iv);

skip_cow2:

	if ((x->props.flags & XFRM_STATE_ESN))

		aead_request_set_callback(req, 0, esp_output_done_esn, skb);

	else

		aead_request_set_callback(req, 0, esp_output_done, skb);



	aead_request_set_crypt(req, sg, dsg, ivlen + clen, iv);

	aead_request_set_ad(req, assoclen);



	seqno = cpu_to_be64(XFRM_SKB_CB(skb)->seq.output.low +
@@ -298,6 +458,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
			esp_output_restore_header(skb);

	}



	if (sg != dsg)

		esp_ssg_unref(x, tmp);

	kfree(tmp);



error:
@@ -401,6 +563,23 @@ static void esp_input_restore_header(struct sk_buff *skb) 
	__skb_pull(skb, 4);

}



static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)

{

	struct xfrm_state *x = xfrm_input_state(skb);

	struct ip_esp_hdr *esph = (struct ip_esp_hdr *)skb->data;



	/* For ESN we move the header forward by 4 bytes to

	 * accomodate the high bits.  We will move it back after

	 * decryption.

	 */

	if ((x->props.flags & XFRM_STATE_ESN)) {

		esph = (void *)skb_push(skb, 4);

		*seqhi = esph->spi;

		esph->spi = esph->seq_no;

		esph->seq_no = XFRM_SKB_CB(skb)->seq.input.hi;

	}

}



static void esp_input_done_esn(struct crypto_async_request *base, int err)

{

	struct sk_buff *skb = base->data;
@@ -437,12 +616,6 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) 
	if (elen <= 0)

		goto out;



	err = skb_cow_data(skb, 0, &trailer);

	if (err < 0)

		goto out;



	nfrags = err;



	assoclen = sizeof(*esph);

	seqhilen = 0;
@@ -451,6 +624,26 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) 
		assoclen += seqhilen;

	}



	if (!skb_cloned(skb)) {

		if (!skb_is_nonlinear(skb)) {

			nfrags = 1;



			goto skip_cow;

		} else if (!skb_has_frag_list(skb)) {

			nfrags = skb_shinfo(skb)->nr_frags;

			nfrags++;



			goto skip_cow;

		}

	}



	err = skb_cow_data(skb, 0, &trailer);

	if (err < 0)

		goto out;



	nfrags = err;



skip_cow:

	err = -ENOMEM;

	tmp = esp_alloc_tmp(aead, nfrags, seqhilen);

	if (!tmp)
@@ -462,26 +655,17 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) 
	req = esp_tmp_req(aead, iv);

	sg = esp_req_sg(aead, req);



	skb->ip_summed = CHECKSUM_NONE;

	esp_input_set_header(skb, seqhi);



	esph = (struct ip_esp_hdr *)skb->data;

	sg_init_table(sg, nfrags);

	skb_to_sgvec(skb, sg, 0, skb->len);



	aead_request_set_callback(req, 0, esp_input_done, skb);

	skb->ip_summed = CHECKSUM_NONE;



	/* For ESN we move the header forward by 4 bytes to

	 * accomodate the high bits.  We will move it back after

	 * decryption.

	 */

	if ((x->props.flags & XFRM_STATE_ESN)) {

		esph = (void *)skb_push(skb, 4);

		*seqhi = esph->spi;

		esph->spi = esph->seq_no;

		esph->seq_no = XFRM_SKB_CB(skb)->seq.input.hi;

	if ((x->props.flags & XFRM_STATE_ESN))

		aead_request_set_callback(req, 0, esp_input_done_esn, skb);

	}



	sg_init_table(sg, nfrags);

	skb_to_sgvec(skb, sg, 0, skb->len);

	else

		aead_request_set_callback(req, 0, esp_input_done, skb);



	aead_request_set_crypt(req, sg, sg, elen + ivlen, iv);

	aead_request_set_ad(req, assoclen);

net/ipv4/xfrm4_state.c

+0 −8
Original line number Diff line number Diff line
@@ -90,11 +90,3 @@ void __init xfrm4_state_init(void) 
{

	xfrm_state_register_afinfo(&xfrm4_state_afinfo);

}
 


#if 0

void __exit xfrm4_state_fini(void)

{

	xfrm_state_unregister_afinfo(&xfrm4_state_afinfo);

}

#endif  /*  0  */