From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Sender: List-Post: List-Help: List-Unsubscribe: List-Subscribe: Received: from lists.oasis-open.org (oasis-open.org [10.110.1.242]) by lists.oasis-open.org (Postfix) with ESMTP id 6D3279864CE for ; Thu, 1 Sep 2022 02:11:09 +0000 (UTC) From: Gavin Li Date: Thu, 1 Sep 2022 05:10:37 +0300 Message-ID: <20220901021038.84751-2-gavinl@nvidia.com> In-Reply-To: <20220901021038.84751-1-gavinl@nvidia.com> References: <20220901021038.84751-1-gavinl@nvidia.com> MIME-Version: 1.0 Subject: [virtio-dev] [PATCH v5 1/2] virtio-net: introduce and use helper function for guest gso support checks Content-Type: text/plain Content-Transfer-Encoding: quoted-printable To: stephen@networkplumber.org, davem@davemloft.net, jesse.brandeburg@intel.com, alexander.h.duyck@intel.com, kuba@kernel.org, sridhar.samudrala@intel.com, jasowang@redhat.com, loseweigh@gmail.com, netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org, mst@redhat.com Cc: gavi@nvidia.com, parav@nvidia.com, Xuan Zhuo , Si-Wei Liu List-ID: Probe routine is already several hundred lines. Use helper function for guest gso support check. Signed-off-by: Gavin Li Reviewed-by: Gavi Teitz Reviewed-by: Parav Pandit Reviewed-by: Xuan Zhuo Reviewed-by: Si-Wei Liu --- 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 9cce7dec7366..f831a0290998 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3682,6 +3682,14 @@ static int virtnet_validate(struct virtio_device *vd= ev) =09return 0; } =20 +static bool virtnet_check_guest_gso(const struct virtnet_info *vi) +{ +=09return virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) || +=09=09virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) || +=09=09virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) || +=09=09virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO); +} + static int virtnet_probe(struct virtio_device *vdev) { =09int i, err =3D -ENOMEM; @@ -3777,10 +3785,7 @@ static int virtnet_probe(struct virtio_device *vdev) =09spin_lock_init(&vi->refill_lock); =20 =09/* If we can receive ANY GSO packets, we must allocate large ones. */ -=09if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) || -=09 virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6) || -=09 virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_ECN) || -=09 virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_UFO)) +=09if (virtnet_check_guest_gso(vi)) =09=09vi->big_packets =3D true; =20 =09if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) --=20 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