Skip to content

Commit 91d8a53

Browse files
qsnklassert
authored andcommitted
xfrm: fix offloading of cross-family tunnels
Xiumei reported a regression in IPsec offload tests over xfrmi, where the traffic for IPv6 over IPv4 tunnels is processed in SW instead of going through crypto offload, after commit cc18f48 ("xfrm: provide common xdo_dev_offload_ok callback implementation"). Commit cc18f48 added a generic version of existing checks attempting to prevent packets with IPv4 options or IPv6 extension headers from being sent to HW that doesn't support offloading such packets. The check mistakenly uses x->props.family (the outer family) to determine the inner packet's family and verify if options/extensions are present. In the case of IPv6 over IPv4, the check compares some of the traffic class bits to the expected no-options ihl value (5). The original check was introduced in commit 2ac9cfe ("net/mlx5e: IPSec, Add Innova IPSec offload TX data path"), and then duplicated in the other drivers. Before commit cc18f48, the loose check (ihl > 5) passed because those traffic class bits were not set to a value that triggered the no-offload codepath. Packets with options/extension headers that should have been handled in SW went through the offload path, and were likely dropped by the NIC or incorrectly processed. Since commit cc18f48, the check is now strict (ihl != 5), and in a basic setup (no traffic class configured), all packets go through the no-offload codepath. The commits that introduced the incorrect family checks in each driver are: 2ac9cfe ("net/mlx5e: IPSec, Add Innova IPSec offload TX data path") 8362ea1 ("crypto: chcr - ESN for Inline IPSec Tx") 859a497 ("nfp: implement xfrm callbacks and expose ipsec offload feature to upper layer") 32188be ("cn10k-ipsec: Allow ipsec crypto offload for skb with SA") [ixgbe/ixgbevf commits are ignored, as that HW does not support tunnel mode, thus no cross-family setups are possible] Fixes: cc18f48 ("xfrm: provide common xdo_dev_offload_ok callback implementation") Reported-by: Xiumei Mu <[email protected]> Signed-off-by: Sabrina Dubroca <[email protected]> Reviewed-by: Leon Romanovsky <[email protected]> Reviewed-by: Zhu Yanjun <[email protected]> Signed-off-by: Steffen Klassert <[email protected]>
1 parent cd8ae32 commit 91d8a53

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/xfrm/xfrm_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x)
438438

439439
check_tunnel_size = x->xso.type == XFRM_DEV_OFFLOAD_PACKET &&
440440
x->props.mode == XFRM_MODE_TUNNEL;
441-
switch (x->props.family) {
441+
switch (x->inner_mode.family) {
442442
case AF_INET:
443443
/* Check for IPv4 options */
444444
if (ip_hdr(skb)->ihl != 5)

0 commit comments

Comments
 (0)