From nobody Wed Dec 17 21:45:42 2025 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=1592486743; cv=none; d=zohomail.com; s=zohoarc; b=NIJKEWRsF8rDw4M9TB3Np4UAynlZgy6Nx+2bN+wDCM1x70Cj0svi2SaOwweNUlxfKL2Qfwbmn3HV/hPMozdMuceGe9xJMBtAJafD/WXw8XgdIAfuNc5Tnku0D9sSldcjKysK0ptr5jvD1f2jKVKuyg181+Jy6JQ7B6xeqOqGkhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592486743; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=0bs/XqiKZ782G7HswOHdTr6cBBXiTONRsQ1okp2l69o=; b=JjrmTLFYM/8L7ospZTG8y3lXwo3G3LYkSTFjcMKyS1mFM6nBBIjZGiyW+r+o5nYuLVm0drx3MBZskPxmz5nXYbUFHX4rc/RUH/7zAzGUVi0aJ+es7BURdnk0LbGJeRxTBtDoSZA+rUxMpDhQ9lmfvwYi91xAOtSJPH9YV3pdOV4= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592486743860454.935850577735; Thu, 18 Jun 2020 06:25:43 -0700 (PDT) Received: from localhost ([::1]:46630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jluY2-0002zi-TM for importer@patchew.org; Thu, 18 Jun 2020 09:25:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jluUw-00059g-BV for qemu-devel@nongnu.org; Thu, 18 Jun 2020 09:22:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46109 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jluUu-0005k9-OV for qemu-devel@nongnu.org; Thu, 18 Jun 2020 09:22:30 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-35-3VjznpbSN8S7hGFJBUdvsQ-1; Thu, 18 Jun 2020 09:22:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F77C100CC8B; Thu, 18 Jun 2020 13:22:25 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-109.pek2.redhat.com [10.72.12.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE39C5BAC2; Thu, 18 Jun 2020 13:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592486548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=0bs/XqiKZ782G7HswOHdTr6cBBXiTONRsQ1okp2l69o=; b=VFBIeEeNsi7JzhAwcpzzFxZXfaIAXtA101T8jpecx/XZvC6MOeIYbIcIUa9GQsypW092Yk /hMoZ2feK/KOdyivfglJaBAe0c6k1KCRFuSSqjnzHeeCvNt6jRyomDhv0Bcx0V0M0JYbaS QezOUKMrU43JM8GQl/hltDhrWbhcFeo= X-MC-Unique: 3VjznpbSN8S7hGFJBUdvsQ-1 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL V2 07/33] virtio-net: align RSC fields with updated virtio-net header Date: Thu, 18 Jun 2020 21:21:22 +0800 Message-Id: <1592486508-6135-8-git-send-email-jasowang@redhat.com> In-Reply-To: <1592486508-6135-1-git-send-email-jasowang@redhat.com> References: <1592486508-6135-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=207.211.31.120; envelope-from=jasowang@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/18 01:47:12 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yuri Benditovich , Jason Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yuri Benditovich Removal of duplicated RSC definitions. Changing names of the fields to ones defined in the Linux header. Signed-off-by: Yuri Benditovich Signed-off-by: Jason Wang --- hw/net/virtio-net.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 2a5da29..aff67a9 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -88,26 +88,6 @@ VIRTIO_NET_RSS_HASH_TYPE_TCP_EX |= \ VIRTIO_NET_RSS_HASH_TYPE_UDP_EX) =20 -/* temporary until standard header include it */ -#if !defined(VIRTIO_NET_HDR_F_RSC_INFO) - -#define VIRTIO_NET_HDR_F_RSC_INFO 4 /* rsc_ext data in csum_ fields */ -#define VIRTIO_NET_F_RSC_EXT 61 - -#endif - -static inline __virtio16 *virtio_net_rsc_ext_num_packets( - struct virtio_net_hdr *hdr) -{ - return &hdr->csum_start; -} - -static inline __virtio16 *virtio_net_rsc_ext_num_dupacks( - struct virtio_net_hdr *hdr) -{ - return &hdr->csum_offset; -} - static VirtIOFeature feature_sizes[] =3D { {.flags =3D 1ULL << VIRTIO_NET_F_MAC, .end =3D endof(struct virtio_net_config, mac)}, @@ -1821,15 +1801,15 @@ static size_t virtio_net_rsc_drain_seg(VirtioNetRsc= Chain *chain, VirtioNetRscSeg *seg) { int ret; - struct virtio_net_hdr *h; + struct virtio_net_hdr_v1 *h; =20 - h =3D (struct virtio_net_hdr *)seg->buf; + h =3D (struct virtio_net_hdr_v1 *)seg->buf; h->flags =3D 0; h->gso_type =3D VIRTIO_NET_HDR_GSO_NONE; =20 if (seg->is_coalesced) { - *virtio_net_rsc_ext_num_packets(h) =3D seg->packets; - *virtio_net_rsc_ext_num_dupacks(h) =3D seg->dup_ack; + h->rsc.segments =3D seg->packets; + h->rsc.dup_acks =3D seg->dup_ack; h->flags =3D VIRTIO_NET_HDR_F_RSC_INFO; if (chain->proto =3D=3D ETH_P_IP) { h->gso_type =3D VIRTIO_NET_HDR_GSO_TCPV4; --=20 2.5.0