diff mbox series

[1/2] virtio-net: don't disable guest csum when disable LRO

Message ID 20200928033915.82810-1-xiangxia.m.yue@gmail.com
State New
Headers show
Series [1/2] virtio-net: don't disable guest csum when disable LRO | expand

Commit Message

Tonghao Zhang Sept. 28, 2020, 3:39 a.m. UTC
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>

Open vSwitch and Linux bridge will disable LRO of the interface
when this interface added to them. Now when disable the LRO, the
virtio-net csum is disable too. That drops the forwarding performance.

Fixes: e59ff2c49ae1 ("virtio-net: disable guest csum during XDP set")
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Willem de Bruijn <willemb@google.com>
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
---
 drivers/net/virtio_net.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Willem de Bruijn Sept. 28, 2020, 8:34 a.m. UTC | #1
On Mon, Sep 28, 2020 at 5:41 AM <xiangxia.m.yue@gmail.com> wrote:
>
> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
>
> Open vSwitch and Linux bridge will disable LRO of the interface
> when this interface added to them. Now when disable the LRO, the
> virtio-net csum is disable too. That drops the forwarding performance.
>
> Fixes: e59ff2c49ae1 ("virtio-net: disable guest csum during XDP set")

Patch looks fine to me, but wrong commit here?

That commit disables csum on purpose when enabling xdp with ndp_bpf.

This patch refines disabling LRO with ndo_set_features.

The relevant commit is a02e8964eaf9 ("virtio-net: ethtool configurable LRO").

If this is a fix, it should target [PATCH net] separately from the
second patch in the patchset, which is a new feature and targets
[PATCH net-next]. They can arguably target net-next together, but then
it should not have a fixes tag.

> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Cc: Willem de Bruijn <willemb@google.com>
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> ---
>  drivers/net/virtio_net.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 7145c83c6c8c..21b71148c532 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -63,6 +63,11 @@ static const unsigned long guest_offloads[] = {
>         VIRTIO_NET_F_GUEST_CSUM
>  };
>
> +#define GUEST_OFFLOAD_LRO_MASK ((1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
> +                               (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
> +                               (1ULL << VIRTIO_NET_F_GUEST_ECN)  | \
> +                               (1ULL << VIRTIO_NET_F_GUEST_UFO))
> +
>  struct virtnet_stat_desc {
>         char desc[ETH_GSTRING_LEN];
>         size_t offset;
> @@ -2531,7 +2536,8 @@ static int virtnet_set_features(struct net_device *dev,
>                 if (features & NETIF_F_LRO)
>                         offloads = vi->guest_offloads_capable;
>                 else
> -                       offloads = 0;
> +                       offloads = vi->guest_offloads_capable &
> +                                  ~GUEST_OFFLOAD_LRO_MASK;
>
>                 err = virtnet_set_guest_offloads(vi, offloads);
>                 if (err)
> --
> 2.23.0
>
Tonghao Zhang Sept. 28, 2020, 9:21 a.m. UTC | #2
On Mon, Sep 28, 2020 at 4:35 PM Willem de Bruijn
<willemdebruijn.kernel@gmail.com> wrote:
>
> On Mon, Sep 28, 2020 at 5:41 AM <xiangxia.m.yue@gmail.com> wrote:
> >
> > From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> >
> > Open vSwitch and Linux bridge will disable LRO of the interface
> > when this interface added to them. Now when disable the LRO, the
> > virtio-net csum is disable too. That drops the forwarding performance.
> >
> > Fixes: e59ff2c49ae1 ("virtio-net: disable guest csum during XDP set")
>
> Patch looks fine to me, but wrong commit here?
Yes, I will change the tag.
> That commit disables csum on purpose when enabling xdp with ndp_bpf.
>
> This patch refines disabling LRO with ndo_set_features.
>
> The relevant commit is a02e8964eaf9 ("virtio-net: ethtool configurable LRO").
>
> If this is a fix, it should target [PATCH net] separately from the
> second patch in the patchset, which is a new feature and targets
> [PATCH net-next]. They can arguably target net-next together, but then
> it should not have a fixes tag.
Thanks, I will send first patch for net, and next one to net-next.
>
> > Cc: Michael S. Tsirkin <mst@redhat.com>
> > Cc: Jason Wang <jasowang@redhat.com>
> > Cc: Willem de Bruijn <willemb@google.com>
> > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> > ---
> >  drivers/net/virtio_net.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > index 7145c83c6c8c..21b71148c532 100644
> > --- a/drivers/net/virtio_net.c
> > +++ b/drivers/net/virtio_net.c
> > @@ -63,6 +63,11 @@ static const unsigned long guest_offloads[] = {
> >         VIRTIO_NET_F_GUEST_CSUM
> >  };
> >
> > +#define GUEST_OFFLOAD_LRO_MASK ((1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
> > +                               (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
> > +                               (1ULL << VIRTIO_NET_F_GUEST_ECN)  | \
> > +                               (1ULL << VIRTIO_NET_F_GUEST_UFO))
> > +
> >  struct virtnet_stat_desc {
> >         char desc[ETH_GSTRING_LEN];
> >         size_t offset;
> > @@ -2531,7 +2536,8 @@ static int virtnet_set_features(struct net_device *dev,
> >                 if (features & NETIF_F_LRO)
> >                         offloads = vi->guest_offloads_capable;
> >                 else
> > -                       offloads = 0;
> > +                       offloads = vi->guest_offloads_capable &
> > +                                  ~GUEST_OFFLOAD_LRO_MASK;
> >
> >                 err = virtnet_set_guest_offloads(vi, offloads);
> >                 if (err)
> > --
> > 2.23.0
> >
Michael S. Tsirkin Sept. 28, 2020, 7:21 p.m. UTC | #3
On Mon, Sep 28, 2020 at 11:39:14AM +0800, xiangxia.m.yue@gmail.com wrote:
> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>

> 

> Open vSwitch and Linux bridge will disable LRO of the interface

> when this interface added to them. Now when disable the LRO, the

> virtio-net csum is disable too. That drops the forwarding performance.

> 

> Fixes: e59ff2c49ae1 ("virtio-net: disable guest csum during XDP set")


I am a bit confused by this tag. Did this change bring about
disabling checksum when LRO is disabled? I am not sure
I follow how ...

> Cc: Michael S. Tsirkin <mst@redhat.com>

> Cc: Jason Wang <jasowang@redhat.com>

> Cc: Willem de Bruijn <willemb@google.com>

> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>

> ---

>  drivers/net/virtio_net.c | 8 +++++++-

>  1 file changed, 7 insertions(+), 1 deletion(-)

> 

> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c

> index 7145c83c6c8c..21b71148c532 100644

> --- a/drivers/net/virtio_net.c

> +++ b/drivers/net/virtio_net.c

> @@ -63,6 +63,11 @@ static const unsigned long guest_offloads[] = {

>  	VIRTIO_NET_F_GUEST_CSUM

>  };

>  

> +#define GUEST_OFFLOAD_LRO_MASK ((1ULL << VIRTIO_NET_F_GUEST_TSO4) | \

> +				(1ULL << VIRTIO_NET_F_GUEST_TSO6) | \

> +				(1ULL << VIRTIO_NET_F_GUEST_ECN)  | \

> +				(1ULL << VIRTIO_NET_F_GUEST_UFO))

> +

>  struct virtnet_stat_desc {

>  	char desc[ETH_GSTRING_LEN];

>  	size_t offset;

> @@ -2531,7 +2536,8 @@ static int virtnet_set_features(struct net_device *dev,

>  		if (features & NETIF_F_LRO)

>  			offloads = vi->guest_offloads_capable;

>  		else

> -			offloads = 0;

> +			offloads = vi->guest_offloads_capable &

> +				   ~GUEST_OFFLOAD_LRO_MASK;

>  

>  		err = virtnet_set_guest_offloads(vi, offloads);

>  		if (err)

> -- 

> 2.23.0
Tonghao Zhang Sept. 29, 2020, 1:40 a.m. UTC | #4
On Tue, Sep 29, 2020 at 3:21 AM Michael S. Tsirkin <mst@redhat.com> wrote:
>
> On Mon, Sep 28, 2020 at 11:39:14AM +0800, xiangxia.m.yue@gmail.com wrote:
> > From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> >
> > Open vSwitch and Linux bridge will disable LRO of the interface
> > when this interface added to them. Now when disable the LRO, the
> > virtio-net csum is disable too. That drops the forwarding performance.
> >
> > Fixes: e59ff2c49ae1 ("virtio-net: disable guest csum during XDP set")
>
> I am a bit confused by this tag. Did this change bring about
> disabling checksum when LRO is disabled? I am not sure
> I follow how ...
Hi Michael
It's not right fix tag.
The commit a02e8964eaf9 ("virtio-net: ethtool configurable LRO"),
disable the csum, when we disable the LRO

> > Cc: Michael S. Tsirkin <mst@redhat.com>
> > Cc: Jason Wang <jasowang@redhat.com>
> > Cc: Willem de Bruijn <willemb@google.com>
> > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> > ---
> >  drivers/net/virtio_net.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > index 7145c83c6c8c..21b71148c532 100644
> > --- a/drivers/net/virtio_net.c
> > +++ b/drivers/net/virtio_net.c
> > @@ -63,6 +63,11 @@ static const unsigned long guest_offloads[] = {
> >       VIRTIO_NET_F_GUEST_CSUM
> >  };
> >
> > +#define GUEST_OFFLOAD_LRO_MASK ((1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
> > +                             (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
> > +                             (1ULL << VIRTIO_NET_F_GUEST_ECN)  | \
> > +                             (1ULL << VIRTIO_NET_F_GUEST_UFO))
> > +
> >  struct virtnet_stat_desc {
> >       char desc[ETH_GSTRING_LEN];
> >       size_t offset;
> > @@ -2531,7 +2536,8 @@ static int virtnet_set_features(struct net_device *dev,
> >               if (features & NETIF_F_LRO)
> >                       offloads = vi->guest_offloads_capable;
> >               else
> > -                     offloads = 0;
> > +                     offloads = vi->guest_offloads_capable &
> > +                                ~GUEST_OFFLOAD_LRO_MASK;
> >
> >               err = virtnet_set_guest_offloads(vi, offloads);
> >               if (err)
> > --
> > 2.23.0
>
Michael S. Tsirkin Sept. 29, 2020, 5:56 a.m. UTC | #5
On Tue, Sep 29, 2020 at 09:40:22AM +0800, Tonghao Zhang wrote:
> On Tue, Sep 29, 2020 at 3:21 AM Michael S. Tsirkin <mst@redhat.com> wrote:
> >
> > On Mon, Sep 28, 2020 at 11:39:14AM +0800, xiangxia.m.yue@gmail.com wrote:
> > > From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> > >
> > > Open vSwitch and Linux bridge will disable LRO of the interface
> > > when this interface added to them. Now when disable the LRO, the
> > > virtio-net csum is disable too. That drops the forwarding performance.
> > >
> > > Fixes: e59ff2c49ae1 ("virtio-net: disable guest csum during XDP set")
> >
> > I am a bit confused by this tag. Did this change bring about
> > disabling checksum when LRO is disabled? I am not sure
> > I follow how ...
> Hi Michael
> It's not right fix tag.
> The commit a02e8964eaf9 ("virtio-net: ethtool configurable LRO"),
> disable the csum, when we disable the LRO

OK then, pls send a correct Fixes tag when you repost this ...

> > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > Cc: Jason Wang <jasowang@redhat.com>
> > > Cc: Willem de Bruijn <willemb@google.com>
> > > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> > > ---
> > >  drivers/net/virtio_net.c | 8 +++++++-
> > >  1 file changed, 7 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > > index 7145c83c6c8c..21b71148c532 100644
> > > --- a/drivers/net/virtio_net.c
> > > +++ b/drivers/net/virtio_net.c
> > > @@ -63,6 +63,11 @@ static const unsigned long guest_offloads[] = {
> > >       VIRTIO_NET_F_GUEST_CSUM
> > >  };
> > >
> > > +#define GUEST_OFFLOAD_LRO_MASK ((1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
> > > +                             (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
> > > +                             (1ULL << VIRTIO_NET_F_GUEST_ECN)  | \
> > > +                             (1ULL << VIRTIO_NET_F_GUEST_UFO))
> > > +
> > >  struct virtnet_stat_desc {
> > >       char desc[ETH_GSTRING_LEN];
> > >       size_t offset;
> > > @@ -2531,7 +2536,8 @@ static int virtnet_set_features(struct net_device *dev,
> > >               if (features & NETIF_F_LRO)
> > >                       offloads = vi->guest_offloads_capable;
> > >               else
> > > -                     offloads = 0;
> > > +                     offloads = vi->guest_offloads_capable &
> > > +                                ~GUEST_OFFLOAD_LRO_MASK;
> > >
> > >               err = virtnet_set_guest_offloads(vi, offloads);
> > >               if (err)
> > > --
> > > 2.23.0
> >
> 
> 
> -- 
> Best regards, Tonghao
Tonghao Zhang Sept. 29, 2020, 6:01 a.m. UTC | #6
On Tue, Sep 29, 2020 at 1:57 PM Michael S. Tsirkin <mst@redhat.com> wrote:
>

> On Tue, Sep 29, 2020 at 09:40:22AM +0800, Tonghao Zhang wrote:

> > On Tue, Sep 29, 2020 at 3:21 AM Michael S. Tsirkin <mst@redhat.com> wrote:

> > >

> > > On Mon, Sep 28, 2020 at 11:39:14AM +0800, xiangxia.m.yue@gmail.com wrote:

> > > > From: Tonghao Zhang <xiangxia.m.yue@gmail.com>

> > > >

> > > > Open vSwitch and Linux bridge will disable LRO of the interface

> > > > when this interface added to them. Now when disable the LRO, the

> > > > virtio-net csum is disable too. That drops the forwarding performance.

> > > >

> > > > Fixes: e59ff2c49ae1 ("virtio-net: disable guest csum during XDP set")

> > >

> > > I am a bit confused by this tag. Did this change bring about

> > > disabling checksum when LRO is disabled? I am not sure

> > > I follow how ...

> > Hi Michael

> > It's not right fix tag.

> > The commit a02e8964eaf9 ("virtio-net: ethtool configurable LRO"),

> > disable the csum, when we disable the LRO

>

> OK then, pls send a correct Fixes tag when you repost this ...

Hi Michael
I repost this patch, please review. thanks.
http://patchwork.ozlabs.org/project/netdev/patch/20200929015806.19171-1-xiangxia.m.yue@gmail.com/
> > > > Cc: Michael S. Tsirkin <mst@redhat.com>

> > > > Cc: Jason Wang <jasowang@redhat.com>

> > > > Cc: Willem de Bruijn <willemb@google.com>

> > > > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>

> > > > ---

> > > >  drivers/net/virtio_net.c | 8 +++++++-

> > > >  1 file changed, 7 insertions(+), 1 deletion(-)

> > > >

> > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c

> > > > index 7145c83c6c8c..21b71148c532 100644

> > > > --- a/drivers/net/virtio_net.c

> > > > +++ b/drivers/net/virtio_net.c

> > > > @@ -63,6 +63,11 @@ static const unsigned long guest_offloads[] = {

> > > >       VIRTIO_NET_F_GUEST_CSUM

> > > >  };

> > > >

> > > > +#define GUEST_OFFLOAD_LRO_MASK ((1ULL << VIRTIO_NET_F_GUEST_TSO4) | \

> > > > +                             (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \

> > > > +                             (1ULL << VIRTIO_NET_F_GUEST_ECN)  | \

> > > > +                             (1ULL << VIRTIO_NET_F_GUEST_UFO))

> > > > +

> > > >  struct virtnet_stat_desc {

> > > >       char desc[ETH_GSTRING_LEN];

> > > >       size_t offset;

> > > > @@ -2531,7 +2536,8 @@ static int virtnet_set_features(struct net_device *dev,

> > > >               if (features & NETIF_F_LRO)

> > > >                       offloads = vi->guest_offloads_capable;

> > > >               else

> > > > -                     offloads = 0;

> > > > +                     offloads = vi->guest_offloads_capable &

> > > > +                                ~GUEST_OFFLOAD_LRO_MASK;

> > > >

> > > >               err = virtnet_set_guest_offloads(vi, offloads);

> > > >               if (err)

> > > > --

> > > > 2.23.0

> > >

> >

> >

> > --

> > Best regards, Tonghao

>



-- 
Best regards, Tonghao
diff mbox series

Patch

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 7145c83c6c8c..21b71148c532 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -63,6 +63,11 @@  static const unsigned long guest_offloads[] = {
 	VIRTIO_NET_F_GUEST_CSUM
 };
 
+#define GUEST_OFFLOAD_LRO_MASK ((1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
+				(1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
+				(1ULL << VIRTIO_NET_F_GUEST_ECN)  | \
+				(1ULL << VIRTIO_NET_F_GUEST_UFO))
+
 struct virtnet_stat_desc {
 	char desc[ETH_GSTRING_LEN];
 	size_t offset;
@@ -2531,7 +2536,8 @@  static int virtnet_set_features(struct net_device *dev,
 		if (features & NETIF_F_LRO)
 			offloads = vi->guest_offloads_capable;
 		else
-			offloads = 0;
+			offloads = vi->guest_offloads_capable &
+				   ~GUEST_OFFLOAD_LRO_MASK;
 
 		err = virtnet_set_guest_offloads(vi, offloads);
 		if (err)