Commit f7e8542d authored Jul 12, 2024 by Mike Yu Committed by Steffen Klassert Jul 12, 2024

xfrm: Support crypto offload for inbound IPv6 ESP packets not in GRO path



IPsec crypt offload supports outbound IPv6 ESP packets, but it doesn't
support inbound IPv6 ESP packets.

This change enables the crypto offload for inbound IPv6 ESP packets
that are not handled through GRO code path. If HW drivers add the
offload information to the skb, the packet will be handled in the
crypto offload rx code path.

Apart from the change in crypto offload rx code path, the change
in xfrm_policy_check is also needed.

Exampe of RX data path:

  +-----------+   +-------+
  | HW Driver |-->| wlan0 |--------+
  +-----------+   +-------+        |
                                   v
                             +---------------+   +------+
                     +------>| Network Stack |-->| Apps |
                     |       +---------------+   +------+
                     |             |
                     |             v
                 +--------+   +------------+
                 | ipsec1 |<--| XFRM Stack |
                 +--------+   +------------+

Test: Enabled both in/out IPsec crypto offload, and verified IPv6
      ESP packets on Android device on both wifi/cellular network
Signed-off-by: Mike Yu <yumike@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent f531d13b

net/xfrm/xfrm_input.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -471,7 +471,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
		struct xfrm_offload *xo = xfrm_offload(skb);
		struct sec_path *sp;

		if (encap_type < 0 \|\| (xo && xo->flags & XFRM_GRO)) {
		if (encap_type < 0 \|\| (xo && (xo->flags & XFRM_GRO \|\| encap_type == 0))) {
		x = xfrm_input_state(skb);

		if (unlikely(x->dir && x->dir != XFRM_SA_DIR_IN)) {

net/xfrm/xfrm_policy.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -3718,12 +3718,15 @@ int __xfrm_policy_check(struct sock sk, int dir, struct sk_buff skb,
		pol = xfrm_in_fwd_icmp(skb, &fl, family, if_id);

		if (!pol) {
		const bool is_crypto_offload = sp &&
		(xfrm_input_state(skb)->xso.type == XFRM_DEV_OFFLOAD_CRYPTO);

		if (net->xfrm.policy_default[dir] == XFRM_USERPOLICY_BLOCK) {
		XFRM_INC_STATS(net, LINUX_MIB_XFRMINNOPOLS);
		return 0;
		}

		if (sp && secpath_has_nontransport(sp, 0, &xerr_idx)) {
		if (sp && secpath_has_nontransport(sp, 0, &xerr_idx) && !is_crypto_offload) {
		xfrm_secpath_reject(xerr_idx, skb, &fl);
		XFRM_INC_STATS(net, LINUX_MIB_XFRMINNOPOLS);
		return 0;