| Message ID | 20220513151218.4010119-2-steffen.klassert@secunet.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b01a277a0520edd5c815af346f05ef2c747919b6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/8] xfrm: free not used XFRM_ESP_NO_TRAILER flag | expand |
Hello: This series was applied to netdev/net-next.git (master) by Steffen Klassert <steffen.klassert@secunet.com>: On Fri, 13 May 2022 17:12:11 +0200 you wrote: > From: Leon Romanovsky <leonro@nvidia.com> > > After removal of Innova IPsec support from mlx5 driver, the last user > of this XFRM_ESP_NO_TRAILER was gone too. This means that we can safely > remove it as no other hardware is capable (or need) to remove ESP trailer. > > Reviewed-by: Raed Salem <raeds@nvidia.com> > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > Acked-by: David S. Miller <davem@davemloft.net> > Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> > > [...] Here is the summary with links: - [1/8] xfrm: free not used XFRM_ESP_NO_TRAILER flag https://git.kernel.org/netdev/net-next/c/b01a277a0520 - [2/8] xfrm: delete not used number of external headers https://git.kernel.org/netdev/net-next/c/a36708e64658 - [3/8] xfrm: rename xfrm_state_offload struct to allow reuse https://git.kernel.org/netdev/net-next/c/87e0a94e60ea - [4/8] xfrm: store and rely on direction to construct offload flags https://git.kernel.org/netdev/net-next/c/482db2f1dd21 - [5/8] ixgbe: propagate XFRM offload state direction instead of flags https://git.kernel.org/netdev/net-next/c/0c05ab78e3f2 - [6/8] netdevsim: rely on XFRM state direction instead of flags https://git.kernel.org/netdev/net-next/c/55e2f83afb1c - [7/8] net/mlx5e: Use XFRM state direction instead of flags https://git.kernel.org/netdev/net-next/c/3ef535eccea3 - [8/8] xfrm: drop not needed flags variable in XFRM offload struct https://git.kernel.org/netdev/net-next/c/254c4a824c7c You are awesome, thank you!
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 6fb899ff5afc..b41278abeeaa 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1006,7 +1006,7 @@ struct xfrm_offload { #define CRYPTO_FALLBACK 8 #define XFRM_GSO_SEGMENT 16 #define XFRM_GRO 32 -#define XFRM_ESP_NO_TRAILER 64 +/* 64 is free */ #define XFRM_DEV_RESUME 128 #define XFRM_XMIT 256 diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index d747166bb291..b21238df3301 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -705,7 +705,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) static inline int esp_remove_trailer(struct sk_buff *skb) { struct xfrm_state *x = xfrm_input_state(skb); - struct xfrm_offload *xo = xfrm_offload(skb); struct crypto_aead *aead = x->data; int alen, hlen, elen; int padlen, trimlen; @@ -717,11 +716,6 @@ static inline int esp_remove_trailer(struct sk_buff *skb) hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead); elen = skb->len - hlen; - if (xo && (xo->flags & XFRM_ESP_NO_TRAILER)) { - ret = xo->proto; - goto out; - } - if (skb_copy_bits(skb, skb->len - alen - 2, nexthdr, 2)) BUG(); diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index f2120e92caf1..36e1d0f8dd06 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -741,7 +741,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) static inline int esp_remove_trailer(struct sk_buff *skb) { struct xfrm_state *x = xfrm_input_state(skb); - struct xfrm_offload *xo = xfrm_offload(skb); struct crypto_aead *aead = x->data; int alen, hlen, elen; int padlen, trimlen; @@ -753,11 +752,6 @@ static inline int esp_remove_trailer(struct sk_buff *skb) hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead); elen = skb->len - hlen; - if (xo && (xo->flags & XFRM_ESP_NO_TRAILER)) { - ret = xo->proto; - goto out; - } - ret = skb_copy_bits(skb, skb->len - alen - 2, nexthdr, 2); BUG_ON(ret);