From: xiangxia.m.yue@gmail.com
To: jasowang@redhat.com, mst@redhat.com
Cc: netdev@vger.kernel.org, Willem de Bruijn <willemb@google.com>,
virtualization@lists.linux-foundation.org
Subject: [PATCH 1/2] virtio-net: don't disable guest csum when disable LRO
Date: Mon, 28 Sep 2020 11:39:14 +0800 [thread overview]
Message-ID: <20200928033915.82810-1-xiangxia.m.yue@gmail.com> (raw)
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(-)
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
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next reply other threads:[~2020-09-28 3:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 3:39 xiangxia.m.yue [this message]
2020-09-28 3:39 ` [PATCH 2/2] virtio-net: ethtool configurable RXCSUM xiangxia.m.yue
2020-09-28 8:38 ` Willem de Bruijn
2020-09-28 9:22 ` Tonghao Zhang
2020-09-28 19:25 ` Michael S. Tsirkin
2020-09-29 1:45 ` Tonghao Zhang
2020-09-29 5:55 ` Michael S. Tsirkin
2020-09-29 6:10 ` Tonghao Zhang
2020-09-29 6:22 ` Michael S. Tsirkin
2020-09-29 7:17 ` Tonghao Zhang
2020-09-29 7:25 ` Michael S. Tsirkin
2020-09-30 2:09 ` Tonghao Zhang
2020-09-28 8:34 ` [PATCH 1/2] virtio-net: don't disable guest csum when disable LRO Willem de Bruijn
2020-09-28 9:21 ` Tonghao Zhang
2020-09-28 19:21 ` Michael S. Tsirkin
2020-09-29 1:40 ` Tonghao Zhang
2020-09-29 5:56 ` Michael S. Tsirkin
2020-09-29 6:01 ` Tonghao Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928033915.82810-1-xiangxia.m.yue@gmail.com \
--to=xiangxia.m.yue@gmail.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).