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

Commit e51a6472 authored by Ilan Tayari's avatar Ilan Tayari Committed by Steffen Klassert
Browse files

esp6: Support RX checksum with crypto offload 



Keep the device's reported ip_summed indication in case crypto
was offloaded by the device. Subtract the csum values of the
stripped parts (esp header+iv, esp trailer+auth_data) to keep
value correct.

Note: CHECKSUM_COMPLETE should be indicated only if skb->csum
has the post-decryption offload csum value.

Signed-off-by: default avatarAriel Levkovich <lariel@mellanox.com>
Signed-off-by: default avatarIlan Tayari <ilant@mellanox.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent ec9567a9

net/ipv6/esp6.c

+11 −3
Original line number Diff line number Diff line
@@ -470,7 +470,8 @@ int esp6_input_done2(struct sk_buff *skb, int err) 
	int hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);

	int elen = skb->len - hlen;

	int hdr_len = skb_network_header_len(skb);

	int padlen;

	int padlen, trimlen;

	__wsum csumdiff;

	u8 nexthdr[2];



	if (!xo || (xo && !(xo->flags & CRYPTO_DONE)))
@@ -492,8 +493,15 @@ int esp6_input_done2(struct sk_buff *skb, int err) 


	/* ... check padding bits here. Silly. :-) */



	pskb_trim(skb, skb->len - alen - padlen - 2);

	__skb_pull(skb, hlen);

	trimlen = alen + padlen + 2;

	if (skb->ip_summed == CHECKSUM_COMPLETE) {

		csumdiff = skb_checksum(skb, skb->len - trimlen, trimlen, 0);

		skb->csum = csum_block_sub(skb->csum, csumdiff,

					   skb->len - trimlen);

	}

	pskb_trim(skb, skb->len - trimlen);



	skb_pull_rcsum(skb, hlen);

	if (x->props.mode == XFRM_MODE_TUNNEL)

		skb_reset_transport_header(skb);

	else

net/ipv6/esp6_offload.c

+3 −1
Original line number Diff line number Diff line
@@ -209,10 +209,12 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb, 
static int esp6_input_tail(struct xfrm_state *x, struct sk_buff *skb)

{

	struct crypto_aead *aead = x->data;

	struct xfrm_offload *xo = xfrm_offload(skb);



	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead)))

		return -EINVAL;



	if (!(xo->flags & CRYPTO_DONE))

		skb->ip_summed = CHECKSUM_NONE;



	return esp6_input_done2(skb, 0);