pull request (net): ipsec 2020-06-19
Subsystems (3)
Steffen Klassert
maintainer1) Fix double ESP trailer insertion in IPsec crypto offload if netif_xmit_frozen_or_stopped is true. From Huy Nguyen.
2) Merge fixup for "remove output_finish indirection from xfrm_state_afinfo". From Stephen Rothwell.
3) Select CRYPTO_SEQIV for ESP as this is needed for GCM and several other encryption algorithms. Also modernize the crypto algorithm selections for ESP and AH, remove those that are maked as "MUST NOT" and add those that are marked as "MUST" be implemented in RFC 8221. From Eric Biggers.
Please note the merge conflict between commit:
a7f7f6248d97 ("treewide: replace '---help---' in Kconfig files with 'help'")
from Linus' tree and commits:
7d4e39195925 ("esp, ah: consolidate the crypto algorithm selections") be01369859b8 ("esp, ah: modernize the crypto algorithm selections")
from the ipsec tree.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next (2020-06-03 16:27:18 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master
for you to fetch changes up to be01369859b8aa07346e497381bb46d377da0d8c:
esp, ah: modernize the crypto algorithm selections (2020-06-15 06:52:16 +0200)
----------------------------------------------------------------
Eric Biggers (3):
esp, ah: consolidate the crypto algorithm selections
esp: select CRYPTO_SEQIV
esp, ah: modernize the crypto algorithm selections
Huy Nguyen (1):
xfrm: Fix double ESP trailer insertion in IPsec crypto offload.
Stephen Rothwell (1):
xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"
include/net/xfrm.h | 1 + net/ipv4/Kconfig | 34 ++++++++++++++++++---------------- net/ipv6/Kconfig | 34 ++++++++++++++++++---------------- net/xfrm/Kconfig | 24 ++++++++++++++++++++++++ net/xfrm/xfrm_device.c | 4 +++- net/xfrm/xfrm_output.c | 4 ---- 6 files changed, 64 insertions(+), 37 deletions(-)
Steffen Klassert
maintainerPATCH 1/5 xfrm: Fix double ESP trailer insertion in IPsec crypto offload.
From: Huy Nguyen <[email protected]>
During IPsec performance testing, we see bad ICMP checksum. The error packet has duplicated ESP trailer due to double validate_xmit_xfrm calls. The first call is from ip_output, but the packet cannot be sent because netif_xmit_frozen_or_stopped is true and the packet gets dev_requeue_skb. The second call is from NET_TX softirq. However after the first call, the packet already has the ESP trailer.
Fix by marking the skb with XFRM_XMIT bit after the packet is handled by validate_xmit_xfrm to avoid duplicate ESP trailer insertion.
--- include/net/xfrm.h | 1 + net/xfrm/xfrm_device.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)
include/net/xfrm.h +1 -0
@@ -1008,6 +1008,7 @@ struct xfrm_offload {#define XFRM_GRO 32#define XFRM_ESP_NO_TRAILER 64#define XFRM_DEV_RESUME 128 +#define XFRM_XMIT 256__u32 status;#define CRYPTO_SUCCESS 1
net/xfrm/xfrm_device.c +3 -1
@@ -108,7 +108,7 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featurstruct xfrm_offload *xo =xfrm_offload (skb);struct sec_path *sp; -if (!xo) +if (!xo || (xo->flags &XFRM_XMIT ))return skb;if (!(features &NETIF_F_HW_ESP ))
@@ -129,6 +129,8 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featurreturn skb; } + xo->flags |=XFRM_XMIT ; +if (skb_is_gso (skb)) {struct net_device *dev = skb->dev;
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 2/5 xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"
In reply to Steffen KlassertFrom: Stephen Rothwell <[email protected]>
--- net/xfrm/xfrm_output.c | 4 ---- 1 file changed, 4 deletions(-)
net/xfrm/xfrm_output.c +0 -4
@@ -574,16 +574,12 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)switch (x->outer_mode.family) {case AF_INET :memset (IPCB (skb),0 ,sizeof (*IPCB (skb))); -#ifdef CONFIG_NETFILTER IPCB (skb)->flags |=IPSKB_XFRM_TRANSFORMED ; -#endif break ;case AF_INET6 :memset (IP6CB (skb),0 ,sizeof (*IP6CB (skb))); -#ifdef CONFIG_NETFILTER IP6CB (skb)->flags |=IP6SKB_XFRM_TRANSFORMED ; -#endif break ; }
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 3/5 esp, ah: consolidate the crypto algorithm selections
In reply to Steffen KlassertFrom: Eric Biggers <[email protected]>
Instead of duplicating the algorithm selections between INET_AH and INET6_AH and between INET_ESP and INET6_ESP, create new tristates XFRM_AH and XFRM_ESP that do the algorithm selections, and make these be selected by the corresponding INET* options.
--- net/ipv4/Kconfig | 16 ++-------------- net/ipv6/Kconfig | 16 ++-------------- net/xfrm/Kconfig | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 28 deletions(-)
net/ipv4/Kconfig +2 -14
@@ -340,11 +340,7 @@ config NET_FOU_IP_TUNNELS config INET_AH tristate "IP: AH transformation" - select XFRM_ALGO - select CRYPTO - select CRYPTO_HMAC - select CRYPTO_MD5 - select CRYPTO_SHA1 + select XFRM_AH ---help--- Support for IPsec AH.
@@ -352,15 +348,7 @@ config INET_AH config INET_ESP tristate "IP: ESP transformation" - select XFRM_ALGO - select CRYPTO - select CRYPTO_AUTHENC - select CRYPTO_HMAC - select CRYPTO_MD5 - select CRYPTO_CBC - select CRYPTO_SHA1 - select CRYPTO_DES - select CRYPTO_ECHAINIV + select XFRM_ESP ---help--- Support for IPsec ESP.
net/ipv6/Kconfig +2 -14
@@ -49,11 +49,7 @@ config IPV6_OPTIMISTIC_DAD config INET6_AH tristate "IPv6: AH transformation" - select XFRM_ALGO - select CRYPTO - select CRYPTO_HMAC - select CRYPTO_MD5 - select CRYPTO_SHA1 + select XFRM_AH ---help--- Support for IPsec AH.
@@ -61,15 +57,7 @@ config INET6_AH config INET6_ESP tristate "IPv6: ESP transformation" - select XFRM_ALGO - select CRYPTO - select CRYPTO_AUTHENC - select CRYPTO_HMAC - select CRYPTO_MD5 - select CRYPTO_CBC - select CRYPTO_SHA1 - select CRYPTO_DES - select CRYPTO_ECHAINIV + select XFRM_ESP ---help--- Support for IPsec ESP.
net/xfrm/Kconfig +20 -0
@@ -67,6 +67,26 @@ config XFRM_STATISTICS If unsure, say N. +config XFRM_AH + tristate + select XFRM_ALGO + select CRYPTO + select CRYPTO_HMAC + select CRYPTO_MD5 + select CRYPTO_SHA1 + +config XFRM_ESP + tristate + select XFRM_ALGO + select CRYPTO + select CRYPTO_AUTHENC + select CRYPTO_HMAC + select CRYPTO_MD5 + select CRYPTO_CBC + select CRYPTO_SHA1 + select CRYPTO_DES + select CRYPTO_ECHAINIV + config XFRM_IPCOMP tristate select XFRM_ALGO
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 4/5 esp: select CRYPTO_SEQIV
In reply to Steffen KlassertFrom: Eric Biggers <[email protected]>
Commit f23efcbcc523 ("crypto: ctr - no longer needs CRYPTO_SEQIV") made CRYPTO_CTR stop selecting CRYPTO_SEQIV. This breaks IPsec for most users since GCM and several other encryption algorithms require "seqiv" -- and RFC 8221 lists AES-GCM as "MUST" be implemented.
Just make XFRM_ESP select CRYPTO_SEQIV.
--- net/xfrm/Kconfig | 1 + 1 file changed, 1 insertion(+)
net/xfrm/Kconfig +1 -0
@@ -86,6 +86,7 @@ config XFRM_ESP select CRYPTO_SHA1 select CRYPTO_DES select CRYPTO_ECHAINIV + select CRYPTO_SEQIV config XFRM_IPCOMP tristate
Signature · 1 line
2.17.1
Steffen Klassert
maintainerPATCH 5/5 esp, ah: modernize the crypto algorithm selections
In reply to Steffen KlassertFrom: Eric Biggers <[email protected]>
The crypto algorithms selected by the ESP and AH kconfig options are out-of-date with the guidance of RFC 8221, which lists the legacy algorithms MD5 and DES as "MUST NOT" be implemented, and some more modern algorithms like AES-GCM and HMAC-SHA256 as "MUST" be implemented. But the options select the legacy algorithms, not the modern ones.
Therefore, modify these options to select the MUST algorithms -- and *only* the MUST algorithms.
Also improve the help text.
Note that other algorithms may still be explicitly enabled in the kconfig, and the choice of which to actually use is still controlled by userspace. This change only modifies the list of algorithms for which kernel support is guaranteed to be present.
--- net/ipv4/Kconfig | 18 ++++++++++++++++-- net/ipv6/Kconfig | 18 ++++++++++++++++-- net/xfrm/Kconfig | 15 +++++++++------ 3 files changed, 41 insertions(+), 10 deletions(-)
net/ipv4/Kconfig +16 -2
@@ -342,7 +342,14 @@ config INET_AH tristate "IP: AH transformation" select XFRM_AH ---help--- - Support for IPsec AH. + Support for IPsec AH (Authentication Header). + + AH can be used with various authentication algorithms. Besides + enabling AH support itself, this option enables the generic + implementations of the algorithms that RFC 8221 lists as MUST be + implemented. If you need any other algorithms, you'll need to enable + them in the crypto API. You should also enable accelerated + implementations of any needed algorithms when available. If unsure, say Y.
@@ -350,7 +357,14 @@ config INET_ESP tristate "IP: ESP transformation" select XFRM_ESP ---help--- - Support for IPsec ESP. + Support for IPsec ESP (Encapsulating Security Payload). + + ESP can be used with various encryption and authentication algorithms. + Besides enabling ESP support itself, this option enables the generic + implementations of the algorithms that RFC 8221 lists as MUST be + implemented. If you need any other algorithms, you'll need to enable + them in the crypto API. You should also enable accelerated + implementations of any needed algorithms when available. If unsure, say Y.
net/ipv6/Kconfig +16 -2
@@ -51,7 +51,14 @@ config INET6_AH tristate "IPv6: AH transformation" select XFRM_AH ---help--- - Support for IPsec AH. + Support for IPsec AH (Authentication Header). + + AH can be used with various authentication algorithms. Besides + enabling AH support itself, this option enables the generic + implementations of the algorithms that RFC 8221 lists as MUST be + implemented. If you need any other algorithms, you'll need to enable + them in the crypto API. You should also enable accelerated + implementations of any needed algorithms when available. If unsure, say Y.
@@ -59,7 +66,14 @@ config INET6_ESP tristate "IPv6: ESP transformation" select XFRM_ESP ---help--- - Support for IPsec ESP. + Support for IPsec ESP (Encapsulating Security Payload). + + ESP can be used with various encryption and authentication algorithms. + Besides enabling ESP support itself, this option enables the generic + implementations of the algorithms that RFC 8221 lists as MUST be + implemented. If you need any other algorithms, you'll need to enable + them in the crypto API. You should also enable accelerated + implementations of any needed algorithms when available. If unsure, say Y.
net/xfrm/Kconfig +9 -6
@@ -67,26 +67,29 @@ config XFRM_STATISTICS If unsure, say N. +# This option selects XFRM_ALGO along with the AH authentication algorithms that +# RFC 8221 lists as MUST be implemented. config XFRM_AH tristate select XFRM_ALGO select CRYPTO select CRYPTO_HMAC - select CRYPTO_MD5 - select CRYPTO_SHA1 + select CRYPTO_SHA256 +# This option selects XFRM_ALGO along with the ESP encryption and authentication +# algorithms that RFC 8221 lists as MUST be implemented. config XFRM_ESP tristate select XFRM_ALGO select CRYPTO + select CRYPTO_AES select CRYPTO_AUTHENC - select CRYPTO_HMAC - select CRYPTO_MD5 select CRYPTO_CBC - select CRYPTO_SHA1 - select CRYPTO_DES select CRYPTO_ECHAINIV + select CRYPTO_GCM + select CRYPTO_HMAC select CRYPTO_SEQIV + select CRYPTO_SHA256 config XFRM_IPCOMP tristate
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Steffen Klassert <[email protected]>
Date: Fri, 19 Jun 2020 09:43:37 +0200
Quoted 16 lines
1) Fix double ESP trailer insertion in IPsec crypto offload if
netif_xmit_frozen_or_stoppedis true. From Huy Nguyen.2) Merge fixup for "remove
output_finishindirection fromxfrm_state_afinfo". From Stephen Rothwell.3) Select
CRYPTO_SEQIVfor ESP as this is needed for GCM and several other encryption algorithms. Also modernize the crypto algorithm selections for ESP and AH, remove those that are maked as "MUST NOT" and add those that are marked as "MUST" be implemented in RFC 8221. From Eric Biggers.Please note the merge conflict between commit:
a7f7f6248d97("treewide: replace '---help---' inKconfigfiles with 'help'")
Quoted 8 lines
from Linus' tree and commits:
7d4e39195925("esp, ah: consolidate the crypto algorithm selections")be01369859b8("esp, ah: modernize the crypto algorithm selections")from the ipsec tree.
Please pull or let me know if there are problems.
Pulled, thanks a lot.