search for: 945bbd0

...> > SKB_GSO_MPLS = 1 << 12, > > + SKB_GSO_UDP6 = 1 << 13 It seems like it would be cleaner to use the names SKB_GSO_UDPV{4,6}, similarly to SKB_GSO_TCPV{4,6}. > }; > > #if BITS_PER_LONG > 32 > diff --git a/net/core/dev.c b/net/core/dev.c > index 945bbd0..fa4d2ee 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c [...] > @@ -5952,24 +5958,21 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, [...] > + /* UFO also needs checksumming */ > + if ((features & NETIF_F_UFO) && !(features & NETIF_F_GEN_...

...> > SKB_GSO_MPLS = 1 << 12, > > + SKB_GSO_UDP6 = 1 << 13 It seems like it would be cleaner to use the names SKB_GSO_UDPV{4,6}, similarly to SKB_GSO_TCPV{4,6}. > }; > > #if BITS_PER_LONG > 32 > diff --git a/net/core/dev.c b/net/core/dev.c > index 945bbd0..fa4d2ee 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c [...] > @@ -5952,24 +5958,21 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, [...] > + /* UFO also needs checksumming */ > + if ((features & NETIF_F_UFO) && !(features & NETIF_F_GEN_...

...}; > > #if BITS_PER_LONG > 32 So this implies anything getting GSO packets e.g. from userspace now needs to check IP version to set GSO type correctly. I think you missed some places that do this, e.g. af_packet sockets. > diff --git a/net/core/dev.c b/net/core/dev.c > index 945bbd0..fa4d2ee 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, > features &= ~NETIF_F_ALL_TSO; > } > > + /* UFO requires that SG is present as well */ > + if ((features &a...

...}; > > #if BITS_PER_LONG > 32 So this implies anything getting GSO packets e.g. from userspace now needs to check IP version to set GSO type correctly. I think you missed some places that do this, e.g. af_packet sockets. > diff --git a/net/core/dev.c b/net/core/dev.c > index 945bbd0..fa4d2ee 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, > features &= ~NETIF_F_ALL_TSO; > } > > + /* UFO requires that SG is present as well */ > + if ((features &a...

...skbuff.h b/include/linux/skbuff.h index 6c8b6f6..8538b67 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -372,6 +372,7 @@ enum { SKB_GSO_MPLS = 1 << 12, + SKB_GSO_UDP6 = 1 << 13 }; #if BITS_PER_LONG > 32 diff --git a/net/core/dev.c b/net/core/dev.c index 945bbd0..fa4d2ee 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, features &= ~NETIF_F_ALL_TSO; } + /* UFO requires that SG is present as well */ + if ((features & NETIF_F_ALL_UFO) && !(featur...

...skbuff.h b/include/linux/skbuff.h index 6c8b6f6..8538b67 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -372,6 +372,7 @@ enum { SKB_GSO_MPLS = 1 << 12, + SKB_GSO_UDP6 = 1 << 13 }; #if BITS_PER_LONG > 32 diff --git a/net/core/dev.c b/net/core/dev.c index 945bbd0..fa4d2ee 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, features &= ~NETIF_F_ALL_TSO; } + /* UFO requires that SG is present as well */ + if ((features & NETIF_F_ALL_UFO) && !(featur...

...wo things if you replace userspace with hypervisor and tun/macvtap/packet socket with virtio device. 4. As a next step, we should add a way for userspace to tell us that it has ids and can handle them. > > > >> diff --git a/net/core/dev.c b/net/core/dev.c > >> index 945bbd0..fa4d2ee 100644 > >> --- a/net/core/dev.c > >> +++ b/net/core/dev.c > >> @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, > >> features &= ~NETIF_F_ALL_TSO; > >> } > >> > >> + /* UFO...

...wo things if you replace userspace with hypervisor and tun/macvtap/packet socket with virtio device. 4. As a next step, we should add a way for userspace to tell us that it has ids and can handle them. > > > >> diff --git a/net/core/dev.c b/net/core/dev.c > >> index 945bbd0..fa4d2ee 100644 > >> --- a/net/core/dev.c > >> +++ b/net/core/dev.c > >> @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, > >> features &= ~NETIF_F_ALL_TSO; > >> } > >> > >> + /* UFO...

...packets now can't do IPv6 UFO since there is no VIRTIO_NET_HDR_GSO_UDPV6 yet. I suppose we could do something similar there as we do in tun code/macvtap code. If that's the case, it currently broken as well. -vlad > >> diff --git a/net/core/dev.c b/net/core/dev.c >> index 945bbd0..fa4d2ee 100644 >> --- a/net/core/dev.c >> +++ b/net/core/dev.c >> @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, >> features &= ~NETIF_F_ALL_TSO; >> } >> >> + /* UFO requires that SG is present as wel...

...packets now can't do IPv6 UFO since there is no VIRTIO_NET_HDR_GSO_UDPV6 yet. I suppose we could do something similar there as we do in tun code/macvtap code. If that's the case, it currently broken as well. -vlad > >> diff --git a/net/core/dev.c b/net/core/dev.c >> index 945bbd0..fa4d2ee 100644 >> --- a/net/core/dev.c >> +++ b/net/core/dev.c >> @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, >> features &= ~NETIF_F_ALL_TSO; >> } >> >> + /* UFO requires that SG is present as wel...

...tap/packet socket with > virtio device. > > > 4. > As a next step, we should add a way for userspace > to tell us that it has ids and can handle them. > > > > > >>> >>>> diff --git a/net/core/dev.c b/net/core/dev.c >>>> index 945bbd0..fa4d2ee 100644 >>>> --- a/net/core/dev.c >>>> +++ b/net/core/dev.c >>>> @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, >>>> features &= ~NETIF_F_ALL_TSO; >>>> } >>>> >...

...tap/packet socket with > virtio device. > > > 4. > As a next step, we should add a way for userspace > to tell us that it has ids and can handle them. > > > > > >>> >>>> diff --git a/net/core/dev.c b/net/core/dev.c >>>> index 945bbd0..fa4d2ee 100644 >>>> --- a/net/core/dev.c >>>> +++ b/net/core/dev.c >>>> @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, >>>> features &= ~NETIF_F_ALL_TSO; >>>> } >>>> >...

...> > 4. > > As a next step, we should add a way for userspace > > to tell us that it has ids and can handle them. > > > > > > > > > > > >>> > >>>> diff --git a/net/core/dev.c b/net/core/dev.c > >>>> index 945bbd0..fa4d2ee 100644 > >>>> --- a/net/core/dev.c > >>>> +++ b/net/core/dev.c > >>>> @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, > >>>> features &= ~NETIF_F_ALL_TSO; > >>>>...

...> > 4. > > As a next step, we should add a way for userspace > > to tell us that it has ids and can handle them. > > > > > > > > > > > >>> > >>>> diff --git a/net/core/dev.c b/net/core/dev.c > >>>> index 945bbd0..fa4d2ee 100644 > >>>> --- a/net/core/dev.c > >>>> +++ b/net/core/dev.c > >>>> @@ -5929,6 +5929,12 @@ static netdev_features_t netdev_fix_features(struct net_device *dev, > >>>> features &= ~NETIF_F_ALL_TSO; > >>>>...

UFO support in the kernel applies to both IPv4 and IPv6 protocols with the same device feature. However some devices may not be able to support one of the offloads. For this we split the UFO offload feature into 2 pieces. NETIF_F_UFO now controlls the IPv4 part and this series introduces NETIF_F_UFO6. As a result of this work, we can now re-enable NETIF_F_UFO on virtio_net devices and restore

UFO support in the kernel applies to both IPv4 and IPv6 protocols with the same device feature. However some devices may not be able to support one of the offloads. For this we split the UFO offload feature into 2 pieces. NETIF_F_UFO now controlls the IPv4 part and this series introduces NETIF_F_UFO6. As a result of this work, we can now re-enable NETIF_F_UFO on virtio_net devices and restore