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

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

esp4: 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 cb5b136c

net/ipv4/esp4.c

+11 −3
Original line number Diff line number Diff line
@@ -510,7 +510,8 @@ int esp_input_done2(struct sk_buff *skb, int err) 
	int elen = skb->len - hlen;

	int ihl;

	u8 nexthdr[2];

	int padlen;

	int padlen, trimlen;

	__wsum csumdiff;



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

		kfree(ESP_SKB_CB(skb)->tmp);
@@ -568,8 +569,15 @@ int esp_input_done2(struct sk_buff *skb, int err) 
			skb->ip_summed = CHECKSUM_UNNECESSARY;

	}



	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/ipv4/esp4_offload.c

+3 −1
Original line number Diff line number Diff line
@@ -182,10 +182,12 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb, 
static int esp_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 esp_input_done2(skb, 0);