On 8/31/2022 9:08 PM, Michael S. Tsirkin wrote:

External email: Use caution opening links or attachments


On Wed, Aug 31, 2022 at 04:05:40PM +0300, Gavin Li wrote:

quoted

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>
Reviewed-by: Si-Wei Liu <redacted>
---
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));
+}
+

fine but can we please drop the outer ()?
they are necessary with if but not with return.

ACK

quoted

  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

---------------------------------------------------------------------
To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org
For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org