* [RFC ipsec-next] xfrm: interface: enable TSO on xfrm interfaces
@ 2020-12-23 7:15 Eyal Birger
2021-01-04 8:44 ` Steffen Klassert
0 siblings, 1 reply; 4+ messages in thread
From: Eyal Birger @ 2020-12-23 7:15 UTC (permalink / raw)
To: steffen.klassert, herbert
Cc: davem, kuba, netdev, shmulik.ladkani, Eyal Birger
Underlying xfrm output supports gso packets.
Declare support in hw_features and adapt the xmit MTU check to pass GSO
packets.
Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
---
net/xfrm/xfrm_interface.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c
index 9b8e292a7c6a..d28e9f05d9dd 100644
--- a/net/xfrm/xfrm_interface.c
+++ b/net/xfrm/xfrm_interface.c
@@ -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;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [RFC ipsec-next] xfrm: interface: enable TSO on xfrm interfaces
2020-12-23 7:15 [RFC ipsec-next] xfrm: interface: enable TSO on xfrm interfaces Eyal Birger
@ 2021-01-04 8:44 ` Steffen Klassert
2021-01-04 17:50 ` Eyal Birger
0 siblings, 1 reply; 4+ messages in thread
From: Steffen Klassert @ 2021-01-04 8:44 UTC (permalink / raw)
To: Eyal Birger; +Cc: herbert, davem, kuba, netdev, shmulik.ladkani
On Wed, Dec 23, 2020 at 09:15:38AM +0200, Eyal Birger wrote:
> Underlying xfrm output supports gso packets.
> Declare support in hw_features and adapt the xmit MTU check to pass GSO
> packets.
>
> Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Looks ok to me.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RFC ipsec-next] xfrm: interface: enable TSO on xfrm interfaces
2021-01-04 8:44 ` Steffen Klassert
@ 2021-01-04 17:50 ` Eyal Birger
2021-01-05 8:12 ` Steffen Klassert
0 siblings, 1 reply; 4+ messages in thread
From: Eyal Birger @ 2021-01-04 17:50 UTC (permalink / raw)
To: Steffen Klassert
Cc: herbert, David Miller, Jakub Kicinski,
Linux Kernel Network Developers, Shmulik Ladkani
Hi Steffen,
On Mon, Jan 4, 2021 at 10:44 AM Steffen Klassert
<steffen.klassert@secunet.com> wrote:
>
> On Wed, Dec 23, 2020 at 09:15:38AM +0200, Eyal Birger wrote:
> > Underlying xfrm output supports gso packets.
> > Declare support in hw_features and adapt the xmit MTU check to pass GSO
> > packets.
> >
> > Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
>
> Looks ok to me.
Great, Thanks for the review.
Should I submit a non-rfc patch once the merge window opens?
Eyal.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RFC ipsec-next] xfrm: interface: enable TSO on xfrm interfaces
2021-01-04 17:50 ` Eyal Birger
@ 2021-01-05 8:12 ` Steffen Klassert
0 siblings, 0 replies; 4+ messages in thread
From: Steffen Klassert @ 2021-01-05 8:12 UTC (permalink / raw)
To: Eyal Birger
Cc: herbert, David Miller, Jakub Kicinski,
Linux Kernel Network Developers, Shmulik Ladkani
On Mon, Jan 04, 2021 at 07:50:49PM +0200, Eyal Birger wrote:
> Hi Steffen,
>
> On Mon, Jan 4, 2021 at 10:44 AM Steffen Klassert
> <steffen.klassert@secunet.com> wrote:
> >
> > On Wed, Dec 23, 2020 at 09:15:38AM +0200, Eyal Birger wrote:
> > > Underlying xfrm output supports gso packets.
> > > Declare support in hw_features and adapt the xmit MTU check to pass GSO
> > > packets.
> > >
> > > Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
> >
> > 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-05 8:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-23 7:15 [RFC ipsec-next] xfrm: interface: enable TSO on xfrm interfaces Eyal Birger
2021-01-04 8:44 ` Steffen Klassert
2021-01-04 17:50 ` Eyal Birger
2021-01-05 8:12 ` Steffen Klassert
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.