在 2022/9/14 22:49, Gavin Li 写道:
Probe routine is already several hundred lines. Use helper function for guest gso support check. Signed-off-by: Gavin Li <gav...@nvidia.com> Reviewed-by: Gavi Teitz <g...@nvidia.com> Reviewed-by: Parav Pandit <pa...@nvidia.com> Reviewed-by: Xuan Zhuo <xuanz...@linux.alibaba.com> Reviewed-by: Si-Wei Liu <si-wei....@oracle.com>
Acked-by: Jason Wang <jasow...@redhat.com>
--- changelog: v4->v5 - Addressed comments from Michael S. Tsirkin - Remove unnecessary () in return clause 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 e0e57083d442..f54c7182758f 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))
--------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscr...@lists.oasis-open.org For additional commands, e-mail: virtio-dev-h...@lists.oasis-open.org
