Skip to contentSkip to conversation

xfrm: interface: enable TSO on xfrm interfaces

RFC In review Eyal Birger 2 participants 4 messages Dec 23, 2020 – Jan 5, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC 1/1 xfrm: interface: enable TSO on xfrm interfaces

Underlying xfrm output supports gso packets.
Declare support in hw_features and adapt the xmit MTU check to pass GSO packets.

---
 net/xfrm/xfrm_interface.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
net/xfrm/xfrm_interface.c +9 -1
index 9b8e292a7c6a..d28e9f05d9dd 100644
@@ -296,7 +296,8 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
 	}
 
 	mtu = dst_mtu(dst);
-	if (skb->len > mtu) {
+	if ((!skb_is_gso(skb) && skb->len > mtu) ||
+	    (skb_is_gso(skb) && !skb_gso_validate_network_len(skb, mtu))) {
 		skb_dst_update_pmtu_no_confirm(skb, mtu);
 
 		if (skb->protocol == htons(ETH_P_IPV6)) {
@@ -579,6 +580,11 @@ static void xfrmi_dev_setup(struct net_device *dev)
 	eth_broadcast_addr(dev->broadcast);
 }
 
+#define XFRMI_FEATURES (NETIF_F_SG |		\
+			NETIF_F_FRAGLIST |	\
+			NETIF_F_GSO_SOFTWARE |	\
+			NETIF_F_HW_CSUM)
+
 static int xfrmi_dev_init(struct net_device *dev)
 {
 	struct xfrm_if *xi = netdev_priv(dev);
@@ -596,6 +602,8 @@ static int xfrmi_dev_init(struct net_device *dev)
 	}
 
 	dev->features |= NETIF_F_LLTX;
+	dev->features |= XFRMI_FEATURES;
+	dev->hw_features |= XFRMI_FEATURES;
 
 	if (phydev) {
 		dev->needed_headroom = phydev->needed_headroom;
Signature · 1 line
2.25.1
#2 lore raw

Hi Steffen,

Quoted 9 lines · Steffen Klassert
Quoted 5 lines · Eyal Birger

Underlying xfrm output supports gso packets.
Declare support in hw_features and adapt the xmit MTU check to pass GSO packets.

Looks ok to me.

Great, Thanks for the review.

Should I submit a non-rfc patch once the merge window opens?

Eyal.

maintainer
#3 lore raw
Quoted 10 lines · Eyal Birger

Hi Steffen,

Quoted 6 lines · Steffen Klassert
Quoted 4 lines · Eyal Birger

Underlying xfrm output supports gso packets.
Declare support in hw_features and adapt the xmit MTU check to pass GSO packets.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Looks ok to me.

Great, Thanks for the review.

Should I submit a non-rfc patch once the merge window opens?

Yes, please do so.