Re: [PATCH v3 1/2] virtio-net: introduce and use helper function for guest gso support checks
From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Date: 2022-08-30 02:31:25
Also in:
virtualization
On Tue, 30 Aug 2022 05:26:33 +0300, Gavin Li [off-list ref] wrote:
Probe routine is already several hundred lines. Use helper function for guest gso support check. Signed-off-by: Gavin Li <redacted> Reviewed-by: Gavi Teitz <redacted> Reviewed-by: Parav Pandit <redacted>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
quoted hunk ↗ jump to hunk
--- changelog: v1->v2 - Add new patch --- drivers/net/virtio_net.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9cce7dec7366..e1904877d461 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c@@ -3682,6 +3682,14 @@ static int virtnet_validate(struct virtio_device *vdev) return 0; } +static bool virtnet_check_guest_gso(const struct virtnet_info *vi) +{ + return (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) || + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) || + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) || + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO)); +} + static int virtnet_probe(struct virtio_device *vdev) { int i, err = -ENOMEM;@@ -3777,10 +3785,7 @@ static int virtnet_probe(struct virtio_device *vdev) spin_lock_init(&vi->refill_lock); /* If we can receive ANY GSO packets, we must allocate large ones. */ - if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) || - virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6) || - virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_ECN) || - virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_UFO)) + if (virtnet_check_guest_gso(vi)) vi->big_packets = true; if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) --2.31.1