From: "Michael S. Tsirkin" <mst@redhat.com>
To: xiangxia.m.yue@gmail.com
Cc: jasowang@redhat.com, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Subject: Re: [PATCH 2/2] virtio-net: ethtool configurable RXCSUM
Date: Mon, 28 Sep 2020 15:25:10 -0400 [thread overview]
Message-ID: <20200928152142-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20200928033915.82810-2-xiangxia.m.yue@gmail.com>
On Mon, Sep 28, 2020 at 11:39:15AM +0800, xiangxia.m.yue@gmail.com wrote:
> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
>
> Allow user configuring RXCSUM separately with ethtool -K,
> reusing the existing virtnet_set_guest_offloads helper
> that configures RXCSUM for XDP. This is conditional on
> VIRTIO_NET_F_CTRL_GUEST_OFFLOADS.
>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> ---
> drivers/net/virtio_net.c | 40 ++++++++++++++++++++++++++++------------
> 1 file changed, 28 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 21b71148c532..2e3af0b2c281 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -68,6 +68,8 @@ static const unsigned long guest_offloads[] = {
> (1ULL << VIRTIO_NET_F_GUEST_ECN) | \
> (1ULL << VIRTIO_NET_F_GUEST_UFO))
>
> +#define GUEST_OFFLOAD_CSUM_MASK (1ULL << VIRTIO_NET_F_GUEST_CSUM)
> +
> struct virtnet_stat_desc {
> char desc[ETH_GSTRING_LEN];
> size_t offset;
> @@ -2526,25 +2528,37 @@ static int virtnet_set_features(struct net_device *dev,
> netdev_features_t features)
> {
> struct virtnet_info *vi = netdev_priv(dev);
> - u64 offloads;
> + u64 offloads = vi->guest_offloads &
> + vi->guest_offloads_capable;
> int err;
>
> - if ((dev->features ^ features) & NETIF_F_LRO) {
> - if (vi->xdp_queue_pairs)
> - return -EBUSY;
> + /* Don't allow configuration while XDP is active. */
> + if (vi->xdp_queue_pairs)
> + return -EBUSY;
>
> + if ((dev->features ^ features) & NETIF_F_LRO) {
> if (features & NETIF_F_LRO)
> - offloads = vi->guest_offloads_capable;
> + offloads |= GUEST_OFFLOAD_LRO_MASK;
> else
> - offloads = vi->guest_offloads_capable &
> - ~GUEST_OFFLOAD_LRO_MASK;
> + offloads &= ~GUEST_OFFLOAD_LRO_MASK;
> + }
>
> - err = virtnet_set_guest_offloads(vi, offloads);
> - if (err)
> - return err;
> - vi->guest_offloads = offloads;
> + if ((dev->features ^ features) & NETIF_F_RXCSUM) {
> + if (features & NETIF_F_RXCSUM)
> + offloads |= GUEST_OFFLOAD_CSUM_MASK;
> + else
> + offloads &= ~GUEST_OFFLOAD_CSUM_MASK;
> }
>
> + if (offloads == (vi->guest_offloads &
> + vi->guest_offloads_capable))
> + return 0;
Hmm, what exactly does this do?
> +
> + err = virtnet_set_guest_offloads(vi, offloads);
> + if (err)
> + return err;
> +
> + vi->guest_offloads = offloads;
> return 0;
> }
>
> @@ -3013,8 +3027,10 @@ static int virtnet_probe(struct virtio_device *vdev)
> if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
> virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6))
> dev->features |= NETIF_F_LRO;
> - if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS))
> + if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS)) {
> + dev->hw_features |= NETIF_F_RXCSUM;
> dev->hw_features |= NETIF_F_LRO;
> + }
>
> dev->vlan_features = dev->features;
>
> --
> 2.23.0
next prev parent reply other threads:[~2020-09-28 19:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 3:39 [PATCH 1/2] virtio-net: don't disable guest csum when disable LRO xiangxia.m.yue
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 [this message]
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=20200928152142-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xiangxia.m.yue@gmail.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).