search for: netdev_fix_features

...; attempts to update the virtio-net offloads through the virtio-net > control queue. kvmtool however does not have a control queue that supports > offload changing (VIRTIO_NET_F_CTRL_GUEST_OFFLOADS is not advertised) > > The netdev features have changed due to validation checks in > netdev_fix_features(): > > if (!(features & NETIF_F_RXCSUM)) { > /* NETIF_F_GRO_HW implies doing RXCSUM since every packet > * successfully merged by hardware must also have the > * checksum verified by hardware. If the user does not > * want to enable RXCSUM, logically, we should disabl...

...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 & NETIF_F_ALL_UFO) && !(features & NETIF_F_SG)) { > + netdev_dbg(dev, "Dropping UFO features since no SG feature.\n&qu...

...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 & NETIF_F_ALL_UFO) && !(features & NETIF_F_SG)) { > + netdev_dbg(dev, "Dropping UFO features since no SG feature.\n&qu...

...es 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_CSUM) && > + !(features & NETIF_F_IP_CSUM)) { You can use !(features & NETIF_F_V4_CSUM) instead of the last two terms. >...

...es 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_CSUM) && > + !(features & NETIF_F_IP_CSUM)) { You can use !(features & NETIF_F_V4_CSUM) instead of the last two terms. >...

...kbuff.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) && !(features & NETIF_F_SG)) { + netdev_dbg(dev, "Dropping UFO features since no SG feature.\n"); + features &= ~NETI...

...kbuff.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) && !(features & NETIF_F_SG)) { + netdev_dbg(dev, "Dropping UFO features since no SG feature.\n"); + features &= ~NETI...

...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 requires that SG is present as well */ > >> + if ((features & NETIF_F_ALL_UFO) && !(features & NETIF_F_SG)) { > >> + netdev_dbg(dev,...

...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 requires that SG is present as well */ > >> + if ((features & NETIF_F_ALL_UFO) && !(features & NETIF_F_SG)) { > >> + netdev_dbg(dev,...

...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 well */ >> + if ((features & NETIF_F_ALL_UFO) && !(features & NETIF_F_SG)) { >> + netdev_dbg(dev, "Dropping UFO features s...

...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 well */ >> + if ((features & NETIF_F_ALL_UFO) && !(features & NETIF_F_SG)) { >> + netdev_dbg(dev, "Dropping UFO features s...

...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 requires that SG is present as well */ >>>> + if ((features & NETIF_F_ALL_UFO) && !(features & NETIF_F_SG)) { >>>>...

...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 requires that SG is present as well */ >>>> + if ((features & NETIF_F_ALL_UFO) && !(features & NETIF_F_SG)) { >>>>...

...> > >>> > >>>> 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) && !(features & NETIF_F...

...> > >>> > >>>> 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) && !(features & NETIF_F...

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