From nobody Mon Nov 25 06:54:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717486827; cv=none; d=zohomail.com; s=zohoarc; b=AENEGGUMSEN5GrsfKifeBzC6kZYN5/hV7hS7kTDTSjn0eNZe23KWHYMaAdUHMGjsyh3u+hF3oZCdOwW1sxxJMv7K0/pO4bpWDSi0PhjERRUS8Pb4C5wccW2MeaRfyT4dzMmr4l0k5ZOeoeMR4yaQM70m4PIP3eYSTGMeCB0V4M0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717486827; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0JPRWRRBwxoHu/Tfem0d42bs37BKchShstqpvaaRgSI=; b=CvaXh97gV2AuZElG4rZMpp+q6QKbUN6y2T4f0qw7bvXukLWikRMR26nb0zpVFchFCme6w/bJBn1rEOxBriJzQvyI/5uKAP2lSwgEv2IpOIUKdI2XYhqXTGhV+ZrijVCBCoCwtUdgZeIXe+V0imLxUJ97Vsd4MHsn6nMA7YmW1Pg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717486827888266.2855742798489; Tue, 4 Jun 2024 00:40:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEOkp-0000NB-Aq; Tue, 04 Jun 2024 03:38:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEOkd-0000BF-Ie for qemu-devel@nongnu.org; Tue, 04 Jun 2024 03:38:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEOkb-0006L9-Rk for qemu-devel@nongnu.org; Tue, 04 Jun 2024 03:38:35 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-HSe-vadTP8WqhUxHQe0zlg-1; Tue, 04 Jun 2024 03:38:27 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9FB50811E8D; Tue, 4 Jun 2024 07:38:27 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9CA2492BD4; Tue, 4 Jun 2024 07:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717486712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0JPRWRRBwxoHu/Tfem0d42bs37BKchShstqpvaaRgSI=; b=EiV9Hm8D8FZBPoFKo+AWWP/grU95W0waZ/E0V4CKCWJLMlcjNiNpZWk4OlMmNnEN9l0RTG y/+pYD1qhXFs6fRholbh0gqbDg3TUkJXh7a3l1iVyz+ClsnN0vxAy1/RRI2bnC1YsQD77j X7Arqod9G+0LHSw0N0wQtheeUT8TFks= X-MC-Unique: HSe-vadTP8WqhUxHQe0zlg-1 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Akihiko Odaki , Jason Wang Subject: [PULL 09/20] virtio-net: Copy header only when necessary Date: Tue, 4 Jun 2024 15:37:44 +0800 Message-ID: <20240604073755.1859-10-jasowang@redhat.com> In-Reply-To: <20240604073755.1859-1-jasowang@redhat.com> References: <20240604073755.1859-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717486828309100001 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki The copied header is only used for byte swapping. Signed-off-by: Akihiko Odaki Signed-off-by: Jason Wang --- hw/net/virtio-net.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index a8db8bfd9c..13a17a1e5a 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -360,7 +360,8 @@ static void virtio_net_vnet_endian_status(VirtIONet *n,= uint8_t status) * can't do it, we fallback onto fixing the headers in the core * virtio-net code. */ - n->needs_vnet_hdr_swap =3D virtio_net_set_vnet_endian(vdev, n->nic= ->ncs, + n->needs_vnet_hdr_swap =3D n->has_vnet_hdr && + virtio_net_set_vnet_endian(vdev, n->nic->= ncs, queue_pairs, t= rue); } else if (virtio_net_started(n, vdev->status)) { /* After using the device, we need to reset the network backend to @@ -2751,7 +2752,7 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q) return -EINVAL; } =20 - if (n->has_vnet_hdr) { + if (n->needs_vnet_hdr_swap) { if (iov_to_buf(out_sg, out_num, 0, &vhdr, n->guest_hdr_len) < n->guest_hdr_len) { virtio_error(vdev, "virtio-net header incorrect"); @@ -2759,19 +2760,16 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *= q) g_free(elem); return -EINVAL; } - if (n->needs_vnet_hdr_swap) { - virtio_net_hdr_swap(vdev, (void *) &vhdr); - sg2[0].iov_base =3D &vhdr; - sg2[0].iov_len =3D n->guest_hdr_len; - out_num =3D iov_copy(&sg2[1], ARRAY_SIZE(sg2) - 1, - out_sg, out_num, - n->guest_hdr_len, -1); - if (out_num =3D=3D VIRTQUEUE_MAX_SIZE) { - goto drop; - } - out_num +=3D 1; - out_sg =3D sg2; + virtio_net_hdr_swap(vdev, (void *) &vhdr); + sg2[0].iov_base =3D &vhdr; + sg2[0].iov_len =3D n->guest_hdr_len; + out_num =3D iov_copy(&sg2[1], ARRAY_SIZE(sg2) - 1, out_sg, out= _num, + n->guest_hdr_len, -1); + if (out_num =3D=3D VIRTQUEUE_MAX_SIZE) { + goto drop; } + out_num +=3D 1; + out_sg =3D sg2; } /* * If host wants to see the guest header as is, we can --=20 2.42.0