From nobody Wed May 15 18:44:51 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=partner.samsung.com ARC-Seal: i=1; a=rsa-sha256; t=1683906323; cv=none; d=zohomail.com; s=zohoarc; b=mD4TqbJa5OrXShNJAZytaxhg3tj8uz5RHQ8975KwWyR8qyfHI7TUePqFSJacKfDpdZQNubjrn9z+67Hd7JKGyXhkOXo2okMmWCIlgoasvTgq4h+7T8bEboEK7rdtqNLdF0ShqN9UFo2unVlp7EIJH7h5h3uNwlH9LP5jEAqib2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683906323; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RAdTRgkb5cVy6FP5ribk2kxIlvYd4xCVAvY0Bobfcq8=; b=PcBQH9clDSPJiNzdkDfGHRBYcQQt/PGCwwWjv6KRjS4pSLVyG8ZtsF8BdeKXnn4U27dB6WYFoKTruAeJNzosSua+a5rcyquYg3AqDHWCf7C0I6HfzqOH1OMLgcOZ7uOpbLhnEw4T9522HxRsw+XMoofmXhniZY6/CgnGoXD1bbY= 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 1683906323092846.8420271978439; Fri, 12 May 2023 08:45:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxUw4-0005Oh-BG; Fri, 12 May 2023 11:44:00 -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 1pxUw1-0005Nh-TE for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:57 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxUvy-0007jV-AA for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:57 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230512154350euoutp0296d0511ee86ecb49b9a06d149e488627~eb8tj4hSv0258602586euoutp029 for ; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230512154349eucas1p12a88176100f189bbd12857c623a34893~eb8tCUB0Q2346923469eucas1p10; Fri, 12 May 2023 15:43:49 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 91.2C.42423.5BE5E546; Fri, 12 May 2023 16:43:49 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230512154349eucas1p2b961793fa75c52b820fee1c61db66111~eb8ssfbe_2923429234eucas1p2i; Fri, 12 May 2023 15:43:49 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230512154349eusmtrp1a482b3e80698b473c02c4f9f796bc1ca~eb8sr7svT1998019980eusmtrp1y; Fri, 12 May 2023 15:43:49 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id F0.73.10549.4BE5E546; Fri, 12 May 2023 16:43:49 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230512154348eusmtip11860268d80fdc4c7caf97d5c3872648d~eb8sL-pjJ2547425474eusmtip1M; Fri, 12 May 2023 15:43:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230512154350euoutp0296d0511ee86ecb49b9a06d149e488627~eb8tj4hSv0258602586euoutp029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683906230; bh=RAdTRgkb5cVy6FP5ribk2kxIlvYd4xCVAvY0Bobfcq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H3H5QjgOgA3qDFIWgSRdrFg/mWwQDhrSLMfRTVbArThyaOQZQDdRDPiT+Oym181z5 AVCFh/J661SIErgFkPxtZ8X0tOhT0ZEcSzPzw8KOYE0Ua+Tbvhisnh6nTUXrxJU9oa wl8oQNOfWCgacZkToktaAexM9fuUBUjPmFrZRIug= X-AuditID: cbfec7f2-a51ff7000002a5b7-9a-645e5eb5a5f8 From: Tomasz Dzieciol To: qemu-devel@nongnu.org, akihiko.odaki@daynix.com Cc: sriram.yagnaraman@est.tech, jasowang@redhat.com, k.kwiecien@samsung.com, m.sochacki@samsung.com Subject: [PATCH v6 1/7] igb: remove TCP ACK detection Date: Fri, 12 May 2023 17:43:29 +0200 Message-Id: <20230512154335.2536-2-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230512154335.2536-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42LZduznOd2tcXEpBhtei1h8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujG+vNrEU3GateHflIlMD4x6WLkZODgkBE4m7jTuAbC4OIYEVjBKNsxcz QjhfGCXOP+1mhXA+M0os2DsHyOEAa/m1JQ0ivpxR4vSKlVBF7UwSN94cYwOZyyZgJvHoyzyw BhEBY4mP7eIgYWaBVImjfw6CrRYWMJVoO3uOHcRmEVCVOHt7IyuIzSvgJNH49QHUefISMy99 ZwcZwyngLDFvhRBEiaDEyZlPWCBGyks0b53NDHKChMAWDoll+44zQfS6SLz/+4YRwhaWeHV8 CzuELSNxenIP1PxyiZ9nt7FDNLcwSuyZOhmqyFri0tafYPczC2hKrN+lD/G7o8SLtlIIk0/i xltBiBP4JCZtm84MEeaV6GgTgpihI/Ft00w2iLCUxMIbdRBhD4nWFfcYJzAqzkLyyywkv8xC 2LqAkXkVo3hqaXFuemqxYV5quV5xYm5xaV66XnJ+7iZGYGo5/e/4px2Mc1991DvEyMTBeIhR goNZSYT37ZLoFCHelMTKqtSi/Pii0pzU4kOM0hwsSuK82rYnk4UE0hNLUrNTUwtSi2CyTByc Ug1Mdqu9IgtCP1ess19yYZ79zWa5uOm7mBnf9rPsDPS8vj3+ZkHDuv7pte7MWUIJj3YlsPUZ efu9VvcUf8hlJHg/8NRJtcWCOcpON7MtKib/sFd++GFbVUCZ4dtZJtdMVENWPFxxe1dW+1qh ghAJU4u/8b5LObn5DpUdCKoPu+BbnrvY79l17zd3f73atfRRyUH1VMaomKmXZZb+izb4d/ak zIHje77cP9fM4SVWZ1GUsyyv7MUBlkXv2j2VorSUvb0rcqoWnp7f/WKm7IVtBluflOqsKau7 Z7Jk5gdt+y+r9KfbXvep4Wq8ZaZrO+O+zvHjb/1OiC6NWsu3wDnPKGN+2N/g2n8/g5Jsvlh9 v3BYiaU4I9FQi7moOBEAc9H0k5wDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xu7pb4+JSDHb1Mll8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jG+vNrEU 3GateHflIlMD4x6WLkYODgkBE4lfW9K6GLk4hASWMkosOfCOrYuREyguJbGv5z87hC0s8eda FxtEUSuTxKYN68ESbAJmEo++zGMFGSQiYCrxbK8kSJhZIFPi9Kt9YHOEgcJtZ8+BlbMIqEqc vb2RFcTmFXCSaPz6gAVivrzEzEvf2UHGcAo4S8xbIQQSFgIqudm3gAmiXFDi5MwnLBDj5SWa t85mnsAoMAtJahaS1AJGplWMIqmlxbnpucWGesWJucWleel6yfm5mxiBcbDt2M/NOxjnvfqo d4iRiYPxEKMEB7OSCO/bJdEpQrwpiZVVqUX58UWlOanFhxhNgc6eyCwlmpwPjMS8knhDMwNT QxMzSwNTSzNjJXFez4KORCGB9MSS1OzU1ILUIpg+Jg5OqQYmVqbV3htT9q9amv5x77/zk044 KSwSz5+c86F1qTifV8Ab9kCb50V+fOdS2H5/OfDAfRbj8/PsT9n7il6/LfOX+DLdp6U08J+Q Uu0iqWD15Nc+C9e+ONTxq32ewvVrfhbhZtUsdZxP7mQvz21fd1W8X9Tt/uSgY9O4+5dMCzj2 rurII+mEmvvLqrbLWU/YOedAsJOPRtfTmaUh1qcnvLPQYdqYNZ9B5EWlwNn7V2Y8nvj8Zles z7e1069fN7vt3Bhm9kl+Q+zS0wtEjaVM9FPNNFOv/FXWdRE0ZOE/vbK7Ml3T2cHx0ekf2bou ptkrytqtRDSmFEhMtI7WnHyOS/zn2b1Hfzv3+Ptedl9tcPyMEktxRqKhFnNRcSIAwgWbTgwD AAA= X-CMS-MailID: 20230512154349eucas1p2b961793fa75c52b820fee1c61db66111 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230512154349eucas1p2b961793fa75c52b820fee1c61db66111 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230512154349eucas1p2b961793fa75c52b820fee1c61db66111 References: <20230512154335.2536-1-t.dzieciol@partner.samsung.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: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=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 @samsung.com) X-ZM-MESSAGEID: 1683906323763100005 TCP ACK detection is no longer present in igb. Signed-off-by: Tomasz Dzieciol Reviewed-by: Sriram Yagnaraman --- hw/net/igb_core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 96b7335b31..012eb1e1b9 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1327,11 +1327,6 @@ igb_build_rx_metadata(IGBCore *core, trace_e1000e_rx_metadata_ip_id(*ip_id); } =20 - if (l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_TCP && net_rx_pkt_is_tcp_ack(p= kt)) { - *status_flags |=3D E1000_RXD_STAT_ACK; - trace_e1000e_rx_metadata_ack(); - } - if (pkt_info) { *pkt_info =3D rss_info->enabled ? rss_info->type : 0; =20 --=20 2.25.1 From nobody Wed May 15 18:44:51 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=partner.samsung.com ARC-Seal: i=1; a=rsa-sha256; t=1683906309; cv=none; d=zohomail.com; s=zohoarc; b=mdUmnO3plnNZ9KdD73Vh6V0IZNFiHIiSSAvuyImpCRIfCfrhIjp4BUAR2BNwbZvWpGAoXBDF0M7iYPZEKyNlxTm9XIbQdef7f4jZIBk2TZAALKZ9C7I/dURUWjwapLo978q7+QD912INLqfdwyL9Wl/OjoTdgqv0+sgaw9480fk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683906309; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EWsco+cJ7x7/FUF1IEPdzJA/MQGvkaw07RGP4KOVkTE=; b=c3HMs/U8cm2PRl/N5eGXANhjbsKS0riAyYQf/UuDfsgPru+7IAVV4dEMlMfczUvROcG+p9eP9N6Vk+lKU8WYGboX9DmhYbR1FWT+tsFVPYL1eGst2MdSGvEPliw0ztPmnVD3rsY6eZbmMrPucgCHPtgBvM7Zg1ZUaTVE9aETKzQ= 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 1683906309201897.218121888626; Fri, 12 May 2023 08:45:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxUwJ-0005Sd-AS; Fri, 12 May 2023 11:44:15 -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 1pxUwI-0005SU-0c for qemu-devel@nongnu.org; Fri, 12 May 2023 11:44:14 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxUw0-0007jb-8e for qemu-devel@nongnu.org; Fri, 12 May 2023 11:44:13 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230512154350euoutp029c5c1f9a2a5ae85936479971110643ca~eb8t-rg2h0258602586euoutp02_ for ; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230512154350eucas1p1cc604b6c42b2495c6d49eb81a99ce882~eb8t3ySaW3053030530eucas1p1A; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 3C.B0.37758.6BE5E546; Fri, 12 May 2023 16:43:50 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230512154349eucas1p13a45e562689049eec9f7dbf225b682d0~eb8tOgyIa2348523485eucas1p10; Fri, 12 May 2023 15:43:49 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230512154349eusmtrp16d215e0174b5fb3a04ccedac9c3e2db6~eb8tOC9WT1998019980eusmtrp1z; Fri, 12 May 2023 15:43:49 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 81.73.10549.5BE5E546; Fri, 12 May 2023 16:43:49 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230512154349eusmtip13b1e7d8dac3c87ae0308ccea9b93b8e4~eb8sr4bZD1630116301eusmtip1E; Fri, 12 May 2023 15:43:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230512154350euoutp029c5c1f9a2a5ae85936479971110643ca~eb8t-rg2h0258602586euoutp02_ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683906230; bh=EWsco+cJ7x7/FUF1IEPdzJA/MQGvkaw07RGP4KOVkTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RShz7pdvN1nOE7+TLV4Li7m1Re7xx3HiCxGvEf8PqZM1gWe9bYIn1zbyswRttvT/E 9vtUSCRfhA4x4EUn2CnjYt2Ya2p5S7yeeTcgxYo5KACdZ/PN4h3CRIoV12u9Yc1+G2 VuJSeeX9zbr9ngcJH07bu673z3qi/zDBo82u797k= X-AuditID: cbfec7f5-7ffff7000002937e-f4-645e5eb6acd9 From: Tomasz Dzieciol To: qemu-devel@nongnu.org, akihiko.odaki@daynix.com Cc: sriram.yagnaraman@est.tech, jasowang@redhat.com, k.kwiecien@samsung.com, m.sochacki@samsung.com Subject: [PATCH v6 2/7] igb: rename E1000E_RingInfo_st Date: Fri, 12 May 2023 17:43:30 +0200 Message-Id: <20230512154335.2536-3-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230512154335.2536-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduznOd1tcXEpBo//Clp8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujAdHJjEXTIur+H9jHWsD40+vLkZODgkBE4mzb/pYuhi5OIQEVjBK3Luy lB3C+cIosXv9UjYI5zOjxIsZz1lgWhasb2KESCxnlGj938UM4bQzSbw7/JYJpIpNwEzi0Zd5 rF2MHBwiAsYSH9vFQcLMAqkSR/8cBBskDFRyeEofmM0ioCrx98AsdhCbV8BJ4v6itWwQy+Ql Zl76zg4yhlPAWWLeCiGIEkGJkzOfsECMlJdo3job7AQJgS0cEkcnzAVbKyHgInH0WRLEGGGJ V8e3sEPYMhKnJ/dA/VIu8fPsNnaI3hZGiT1TJ0MVWUtc2voTbA6zgKbE+l36EGFHiZk3mxkh xvNJ3HgrCHECn8SkbdOZIcK8Eh1tQhDVOhLfNs1kgwhLSSy8UQcR9pC41XuYfQKj4iwkv8xC 8ssshLULGJlXMYqnlhbnpqcWG+ellusVJ+YWl+al6yXn525iBCaX0/+Of93BuOLVR71DjEwc jIcYJTiYlUR43y6JThHiTUmsrEotyo8vKs1JLT7EKM3BoiTOq217MllIID2xJDU7NbUgtQgm y8TBKdXAtNb8MzP/yUOv19m1zqpl/8VjL8Akp9AbvmgHG+vVjSf+7F49ozHjrOi9v9rLZvsW KidVXU1L5BI2OTGhwOgayw23ds9VTm4+tgfOHurxTNF4s3Qtm8Y8Z5uKha2pq5+sYH51+2jw +lNHfzSWKhlwcXtLl5U9rgw8YKVZ92mB7Z+9+5p71WpmPNl4N2TJ1K7L7Sdm+eWvXh3pf/Zf m9XihI8fu2vn58lfi754bUP4jKmTp1f1Rd9+IvDo5h3r2pqkcqkS2++LX3348c9sp2fWbB1+ nVq/xBBltbQXk7L2CjVZ9h9/76JrxJPMYB11XiPf1PC2/Rx+Ll2fd3ue7ZuVtf2ARXOt/s99 lf///nx8WomlOCPRUIu5qDgRACdQrhqdAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xu7pb4+JSDNonKVp8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jAdHJjEX TIur+H9jHWsD40+vLkZODgkBE4kF65sYuxi5OIQEljJK7Ft1nB0iISWxr+c/lC0s8edaFxtE USuTxJHls1lBEmwCZhKPvswDsjk4RARMJZ7tlQQJMwtkSpx+tY8NxBYGKjk8pY8FxGYRUJX4 e2AW2ExeASeJ+4vWskHMl5eYeek7O8gYTgFniXkrhEDCQkAlN/sWMEGUC0qcnPmEBWK8vETz 1tnMExgFZiFJzUKSWsDItIpRJLW0ODc9t9hQrzgxt7g0L10vOT93EyMwErYd+7l5B+O8Vx/1 DjEycTAeYpTgYFYS4X27JDpFiDclsbIqtSg/vqg0J7X4EKMp0NkTmaVEk/OBsZhXEm9oZmBq aGJmaWBqaWasJM7rWdCRKCSQnliSmp2aWpBaBNPHxMEp1cDU8zhHvsizg6XlDNPXHzeOh/xd Yln9rUuJ8eCUukWnWh68v5BebtQp8En+7uFqseD3GpWfCj5dWPtDfsYkq4Ov+ds0S2tzzZWP v/19ekLCo/vME5l3zFiXeiDpvaC4wbXdSi+1jSWTjrFolwYkenjdYpJRP3LOqYz113yP5Nk3 TQ/GSFfeaubUSp3Scqjfp/da756s2PLyb5d/ngh4qPNq6ep9zC9WTmDw3j4j6ZFcwrXPnYV7 jvZNCtGKybxrvMjq3+7VbzKtjCT3rdqtHL7qsZijCVfLtjot2w/vWgstWqQ9PHp8qgRvLZ19 zOHp139xWtySR1gONJyzu3Lp/W2XO128EfwiD70eh27dmvNdiaU4I9FQi7moOBEAe51eBQ0D AAA= X-CMS-MailID: 20230512154349eucas1p13a45e562689049eec9f7dbf225b682d0 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230512154349eucas1p13a45e562689049eec9f7dbf225b682d0 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230512154349eucas1p13a45e562689049eec9f7dbf225b682d0 References: <20230512154335.2536-1-t.dzieciol@partner.samsung.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: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, SPF_HELO_PASS=-0.001, SPF_NONE=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 @samsung.com) X-ZM-MESSAGEID: 1683906310596100001 Rename E1000E_RingInfo_st and E1000E_RingInfo according to qemu typdefs gui= de. Signed-off-by: Tomasz Dzieciol Reviewed-by: Sriram Yagnaraman --- hw/net/e1000e_core.c | 34 +++++++++++++++++----------------- hw/net/igb_core.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 78373d7db7..b2e54fe802 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -810,24 +810,24 @@ e1000e_txdesc_writeback(E1000ECore *core, dma_addr_t = base, return e1000e_tx_wb_interrupt_cause(core, queue_idx); } =20 -typedef struct E1000E_RingInfo_st { +typedef struct E1000ERingInfo { int dbah; int dbal; int dlen; int dh; int dt; int idx; -} E1000E_RingInfo; +} E1000ERingInfo; =20 static inline bool -e1000e_ring_empty(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_empty(E1000ECore *core, const E1000ERingInfo *r) { return core->mac[r->dh] =3D=3D core->mac[r->dt] || core->mac[r->dt] >=3D core->mac[r->dlen] / E1000_RING_DESC= _LEN; } =20 static inline uint64_t -e1000e_ring_base(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_base(E1000ECore *core, const E1000ERingInfo *r) { uint64_t bah =3D core->mac[r->dbah]; uint64_t bal =3D core->mac[r->dbal]; @@ -836,13 +836,13 @@ e1000e_ring_base(E1000ECore *core, const E1000E_RingI= nfo *r) } =20 static inline uint64_t -e1000e_ring_head_descr(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_head_descr(E1000ECore *core, const E1000ERingInfo *r) { return e1000e_ring_base(core, r) + E1000_RING_DESC_LEN * core->mac[r->= dh]; } =20 static inline void -e1000e_ring_advance(E1000ECore *core, const E1000E_RingInfo *r, uint32_t c= ount) +e1000e_ring_advance(E1000ECore *core, const E1000ERingInfo *r, uint32_t co= unt) { core->mac[r->dh] +=3D count; =20 @@ -852,7 +852,7 @@ e1000e_ring_advance(E1000ECore *core, const E1000E_Ring= Info *r, uint32_t count) } =20 static inline uint32_t -e1000e_ring_free_descr_num(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_free_descr_num(E1000ECore *core, const E1000ERingInfo *r) { trace_e1000e_ring_free_space(r->idx, core->mac[r->dlen], core->mac[r->dh], core->mac[r->dt]); @@ -871,19 +871,19 @@ e1000e_ring_free_descr_num(E1000ECore *core, const E1= 000E_RingInfo *r) } =20 static inline bool -e1000e_ring_enabled(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_enabled(E1000ECore *core, const E1000ERingInfo *r) { return core->mac[r->dlen] > 0; } =20 static inline uint32_t -e1000e_ring_len(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_len(E1000ECore *core, const E1000ERingInfo *r) { return core->mac[r->dlen]; } =20 typedef struct E1000E_TxRing_st { - const E1000E_RingInfo *i; + const E1000ERingInfo *i; struct e1000e_tx *tx; } E1000E_TxRing; =20 @@ -896,7 +896,7 @@ e1000e_mq_queue_idx(int base_reg_idx, int reg_idx) static inline void e1000e_tx_ring_init(E1000ECore *core, E1000E_TxRing *txr, int idx) { - static const E1000E_RingInfo i[E1000E_NUM_QUEUES] =3D { + static const E1000ERingInfo i[E1000E_NUM_QUEUES] =3D { { TDBAH, TDBAL, TDLEN, TDH, TDT, 0 }, { TDBAH1, TDBAL1, TDLEN1, TDH1, TDT1, 1 } }; @@ -908,13 +908,13 @@ e1000e_tx_ring_init(E1000ECore *core, E1000E_TxRing *= txr, int idx) } =20 typedef struct E1000E_RxRing_st { - const E1000E_RingInfo *i; + const E1000ERingInfo *i; } E1000E_RxRing; =20 static inline void e1000e_rx_ring_init(E1000ECore *core, E1000E_RxRing *rxr, int idx) { - static const E1000E_RingInfo i[E1000E_NUM_QUEUES] =3D { + static const E1000ERingInfo i[E1000E_NUM_QUEUES] =3D { { RDBAH0, RDBAL0, RDLEN0, RDH0, RDT0, 0 }, { RDBAH1, RDBAL1, RDLEN1, RDH1, RDT1, 1 } }; @@ -930,7 +930,7 @@ e1000e_start_xmit(E1000ECore *core, const E1000E_TxRing= *txr) dma_addr_t base; struct e1000_tx_desc desc; bool ide =3D false; - const E1000E_RingInfo *txi =3D txr->i; + const E1000ERingInfo *txi =3D txr->i; uint32_t cause =3D E1000_ICS_TXQE; =20 if (!(core->mac[TCTL] & E1000_TCTL_EN)) { @@ -960,7 +960,7 @@ e1000e_start_xmit(E1000ECore *core, const E1000E_TxRing= *txr) } =20 static bool -e1000e_has_rxbufs(E1000ECore *core, const E1000E_RingInfo *r, +e1000e_has_rxbufs(E1000ECore *core, const E1000ERingInfo *r, size_t total_size) { uint32_t bufs =3D e1000e_ring_free_descr_num(core, r); @@ -1460,7 +1460,7 @@ e1000e_update_rx_stats(E1000ECore *core, size_t pkt_s= ize, size_t pkt_fcs_size) } =20 static inline bool -e1000e_rx_descr_threshold_hit(E1000ECore *core, const E1000E_RingInfo *rxi) +e1000e_rx_descr_threshold_hit(E1000ECore *core, const E1000ERingInfo *rxi) { return e1000e_ring_free_descr_num(core, rxi) =3D=3D e1000e_ring_len(core, rxi) >> core->rxbuf_min_shift; @@ -1521,7 +1521,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, struct iovec *iov =3D net_rx_pkt_get_iovec(pkt); size_t size =3D net_rx_pkt_get_total_len(pkt); size_t total_size =3D size + e1000x_fcs_len(core->mac); - const E1000E_RingInfo *rxi; + const E1000ERingInfo *rxi; size_t ps_hdr_len =3D 0; bool do_ps =3D e1000e_do_ps(core, pkt, &ps_hdr_len); bool is_first =3D true; diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 012eb1e1b9..b6031dea24 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -694,24 +694,24 @@ static uint32_t igb_rx_wb_eic(IGBCore *core, int queu= e_idx) return (ent & E1000_IVAR_VALID) ? BIT(ent & 0x1f) : 0; } =20 -typedef struct E1000E_RingInfo_st { +typedef struct E1000ERingInfo { int dbah; int dbal; int dlen; int dh; int dt; int idx; -} E1000E_RingInfo; +} E1000ERingInfo; =20 static inline bool -igb_ring_empty(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_empty(IGBCore *core, const E1000ERingInfo *r) { return core->mac[r->dh] =3D=3D core->mac[r->dt] || core->mac[r->dt] >=3D core->mac[r->dlen] / E1000_RING_DESC= _LEN; } =20 static inline uint64_t -igb_ring_base(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_base(IGBCore *core, const E1000ERingInfo *r) { uint64_t bah =3D core->mac[r->dbah]; uint64_t bal =3D core->mac[r->dbal]; @@ -720,13 +720,13 @@ igb_ring_base(IGBCore *core, const E1000E_RingInfo *r) } =20 static inline uint64_t -igb_ring_head_descr(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_head_descr(IGBCore *core, const E1000ERingInfo *r) { return igb_ring_base(core, r) + E1000_RING_DESC_LEN * core->mac[r->dh]; } =20 static inline void -igb_ring_advance(IGBCore *core, const E1000E_RingInfo *r, uint32_t count) +igb_ring_advance(IGBCore *core, const E1000ERingInfo *r, uint32_t count) { core->mac[r->dh] +=3D count; =20 @@ -736,7 +736,7 @@ igb_ring_advance(IGBCore *core, const E1000E_RingInfo *= r, uint32_t count) } =20 static inline uint32_t -igb_ring_free_descr_num(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_free_descr_num(IGBCore *core, const E1000ERingInfo *r) { trace_e1000e_ring_free_space(r->idx, core->mac[r->dlen], core->mac[r->dh], core->mac[r->dt]); @@ -755,13 +755,13 @@ igb_ring_free_descr_num(IGBCore *core, const E1000E_R= ingInfo *r) } =20 static inline bool -igb_ring_enabled(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_enabled(IGBCore *core, const E1000ERingInfo *r) { return core->mac[r->dlen] > 0; } =20 typedef struct IGB_TxRing_st { - const E1000E_RingInfo *i; + const E1000ERingInfo *i; struct igb_tx *tx; } IGB_TxRing; =20 @@ -774,7 +774,7 @@ igb_mq_queue_idx(int base_reg_idx, int reg_idx) static inline void igb_tx_ring_init(IGBCore *core, IGB_TxRing *txr, int idx) { - static const E1000E_RingInfo i[IGB_NUM_QUEUES] =3D { + static const E1000ERingInfo i[IGB_NUM_QUEUES] =3D { { TDBAH0, TDBAL0, TDLEN0, TDH0, TDT0, 0 }, { TDBAH1, TDBAL1, TDLEN1, TDH1, TDT1, 1 }, { TDBAH2, TDBAL2, TDLEN2, TDH2, TDT2, 2 }, @@ -800,13 +800,13 @@ igb_tx_ring_init(IGBCore *core, IGB_TxRing *txr, int = idx) } =20 typedef struct E1000E_RxRing_st { - const E1000E_RingInfo *i; + const E1000ERingInfo *i; } E1000E_RxRing; =20 static inline void igb_rx_ring_init(IGBCore *core, E1000E_RxRing *rxr, int idx) { - static const E1000E_RingInfo i[IGB_NUM_QUEUES] =3D { + static const E1000ERingInfo i[IGB_NUM_QUEUES] =3D { { RDBAH0, RDBAL0, RDLEN0, RDH0, RDT0, 0 }, { RDBAH1, RDBAL1, RDLEN1, RDH1, RDT1, 1 }, { RDBAH2, RDBAL2, RDLEN2, RDH2, RDT2, 2 }, @@ -833,7 +833,7 @@ igb_rx_ring_init(IGBCore *core, E1000E_RxRing *rxr, int= idx) static uint32_t igb_txdesc_writeback(IGBCore *core, dma_addr_t base, union e1000_adv_tx_desc *tx_desc, - const E1000E_RingInfo *txi) + const E1000ERingInfo *txi) { PCIDevice *d; uint32_t cmd_type_len =3D le32_to_cpu(tx_desc->read.cmd_type_len); @@ -866,7 +866,7 @@ igb_txdesc_writeback(IGBCore *core, dma_addr_t base, } =20 static inline bool -igb_tx_enabled(IGBCore *core, const E1000E_RingInfo *txi) +igb_tx_enabled(IGBCore *core, const E1000ERingInfo *txi) { bool vmdq =3D core->mac[MRQC] & 1; uint16_t qn =3D txi->idx; @@ -883,7 +883,7 @@ igb_start_xmit(IGBCore *core, const IGB_TxRing *txr) PCIDevice *d; dma_addr_t base; union e1000_adv_tx_desc desc; - const E1000E_RingInfo *txi =3D txr->i; + const E1000ERingInfo *txi =3D txr->i; uint32_t eic =3D 0; =20 if (!igb_tx_enabled(core, txi)) { @@ -918,7 +918,7 @@ igb_start_xmit(IGBCore *core, const IGB_TxRing *txr) } =20 static uint32_t -igb_rxbufsize(IGBCore *core, const E1000E_RingInfo *r) +igb_rxbufsize(IGBCore *core, const E1000ERingInfo *r) { uint32_t srrctl =3D core->mac[E1000_SRRCTL(r->idx) >> 2]; uint32_t bsizepkt =3D srrctl & E1000_SRRCTL_BSIZEPKT_MASK; @@ -930,7 +930,7 @@ igb_rxbufsize(IGBCore *core, const E1000E_RingInfo *r) } =20 static bool -igb_has_rxbufs(IGBCore *core, const E1000E_RingInfo *r, size_t total_size) +igb_has_rxbufs(IGBCore *core, const E1000ERingInfo *r, size_t total_size) { uint32_t bufs =3D igb_ring_free_descr_num(core, r); uint32_t bufsize =3D igb_rxbufsize(core, r); @@ -1522,7 +1522,7 @@ igb_write_to_rx_buffers(IGBCore *core, } =20 static void -igb_update_rx_stats(IGBCore *core, const E1000E_RingInfo *rxi, +igb_update_rx_stats(IGBCore *core, const E1000ERingInfo *rxi, size_t pkt_size, size_t pkt_fcs_size) { eth_pkt_types_e pkt_type =3D net_rx_pkt_get_packet_type(core->rx_pkt); @@ -1540,7 +1540,7 @@ igb_update_rx_stats(IGBCore *core, const E1000E_RingI= nfo *rxi, } =20 static inline bool -igb_rx_descr_threshold_hit(IGBCore *core, const E1000E_RingInfo *rxi) +igb_rx_descr_threshold_hit(IGBCore *core, const E1000ERingInfo *rxi) { return igb_ring_free_descr_num(core, rxi) =3D=3D ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; @@ -1562,7 +1562,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, struct iovec *iov =3D net_rx_pkt_get_iovec(pkt); size_t size =3D net_rx_pkt_get_total_len(pkt); size_t total_size =3D size + e1000x_fcs_len(core->mac); - const E1000E_RingInfo *rxi =3D rxr->i; + const E1000ERingInfo *rxi =3D rxr->i; size_t bufsize =3D igb_rxbufsize(core, rxi); =20 d =3D pcie_sriov_get_vf_at_index(core->owner, rxi->idx % 8); @@ -1643,7 +1643,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, } =20 static bool -igb_rx_strip_vlan(IGBCore *core, const E1000E_RingInfo *rxi) +igb_rx_strip_vlan(IGBCore *core, const E1000ERingInfo *rxi) { if (core->mac[MRQC] & 1) { uint16_t pool =3D rxi->idx % IGB_NUM_VM_POOLS; --=20 2.25.1 From nobody Wed May 15 18:44:51 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=partner.samsung.com ARC-Seal: i=1; a=rsa-sha256; t=1683906326; cv=none; d=zohomail.com; s=zohoarc; b=fEEsUB3J4cYEW8BgMORl+6lNVTSW9XtZ4mG9WI6UUxHTL9Q3y7ess8mXOBQq/uYG7pr47W2z+zdqKauosnA18WS9htRZcW7fWtbuB2HdMK9Yy4mbvVx5tH7KPWnUOnj+Rri4NqvU8kA2T+qJ/njg5NNyH7rCSjcLYPN78ZlJ4Ig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683906326; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=84Izyxtoe0ZLd4hkuj/7JIPXuyS7G7dsSIvL3JsJP94=; b=J7JYCapGxnbz7ck/8f8AvQu94rpAEPeigQdrskBHfaZxY2UH3E7WPGHFmGiNqnlLPUSFUYTdYizGJEXdYq9fQ9EtFqkUbotO9M8ZBZoS8pENXDZMPth1Z2L6Fh9Ud/hVcxq6bKYMrJGQ/izaYqy9xp9lZ8zVqmPkvW6gqYcrnck= 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 1683906326178839.0487565835849; Fri, 12 May 2023 08:45:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxUw7-0005SA-Ln; Fri, 12 May 2023 11:44:03 -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 1pxUw4-0005QN-Sw for qemu-devel@nongnu.org; Fri, 12 May 2023 11:44:00 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxUw0-0007jd-8b for qemu-devel@nongnu.org; Fri, 12 May 2023 11:44:00 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230512154350euoutp02b701aab844d5f17d6176d0e3acf2c4a5~eb8uM7XRr0202602026euoutp02M for ; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230512154350eucas1p280ef48472ee6089ca151cb3c7671b67e~eb8uB_V2I1044910449eucas1p2G; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 8E.37.35386.6BE5E546; Fri, 12 May 2023 16:43:50 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230512154350eucas1p2904d8c03824462ac4e4a2c5ea2535f61~eb8tqV0ub2921529215eucas1p2i; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230512154350eusmtrp1a517225bd4a16ead9093f43758459c65~eb8tp2OH91971719717eusmtrp1I; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id C2.B6.14344.5BE5E546; Fri, 12 May 2023 16:43:50 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230512154349eusmtip14ba9e1fecef7fe7cf38c2ef3b19c5163~eb8tJnsUk2547425474eusmtip1N; Fri, 12 May 2023 15:43:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230512154350euoutp02b701aab844d5f17d6176d0e3acf2c4a5~eb8uM7XRr0202602026euoutp02M DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683906230; bh=84Izyxtoe0ZLd4hkuj/7JIPXuyS7G7dsSIvL3JsJP94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OXroZQZFdd6yNZBiwdQKKRX/+Qdi0HsUDLn96r4aHz3QmhdhAJIOLQlO5MvoVSs8h oHJkAZYldsIRpbgg1X+EQvd0ZMlhOQhTq0vCKRTnWcqIv1Pk6kzQmSNp2VDei05JL4 TComSjtaFmslD53IfV1ib1/r8BvP8BJUyIUtrPVY= X-AuditID: cbfec7f4-cc9ff70000028a3a-34-645e5eb64331 From: Tomasz Dzieciol To: qemu-devel@nongnu.org, akihiko.odaki@daynix.com Cc: sriram.yagnaraman@est.tech, jasowang@redhat.com, k.kwiecien@samsung.com, m.sochacki@samsung.com Subject: [PATCH v6 3/7] igb: RX descriptors guest writting refactoring Date: Fri, 12 May 2023 17:43:31 +0200 Message-Id: <20230512154335.2536-4-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230512154335.2536-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduzned1tcXEpBudaJC0+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXRtPEy4wFTcEVz1pWMDUwPrHsYuTkkBAwkVj89Q5zFyMXh5DACkaJGRd/ MkE4XxglrvTvZIVwPjNK9C/fwAjTcmH+SWYQW0hgOaPEi191EEXtTBIrJ+5jA0mwCZhJPPoy D6ibg0NEwFjiY7s4SJhZIFXi6J+DLCC2sICbxPMTrWA2i4CqxI8V85lAbF4BJ4kz21eyQOyS l5h56Ts7yBhOAWeJeSuEIEoEJU7OfMICMVJeonnrbLAPJAS2cEicurODDaLXRWL7lhnMELaw xKvjW9ghbBmJ05N7oOaXS/w8u40dormFUWLP1MlQRdYSl7b+BLufWUBTYv0ufYiwo8S/Lc3M IGEJAT6JG28FIW7gk5i0bTpUmFeio00IolpH4tummWwQYSmJhTfqIMIeEkv3H2WewKg4C8kz s5A8Mwth7QJG5lWM4qmlxbnpqcVGeanlesWJucWleel6yfm5mxiByeX0v+NfdjAuf/VR7xAj EwfjIUYJDmYlEd63S6JThHhTEiurUovy44tKc1KLDzFKc7AoifNq255MFhJITyxJzU5NLUgt gskycXBKNTDZrFK7NWtv7paVnrcuzEw7LZaz7p/kY8f0q3+OXGcXdumO9337RWSCqsWaWrYz r0VPsN2VOapwSK//bPh/q2vmz203JqfxzX32puVPzC8djtRVcnXbkiLYubsqrvZ7TWb2Kl1s edwz+urTQ+ppDev4L3xf9+jh6705Yl0RHEu/rbkisrKznOHOM4sbHEwcc6SSV35+++y0gn6Y bIhb77lw7ZCeEgWuknCj2w3+c7f9XiL9+OpG+RSvirW3446v4tGueSX2eyZnbI2gyKzpnsc2 ukq3MX2+nqm8yKor7etU/zsO77Q8DUN/iR4Vk37Jdv265IsDL7XdXu+XkJS57dJ/vmib0u6w t+sW8p1yud6pxFKckWioxVxUnAgA/8SaNZ0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xu7rb4uJSDL4uZLL4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GU0TLzMW NAVXPGtZwdTA+MSyi5GTQ0LAROLC/JPMXYxcHEICSxkl9u7fygKRkJLY1/OfHcIWlvhzrYsN xBYSaGWS+HHeDsRmEzCTePRlHmsXIweHiICpxLO9kiBhZoFMidOv9oGVCwu4STw/0Qo2kkVA VeLHivlMIDavgJPEme0roVbJS8y89J0dZAyngLPEvBVCEJucJG72LYAqF5Q4OfMJC8R4eYnm rbOZJzAKzEKSmoUktYCRaRWjSGppcW56brGRXnFibnFpXrpecn7uJkZgHGw79nPLDsaVrz7q HWJk4mA8xCjBwawkwvt2SXSKEG9KYmVValF+fFFpTmrxIUZToLMnMkuJJucDIzGvJN7QzMDU 0MTM0sDU0sxYSZzXs6AjUUggPbEkNTs1tSC1CKaPiYNTqoGJoWX+veub2QU5yjqen3l0ad0u /mn66RoiRm92Cnufc3cRCOiOYm9KTdrx6Mpn0T9VjwPY7Xu7O34+Kwna3jVHbEex27Rr60KL TDZkLouc93HmhRjNLA3tbQfvvp3XXq29XFAh/Z/lB9klDkbZr7YvPFZuv9lSaz9P6/WKlwGs lanbmfh0Et3/1lh4P2T+rDI9YXLvyjl9mVkha6eKF8bqHGf6UDo7YEGA9a6Ha74bmmXc3hbB +UmmPK/3XtuxdK7rzztPHNRcLre1f7/c/IJXUxTO/m2IfPLS+s/HBLVZfouaPzinnagKXFtl tPe90pv6l1orG5u5J880qHtx8SWTTmOrTKrMmduLT1WGPC9WYinOSDTUYi4qTgQAb2TQGwwD AAA= X-CMS-MailID: 20230512154350eucas1p2904d8c03824462ac4e4a2c5ea2535f61 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230512154350eucas1p2904d8c03824462ac4e4a2c5ea2535f61 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230512154350eucas1p2904d8c03824462ac4e4a2c5ea2535f61 References: <20230512154335.2536-1-t.dzieciol@partner.samsung.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: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=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 @samsung.com) X-ZM-MESSAGEID: 1683906326785100001 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 176 ++++++++++++++++++++++---------------------- hw/net/igb_regs.h | 10 +-- hw/net/trace-events | 6 +- 3 files changed, 99 insertions(+), 93 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index b6031dea24..774b34fc92 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1281,15 +1281,11 @@ igb_verify_csum_in_sw(IGBCore *core, } =20 static void -igb_build_rx_metadata(IGBCore *core, - struct NetRxPkt *pkt, - bool is_eop, - const E1000E_RSSInfo *rss_info, uint16_t etqf, bool = ts, - uint16_t *pkt_info, uint16_t *hdr_info, - uint32_t *rss, - uint32_t *status_flags, - uint16_t *ip_id, - uint16_t *vlan_tag) +igb_build_rx_metadata_common(IGBCore *core, + struct NetRxPkt *pkt, + bool is_eop, + uint32_t *status_flags, + uint16_t *vlan_tag) { struct virtio_net_hdr *vhdr; bool hasip4, hasip6, csum_valid; @@ -1298,7 +1294,6 @@ igb_build_rx_metadata(IGBCore *core, *status_flags =3D E1000_RXD_STAT_DD; =20 /* No additional metadata needed for non-EOP descriptors */ - /* TODO: EOP apply only to status so don't skip whole function. */ if (!is_eop) { goto func_exit; } @@ -1315,59 +1310,6 @@ igb_build_rx_metadata(IGBCore *core, trace_e1000e_rx_metadata_vlan(*vlan_tag); } =20 - /* Packet parsing results */ - if ((core->mac[RXCSUM] & E1000_RXCSUM_PCSD) !=3D 0) { - if (rss_info->enabled) { - *rss =3D cpu_to_le32(rss_info->hash); - trace_igb_rx_metadata_rss(*rss); - } - } else if (hasip4) { - *status_flags |=3D E1000_RXD_STAT_IPIDV; - *ip_id =3D cpu_to_le16(net_rx_pkt_get_ip_id(pkt)); - trace_e1000e_rx_metadata_ip_id(*ip_id); - } - - if (pkt_info) { - *pkt_info =3D rss_info->enabled ? rss_info->type : 0; - - if (etqf < 8) { - *pkt_info |=3D BIT(11) | (etqf << 4); - } else { - if (hasip4) { - *pkt_info |=3D E1000_ADVRXD_PKT_IP4; - } - - if (hasip6) { - *pkt_info |=3D E1000_ADVRXD_PKT_IP6; - } - - switch (l4hdr_proto) { - case ETH_L4_HDR_PROTO_TCP: - *pkt_info |=3D E1000_ADVRXD_PKT_TCP; - break; - - case ETH_L4_HDR_PROTO_UDP: - *pkt_info |=3D E1000_ADVRXD_PKT_UDP; - break; - - case ETH_L4_HDR_PROTO_SCTP: - *pkt_info |=3D E1000_ADVRXD_PKT_SCTP; - break; - - default: - break; - } - } - } - - if (hdr_info) { - *hdr_info =3D 0; - } - - if (ts) { - *status_flags |=3D BIT(16); - } - /* RX CSO information */ if (hasip6 && (core->mac[RFCTL] & E1000_RFCTL_IPV6_XSUM_DIS)) { trace_e1000e_rx_metadata_ipv6_sum_disabled(); @@ -1423,43 +1365,106 @@ func_exit: static inline void igb_write_lgcy_rx_descr(IGBCore *core, struct e1000_rx_desc *desc, struct NetRxPkt *pkt, - const E1000E_RSSInfo *rss_info, uint16_t etqf, boo= l ts, + const E1000E_RSSInfo *rss_info, uint16_t length) { - uint32_t status_flags, rss; - uint16_t ip_id; + uint32_t status_flags; =20 assert(!rss_info->enabled); + + memset(desc, 0, sizeof(*desc)); desc->length =3D cpu_to_le16(length); - desc->csum =3D 0; + igb_build_rx_metadata_common(core, pkt, pkt !=3D NULL, + &status_flags, + &desc->special); =20 - igb_build_rx_metadata(core, pkt, pkt !=3D NULL, - rss_info, etqf, ts, - NULL, NULL, &rss, - &status_flags, &ip_id, - &desc->special); desc->errors =3D (uint8_t) (le32_to_cpu(status_flags) >> 24); desc->status =3D (uint8_t) le32_to_cpu(status_flags); } =20 +static uint16_t +igb_rx_desc_get_packet_type(IGBCore *core, struct NetRxPkt *pkt, uint16_t = etqf) +{ + uint16_t pkt_type =3D 0; + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); + + if (hasip6 && !(core->mac[RFCTL] & E1000_RFCTL_IPV6_DIS)) { + pkt_type |=3D E1000_ADVRXD_PKT_IP6; + } else if (hasip4) { + pkt_type =3D E1000_ADVRXD_PKT_IP4; + } + + if (etqf < 8) { + pkt_type |=3D (BIT(11) >> 4) | etqf; + return pkt_type; + } + + switch (l4hdr_proto) { + case ETH_L4_HDR_PROTO_TCP: + pkt_type |=3D E1000_ADVRXD_PKT_TCP; + break; + case ETH_L4_HDR_PROTO_UDP: + pkt_type |=3D E1000_ADVRXD_PKT_UDP; + break; + case ETH_L4_HDR_PROTO_SCTP: + pkt_type |=3D E1000_ADVRXD_PKT_SCTP; + break; + default: + break; + } + + return pkt_type; +} + static inline void -igb_write_adv_rx_descr(IGBCore *core, union e1000_adv_rx_desc *desc, +igb_write_adv_rx_descr(IGBCore *core, + union e1000_adv_rx_desc *d, struct NetRxPkt *pkt, - const E1000E_RSSInfo *rss_info, uint16_t etqf, bool= ts, + const E1000E_RSSInfo *rss_info, + uint16_t etqf, + bool ts, uint16_t length) { - memset(&desc->wb, 0, sizeof(desc->wb)); + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + uint16_t rss_type =3D 0, pkt_type; + bool eop =3D (pkt !=3D NULL); + memset(&d->wb, 0, sizeof(d->wb)); + + d->wb.upper.length =3D cpu_to_le16(length); + igb_build_rx_metadata_common(core, pkt, eop, + &d->wb.upper.status_error, + &d->wb.upper.vlan); + + if (!eop) { + return; + } + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); =20 - desc->wb.upper.length =3D cpu_to_le16(length); + if ((core->mac[RXCSUM] & E1000_RXCSUM_PCSD) !=3D 0) { + if (rss_info->enabled) { + d->wb.lower.hi_dword.rss =3D cpu_to_le32(rss_info->hash); + rss_type =3D rss_info->type; + trace_igb_rx_metadata_rss(d->wb.lower.hi_dword.rss, rss_type); + } + } else if (hasip4) { + d->wb.upper.status_error |=3D E1000_RXD_STAT_IPIDV; + d->wb.lower.hi_dword.csum_ip.ip_id =3D + cpu_to_le16(net_rx_pkt_get_ip_id(pkt)); + trace_e1000e_rx_metadata_ip_id(d->wb.lower.hi_dword.csum_ip.ip= _id); + } + + if (ts) { + d->wb.upper.status_error |=3D BIT(16); + } =20 - igb_build_rx_metadata(core, pkt, pkt !=3D NULL, - rss_info, etqf, ts, - &desc->wb.lower.lo_dword.pkt_info, - &desc->wb.lower.lo_dword.hdr_info, - &desc->wb.lower.hi_dword.rss, - &desc->wb.upper.status_error, - &desc->wb.lower.hi_dword.csum_ip.ip_id, - &desc->wb.upper.vlan); + pkt_type =3D igb_rx_desc_get_packet_type(core, pkt, etqf); + trace_e1000e_rx_metadata_pkt_type(pkt_type); + d->wb.lower.lo_dword.pkt_info =3D cpu_to_le16(rss_type | (pkt_type << = 4)); } =20 static inline void @@ -1468,8 +1473,7 @@ igb_write_rx_descr(IGBCore *core, union e1000_rx_desc= _union *desc, uint16_t etqf, bool ts, uint16_t length) { if (igb_rx_use_legacy_descriptor(core)) { - igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, - etqf, ts, length); + igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, length= ); } else { igb_write_adv_rx_descr(core, &desc->adv, pkt, rss_info, etqf, ts, length); diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index 82ff195dfc..71a8833229 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -692,11 +692,11 @@ union e1000_adv_rx_desc { =20 #define E1000_STATUS_NUM_VFS_SHIFT 14 =20 -#define E1000_ADVRXD_PKT_IP4 BIT(4) -#define E1000_ADVRXD_PKT_IP6 BIT(6) -#define E1000_ADVRXD_PKT_TCP BIT(8) -#define E1000_ADVRXD_PKT_UDP BIT(9) -#define E1000_ADVRXD_PKT_SCTP BIT(10) +#define E1000_ADVRXD_PKT_IP4 BIT(0) +#define E1000_ADVRXD_PKT_IP6 BIT(2) +#define E1000_ADVRXD_PKT_TCP BIT(4) +#define E1000_ADVRXD_PKT_UDP BIT(5) +#define E1000_ADVRXD_PKT_SCTP BIT(6) =20 static inline uint8_t igb_ivar_entry_rx(uint8_t i) { diff --git a/hw/net/trace-events b/hw/net/trace-events index e4a98b2c7d..def651c186 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -277,9 +277,9 @@ igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRIT= E: PHY[%u] UNHANDLED" igb_link_set_ext_params(bool asd_check, bool speed_select_bypass, bool pfr= std) "Set extended link params: ASD check: %d, Speed select bypass: %d, PF = reset done: %d" =20 igb_rx_desc_buff_size(uint32_t b) "buffer size: %u" -igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "addr: 0x%"PRIx64", offset: %u, from: %p, length: %u" +igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from: %p, length:= %u" =20 -igb_rx_metadata_rss(uint32_t rss) "RSS data: 0x%X" +igb_rx_metadata_rss(uint32_t rss, uint16_t rss_pkt_type) "RSS data: rss: 0= x%X, rss_pkt_type: 0x%X" =20 igb_irq_icr_clear_gpie_nsicr(void) "Clearing ICR on read due to GPIE.NSICR= enabled" igb_irq_set_iam(uint32_t icr) "Update IAM: 0x%x" @@ -294,6 +294,8 @@ igb_irq_eitr_set(uint32_t eitr_num, uint32_t val) "EITR= [%u] =3D 0x%x" igb_set_pfmailbox(uint32_t vf_num, uint32_t val) "PFMailbox[%d]: 0x%x" igb_set_vfmailbox(uint32_t vf_num, uint32_t val) "VFMailbox[%d]: 0x%x" =20 +igb_wrn_rx_desc_modes_not_supp(int desc_type) "Not supported descriptor ty= pe: %d" + # igbvf.c igbvf_wrn_io_addr_unknown(uint64_t addr) "IO unknown register 0x%"PRIx64 =20 --=20 2.25.1 From nobody Wed May 15 18:44:51 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=partner.samsung.com ARC-Seal: i=1; a=rsa-sha256; t=1683906343; cv=none; d=zohomail.com; s=zohoarc; b=d3ltm8RzEm0qUA81q690w7+tr+RSvh7hGXWBKeBG4GR5gWISQGMqeWotkgfv+Hn/o0cxONazRV/CtLP299EzrgVtgeO3vTLNLxbbDEUJrZTMy+EkLyC1O9flAp/QhCeZht1diqDHpR6lxwVOEisnT7HYUYY9+yJ2fv6JYxCaSNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683906343; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+qzP58+yb4joF5Hr6cs0rXbAup14U01FaI9KZTROXvc=; b=Zv4dsVsbhl6+tax74Iulumh0ufSrNZ3HUeQjJYP7cuhMq5SK0vgnZhPtl6Qfb3s4/RCfvHZgb2AAkN+e9Uz0HwO0zc8azGo5yKp1wU9g1eosHkGqsPoyK39I3fT2EMnoJXFLRgcg8wg0m+x6fIqz7uwa5BHddxBBmIIhB6cBHck= 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 1683906343182199.38813791441532; Fri, 12 May 2023 08:45:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxUw5-0005R7-Rt; Fri, 12 May 2023 11:44:01 -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 1pxUw2-0005Nt-6G for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:58 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxUvy-0007je-C9 for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:57 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230512154351euoutp02074928790f092aff413d7983757c5a43~eb8uqd71w0202802028euoutp027 for ; Fri, 12 May 2023 15:43:51 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230512154350eucas1p24068d671ea3d26a15d61ec1902f9fdf4~eb8ub0-m22976529765eucas1p2j; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id C2.2C.42423.6BE5E546; Fri, 12 May 2023 16:43:50 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230512154350eucas1p2c37ab67b720c459a6990e426f8344291~eb8uJxNcB3014230142eucas1p2w; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230512154350eusmtrp1bfcf47d13cce7c9522b72ff83c0162d1~eb8uJRfo81998019980eusmtrp11; Fri, 12 May 2023 15:43:50 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id B3.B6.14344.6BE5E546; Fri, 12 May 2023 16:43:50 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230512154350eusmtip1b940b426a324ab1bcfb7abc58cbd6026~eb8toADOH1630116301eusmtip1F; Fri, 12 May 2023 15:43:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230512154351euoutp02074928790f092aff413d7983757c5a43~eb8uqd71w0202802028euoutp027 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683906231; bh=+qzP58+yb4joF5Hr6cs0rXbAup14U01FaI9KZTROXvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rjdFlqxXjV5lY15MUJlCZwGJhf8MGX675UIUhyLUH2Mzo/6E03LbKV+3+kg5wH5q9 HzIjFIVptG8d84zCf6FbxoSfLvwuJwps18X2HPw/waepUWkkZA9gFIfVnsLbxTuU3j LiAJDx3FR1QpgRg9KBui2VOsYJrN8Sya/V4KyWeE= X-AuditID: cbfec7f2-a3bff7000002a5b7-9d-645e5eb6926e From: Tomasz Dzieciol To: qemu-devel@nongnu.org, akihiko.odaki@daynix.com Cc: sriram.yagnaraman@est.tech, jasowang@redhat.com, k.kwiecien@samsung.com, m.sochacki@samsung.com Subject: [PATCH v6 4/7] igb: RX payload guest writting refactoring Date: Fri, 12 May 2023 17:43:32 +0200 Message-Id: <20230512154335.2536-5-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230512154335.2536-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduzned1tcXEpBl/2GFt8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujOVr5rIU7EuvOH+qn72BcbdTFyMnh4SAiUTzxu2sXYxcHEICKxglTi7Z BOV8YZQ4vHYfE4TzmVFi0vEZzF2MHGAt27awQcSXM0qs/P2EGcJpZ5I43tLGBDKXTcBM4tGX eawgDSICxhIf28VBwswCqRJH/xxkAbGFBZwkDty7yQ5iswioShz7v4MRxOYFil9s2sMCcZ68 xMxL39lBxnAKOEvMWyEEUSIocXLmExaIkfISzVtng50gIbCFQ+LEnQ3sEL0uEvevvmaEsIUl Xh3fAhWXkTg9uQdqfrnEz7Pb2CGaWxgl9kydDFVkLXFp60+w+5kFNCXW79KHCDtKHF6zlRUS DnwSN94KQtzAJzFp23Ro8PBKdLQJQVTrSHzbNJMNIiwlsfBGHUTYQ+LmzZmMExgVZyF5ZhaS Z2YhrF3AyLyKUTy1tDg3PbXYMC+1XK84Mbe4NC9dLzk/dxMjMLmc/nf80w7Gua8+6h1iZOJg PMQowcGsJML7dkl0ihBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFebduTyUIC6YklqdmpqQWpRTBZ Jg5OqQamLmUH93lG7AfKWsquXM+tV7ucX8ucNjnJbTtzZpDYxW2vec8IPdD9Y5W26rXDa3nv 3Wrsx3J1bueYO8vb1r35vi2c2S1J1XfW23+3DBMmHeDL9fGu/NH1sbXQ4bJf1SN+acYtP/RM Zt3e8ZqnY0YAOzvbq/yiYoOSPOsjWzfqqCrHqadtzpYM2NNyJyvTZL9IYOq3BZ+3MCx5wPjX K9/t0svlbSH/vnP53k6a1dFv1PfE6nDOvfJbds5zTl9RjXOVbJrlf5UxWeXSs1cmV1N6qw8o Fn+b++jU5NQrX5qlPV9EN2h939EzT759D8tMyZSbcXJ7smPF9y97OEukzEV9R3fnhbeuGh2v OibuXa3EUpyRaKjFXFScCAB9YvrknQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xu7rb4uJSDDbMV7T4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GcvXzGUp 2Jdecf5UP3sD426nLkYODgkBE4ltW9i6GLk4hASWMko8OnuEuYuREyguJbGv5z87hC0s8eda F1RRK5NE75aVYEVsAmYSj77MYwUZJCJgKvFsryRImFkgU+L0q31sILawgJPEgXs3weawCKhK HPu/gxHE5gWKX2zawwIxX15i5qXv7CBjOAWcJeatEAIJCwGV3OxbwARRLihxcuYTFojx8hLN W2czT2AUmIUkNQtJagEj0ypGkdTS4tz03GIjveLE3OLSvHS95PzcTYzAONh27OeWHYwrX33U O8TIxMF4iFGCg1lJhPftkugUId6UxMqq1KL8+KLSnNTiQ4ymQGdPZJYSTc4HRmJeSbyhmYGp oYmZpYGppZmxkjivZ0FHopBAemJJanZqakFqEUwfEwenVANTzFu9bzsCsvuD1u6/E/0oaIfe 3cqTd3m1C787FbQm8Igdk5rHXeMRk7dprefEI2t23y9gaTo67VXJ8qrjh7+VXi4XVTlofv2o y6evCmnRpf32nxay7vy8wHrWvr/p71rW/G17GRuVeObRfV2J/8omkib9VrNWfYr7fS1Hor7k s+8F69RP9pNuRqc5sGbnzbvvvkpdNyWCc33bs3X7+p4GfXr/wPh5v5BNKI/7qfhqI8YL/29k XahrfHDc52xApChbz8J81pjFE+z9JmgV7zDZdDB8z+MqrRP+k5qlAi1vFLjNZDj6yuHJEpVg mxC2jXaZi5PnO6Wx7/buWysnE/VEyuS3Rnaa8pEQqXnXpzMpsRRnJBpqMRcVJwIA7GoM0AwD AAA= X-CMS-MailID: 20230512154350eucas1p2c37ab67b720c459a6990e426f8344291 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230512154350eucas1p2c37ab67b720c459a6990e426f8344291 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230512154350eucas1p2c37ab67b720c459a6990e426f8344291 References: <20230512154335.2536-1-t.dzieciol@partner.samsung.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: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=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 @samsung.com) X-ZM-MESSAGEID: 1683906344638100003 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 18 ++-- hw/net/igb_core.c | 216 +++++++++++++++++++++++++-------------- tests/qtest/libqos/igb.c | 5 + 3 files changed, 153 insertions(+), 86 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index b2e54fe802..f9ff31fd70 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1418,11 +1418,11 @@ e1000e_write_hdr_to_rx_buffers(E1000ECore *core, } =20 static void -e1000e_write_to_rx_buffers(E1000ECore *core, - hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, - const char *data, - dma_addr_t data_len) +e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core, + hwaddr ba[MAX_PS_BUFFERS], + e1000e_ba_state *bastate, + const char *data, + dma_addr_t data_len) { while (data_len > 0) { uint32_t cur_buf_len =3D core->rxbuf_sizes[bastate->cur_idx]; @@ -1594,8 +1594,10 @@ e1000e_write_packet_to_guest(E1000ECore *core, struc= t NetRxPkt *pkt, while (copy_size) { iov_copy =3D MIN(copy_size, iov->iov_len - iov_ofs); =20 - e1000e_write_to_rx_buffers(core, ba, &bastate, - iov->iov_base + iov_ofs, iov_c= opy); + e1000e_write_payload_frag_to_rx_buffers(core, ba, &bas= tate, + iov->iov_base + + iov_ofs, + iov_copy); =20 copy_size -=3D iov_copy; iov_ofs +=3D iov_copy; @@ -1607,7 +1609,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, =20 if (desc_offset + desc_size >=3D total_size) { /* Simulate FCS checksum presence in the last descript= or */ - e1000e_write_to_rx_buffers(core, ba, &bastate, + e1000e_write_payload_frag_to_rx_buffers(core, ba, &bas= tate, (const char *) &fcs_pad, e1000x_fcs_len(core->ma= c)); } } diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 774b34fc92..0eabe7106e 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -941,6 +941,14 @@ igb_has_rxbufs(IGBCore *core, const E1000ERingInfo *r,= size_t total_size) bufsize; } =20 +static uint32_t +igb_get_queue_rx_header_buf_size(IGBCore *core, const E1000ERingInfo *r) +{ + uint32_t srrctl =3D core->mac[E1000_SRRCTL(r->idx) >> 2]; + return (srrctl & E1000_SRRCTL_BSIZEHDRSIZE_MASK) >> + E1000_SRRCTL_BSIZEHDRSIZE_SHIFT; +} + void igb_start_recv(IGBCore *core) { @@ -1231,6 +1239,21 @@ igb_read_adv_rx_descr(IGBCore *core, union e1000_adv= _rx_desc *desc, *buff_addr =3D le64_to_cpu(desc->read.pkt_addr); } =20 +typedef struct IGBPacketRxDMAState { + size_t size; + size_t total_size; + size_t ps_hdr_len; + size_t desc_size; + size_t desc_offset; + uint32_t rx_desc_packet_buf_size; + uint32_t rx_desc_header_buf_size; + struct iovec *iov; + size_t iov_ofs; + bool is_first; + uint16_t written; + hwaddr ba; +} IGBPacketRxDMAState; + static inline void igb_read_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, hwaddr *buff_addr) @@ -1512,19 +1535,6 @@ igb_pci_dma_write_rx_desc(IGBCore *core, PCIDevice *= dev, dma_addr_t addr, } } =20 -static void -igb_write_to_rx_buffers(IGBCore *core, - PCIDevice *d, - hwaddr ba, - uint16_t *written, - const char *data, - dma_addr_t data_len) -{ - trace_igb_rx_desc_buff_write(ba, *written, data, data_len); - pci_dma_write(d, ba + *written, data, data_len); - *written +=3D data_len; -} - static void igb_update_rx_stats(IGBCore *core, const E1000ERingInfo *rxi, size_t pkt_size, size_t pkt_fcs_size) @@ -1550,6 +1560,93 @@ igb_rx_descr_threshold_hit(IGBCore *core, const E100= 0ERingInfo *rxi) ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; } =20 +static void +igb_truncate_to_descriptor_size(IGBPacketRxDMAState *pdma_st, size_t *size) +{ + if (*size > pdma_st->rx_desc_packet_buf_size) { + *size =3D pdma_st->rx_desc_packet_buf_size; + } +} + +static void +igb_write_payload_frag_to_rx_buffers(IGBCore *core, + PCIDevice *d, + hwaddr ba, + uint16_t *written, + uint32_t cur_buf_len, + const char *data, + dma_addr_t data_len) +{ + trace_igb_rx_desc_buff_write(ba, *written, data, data_len); + pci_dma_write(d, ba + *written, data, data_len); + *written +=3D data_len; +} + +static void +igb_write_payload_to_rx_buffers(IGBCore *core, + struct NetRxPkt *pkt, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + size_t *copy_size) +{ + static const uint32_t fcs_pad; + size_t iov_copy; + + /* Copy packet payload */ + while (*copy_size) { + iov_copy =3D MIN(*copy_size, pdma_st->iov->iov_len - pdma_st->iov_= ofs); + igb_write_payload_frag_to_rx_buffers(core, d, + pdma_st->ba, + &pdma_st->written, + pdma_st->rx_desc_packet_buf_s= ize, + pdma_st->iov->iov_base + + pdma_st->iov_ofs, + iov_copy); + + *copy_size -=3D iov_copy; + pdma_st->iov_ofs +=3D iov_copy; + if (pdma_st->iov_ofs =3D=3D pdma_st->iov->iov_len) { + pdma_st->iov++; + pdma_st->iov_ofs =3D 0; + } + } + + if (pdma_st->desc_offset + pdma_st->desc_size >=3D pdma_st->total_size= ) { + /* Simulate FCS checksum presence in the last descriptor */ + igb_write_payload_frag_to_rx_buffers(core, d, + pdma_st->ba, + &pdma_st->written, + pdma_st->rx_desc_packet_buf_s= ize, + (const char *) &fcs_pad, + e1000x_fcs_len(core->mac)); + } +} + +static void +igb_write_to_rx_buffers(IGBCore *core, + struct NetRxPkt *pkt, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st) +{ + size_t copy_size; + + if (!pdma_st->ba) { + /* as per intel docs; skip descriptors with null buf addr */ + trace_e1000e_rx_null_descriptor(); + return; + } + + if (pdma_st->desc_offset >=3D pdma_st->size) { + return; + } + + pdma_st->desc_size =3D pdma_st->total_size - pdma_st->desc_offset; + igb_truncate_to_descriptor_size(pdma_st, &pdma_st->desc_size); + copy_size =3D pdma_st->size - pdma_st->desc_offset; + igb_truncate_to_descriptor_size(pdma_st, ©_size); + igb_write_payload_to_rx_buffers(core, pkt, d, pdma_st, ©_size); +} + static void igb_write_packet_to_guest(IGBCore *core, struct NetRxPkt *pkt, const E1000E_RxRing *rxr, @@ -1559,91 +1656,54 @@ igb_write_packet_to_guest(IGBCore *core, struct Net= RxPkt *pkt, PCIDevice *d; dma_addr_t base; union e1000_rx_desc_union desc; - size_t desc_size; - size_t desc_offset =3D 0; - size_t iov_ofs =3D 0; - - struct iovec *iov =3D net_rx_pkt_get_iovec(pkt); - size_t size =3D net_rx_pkt_get_total_len(pkt); - size_t total_size =3D size + e1000x_fcs_len(core->mac); - const E1000ERingInfo *rxi =3D rxr->i; - size_t bufsize =3D igb_rxbufsize(core, rxi); - + const E1000ERingInfo *rxi; + size_t rx_desc_len; + + IGBPacketRxDMAState pdma_st =3D {0}; + pdma_st.is_first =3D true; + pdma_st.size =3D net_rx_pkt_get_total_len(pkt); + pdma_st.total_size =3D pdma_st.size + e1000x_fcs_len(core->mac); + + rxi =3D rxr->i; + rx_desc_len =3D core->rx_desc_len; + pdma_st.rx_desc_packet_buf_size =3D + igb_rxbufsize(core, rxi); + pdma_st.rx_desc_header_buf_size =3D + igb_get_queue_rx_header_buf_size(core, rxi); + pdma_st.iov =3D net_rx_pkt_get_iovec(pkt); d =3D pcie_sriov_get_vf_at_index(core->owner, rxi->idx % 8); if (!d) { d =3D core->owner; } =20 do { - hwaddr ba; - uint16_t written =3D 0; + pdma_st.written =3D 0; bool is_last =3D false; =20 - desc_size =3D total_size - desc_offset; - - if (desc_size > bufsize) { - desc_size =3D bufsize; - } - if (igb_ring_empty(core, rxi)) { return; } =20 base =3D igb_ring_head_descr(core, rxi); + pci_dma_read(d, base, &desc, rx_desc_len); + trace_e1000e_rx_descr(rxi->idx, base, rx_desc_len); =20 - pci_dma_read(d, base, &desc, core->rx_desc_len); - - trace_e1000e_rx_descr(rxi->idx, base, core->rx_desc_len); - - igb_read_rx_descr(core, &desc, &ba); - - if (ba) { - if (desc_offset < size) { - static const uint32_t fcs_pad; - size_t iov_copy; - size_t copy_size =3D size - desc_offset; - if (copy_size > bufsize) { - copy_size =3D bufsize; - } - - /* Copy packet payload */ - while (copy_size) { - iov_copy =3D MIN(copy_size, iov->iov_len - iov_ofs); - - igb_write_to_rx_buffers(core, d, ba, &written, - iov->iov_base + iov_ofs, iov_c= opy); + igb_read_rx_descr(core, &desc, &pdma_st.ba); =20 - copy_size -=3D iov_copy; - iov_ofs +=3D iov_copy; - if (iov_ofs =3D=3D iov->iov_len) { - iov++; - iov_ofs =3D 0; - } - } - - if (desc_offset + desc_size >=3D total_size) { - /* Simulate FCS checksum presence in the last descript= or */ - igb_write_to_rx_buffers(core, d, ba, &written, - (const char *) &fcs_pad, e1000x_fcs_len(core->ma= c)); - } - } - } else { /* as per intel docs; skip descriptors with null buf addr= */ - trace_e1000e_rx_null_descriptor(); - } - desc_offset +=3D desc_size; - if (desc_offset >=3D total_size) { + igb_write_to_rx_buffers(core, pkt, d, &pdma_st); + pdma_st.desc_offset +=3D pdma_st.desc_size; + if (pdma_st.desc_offset >=3D pdma_st.total_size) { is_last =3D true; } =20 igb_write_rx_descr(core, &desc, is_last ? core->rx_pkt : NULL, - rss_info, etqf, ts, written); - igb_pci_dma_write_rx_desc(core, d, base, &desc, core->rx_desc_len); - - igb_ring_advance(core, rxi, core->rx_desc_len / E1000_MIN_RX_DESC_= LEN); - - } while (desc_offset < total_size); + rss_info, etqf, ts, pdma_st.written); + pci_dma_write(d, base, &desc, rx_desc_len); + igb_ring_advance(core, rxi, + rx_desc_len / E1000_MIN_RX_DESC_LEN); + } while (pdma_st.desc_offset < pdma_st.total_size); =20 - igb_update_rx_stats(core, rxi, size, total_size); + igb_update_rx_stats(core, rxi, pdma_st.size, pdma_st.total_size); } =20 static bool diff --git a/tests/qtest/libqos/igb.c b/tests/qtest/libqos/igb.c index a603468beb..f40c4ec4cd 100644 --- a/tests/qtest/libqos/igb.c +++ b/tests/qtest/libqos/igb.c @@ -109,6 +109,11 @@ static void igb_pci_start_hw(QOSGraphObject *obj) E1000_RAH_AV | E1000_RAH_POOL_1 | le16_to_cpu(*(uint16_t *)(address + 4))); =20 + /* Set supported receive descriptor mode */ + e1000e_macreg_write(&d->e1000e, + E1000_SRRCTL(0), + E1000_SRRCTL_DESCTYPE_ADV_ONEBUF); + /* Enable receive */ e1000e_macreg_write(&d->e1000e, E1000_RFCTL, E1000_RFCTL_EXTEN); e1000e_macreg_write(&d->e1000e, E1000_RCTL, E1000_RCTL_EN); --=20 2.25.1 From nobody Wed May 15 18:44:51 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=partner.samsung.com ARC-Seal: i=1; a=rsa-sha256; t=1683906319; cv=none; d=zohomail.com; s=zohoarc; b=BWpTo9hmNU1CVdnBuzUmUvphY3z/PU0Eec/nDfjaBIuHJH6vMEv4o024KIADgXj+jB8KnhlJRnAXTfn5Q7EDxr2IDiTvJ+t2chlVvP9RUHCe7py8NEki/U0hhBotbINq0NrK1BuW2Ym41kv6G7Pw/yXQmXew4C/0ERkiq8twCSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683906319; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wO5gaesISuEdjaAU2KXBboHbME+HpMIPsPuP7qC625s=; b=AvOYNpoNGgIR6lbMTDRzi3jXpqQvGE5wM6mATzttnMduAQjLDqog9C6tHvRvn7pb42yyctB76JMebUIA4ytPRPBw6hP+xVUnZs77kvSa0ljVbQfarOtE907TRoDc9IEQPX9+4B7RwU+6kCktsbuEwWCSF/wHnb59nbvv3y62878= 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 1683906319518958.1482030731578; Fri, 12 May 2023 08:45:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxUw4-0005Oj-PY; Fri, 12 May 2023 11:44:00 -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 1pxUw3-0005OI-7k for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:59 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxUw0-0007jo-8I for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:58 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230512154352euoutp01d655bb884ac049a249af5ced0c96d818~eb8vqxvs30546205462euoutp01O for ; Fri, 12 May 2023 15:43:52 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230512154351eucas1p1152f5f1fa53dfa36719cc00287337ad7~eb8vLLALT2945829458eucas1p1L; Fri, 12 May 2023 15:43:51 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id AC.B0.37758.7BE5E546; Fri, 12 May 2023 16:43:51 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230512154351eucas1p1d6dab09b1b9812534360a617a8d1d79c~eb8un5tek2356123561eucas1p1w; Fri, 12 May 2023 15:43:51 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230512154351eusmtrp1982611221f138e69d13c1f8774cbf19c~eb8unIbY-1971719717eusmtrp1K; Fri, 12 May 2023 15:43:51 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 24.B6.14344.7BE5E546; Fri, 12 May 2023 16:43:51 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230512154350eusmtip1ecb602f442e9b82553c3525042b36d10~eb8uGCK9q2215522155eusmtip10; Fri, 12 May 2023 15:43:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230512154352euoutp01d655bb884ac049a249af5ced0c96d818~eb8vqxvs30546205462euoutp01O DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683906232; bh=wO5gaesISuEdjaAU2KXBboHbME+HpMIPsPuP7qC625s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o6EOSWlwYnqe093J7gZq5zrT7SlG7jgRQtPKS7OhVPnREQog+fqOGFtviQxxOca0w msHKZcEmZYwoF6B7iy7A5o5G2kw7Hh+lO5hTF0Mn9zazvFbDb3GwJke8MXR0m56ZWQ C/UK4N4w6mun2lLtCeZ4SHSwFugCUfAqOVNkqHX0= X-AuditID: cbfec7f5-815ff7000002937e-f7-645e5eb723f0 From: Tomasz Dzieciol To: qemu-devel@nongnu.org, akihiko.odaki@daynix.com Cc: sriram.yagnaraman@est.tech, jasowang@redhat.com, k.kwiecien@samsung.com, m.sochacki@samsung.com Subject: [PATCH v6 5/7] igb: add IPv6 extended headers traffic detection Date: Fri, 12 May 2023 17:43:33 +0200 Message-Id: <20230512154335.2536-6-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230512154335.2536-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgleLIzCtJLcpLzFFi42LZduzned3tcXEpBvt3qll8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujP6N19kKdnBVzD4r2cC4kqOLkZNDQsBEomPPdcYuRi4OIYEVjBKv969i B0kICXxhlFh7JR0i8ZlR4tuZ10wwHe3tzWwQRcsZJa79YYUoameS+LXyJFg3m4CZxKMv84AS HBwiAsYSH9vFQcLMAqkSR/8cZAGxhQU8JHpX9IHNZBFQlWjtnMEMYvMKOEksPHUOape8xMxL 39lBxnAKOEvMWyEEUSIocXLmExaIkfISzVtnM4OcICGwhUNi/tZL7BC9LhLnjz9mhrCFJV4d 3wIVl5E4PbmHBcIul/h5dhs7RHMLo8SeqZOhiqwlLm39CXY/s4CmxPpd+hBhR4nZjTPYQMIS AnwSN94KQtzAJzFp23RmiDCvREebEES1jsS3TTOhqqUkFt6ogwh7SOx8N4dlAqPiLCTPzELy zCyEtQsYmVcxiqeWFuempxYb56WW6xUn5haX5qXrJefnbmIEJpbT/45/3cG44tVHvUOMTByM hxglOJiVRHjfLolOEeJNSaysSi3Kjy8qzUktPsQozcGiJM6rbXsyWUggPbEkNTs1tSC1CCbL xMEp1cCk+ePrROu+uS1mjfK1Cqzaq5SPrbV55PD91qQ1yz845OyLXS1cp/XOJ7lzoVDhlD92 f4uvsJ09eMTE23SGT7a+1MRnWgopxZe6w8wyC4uYFs5vVt470TK1jVkvUWLWhWz541WvHRxr XXTUyzUmbmp+NaHHoqpRZtGb56/dQ39zX1o1K1234VShqM+M3YZnlqxl8rtzOmB75c1m28lb rN7uiOTQ8nZ6mRacY/aUw/mdeu473a4ztyOFTlmIfRWclK8vqLR7mu19x5KJBXw3TmxdnbTe TZZ5QedqDeumgrVLf/3UsbA1ebK3USQiWqWqyXnli1lJHRoaD4KPu/x9p9Ykt/vNpLKdrCeU /rKc9VJiKc5INNRiLipOBADA1U2BmwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xu7rb4+JSDNqaWS0+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAa5Se TVF+aUmqQkZ+cYmtUrShhZGeoaWFnpGJpZ6hsXmslZGpkr6dTUpqTmZZapG+XYJeRv/G62wF O7gqZp+VbGBcydHFyMkhIWAi0d7ezNbFyMUhJLCUUWL/sR3MEAkpiX09/9khbGGJP9e6oIpa mSTm77rABJJgEzCTePRlHmsXIweHiICpxLO9kiBhZoFMidOv9rGB2MICHhK9K/rAylkEVCVa O2eAzecVcJJYeOocE8R8eYmZl76zg4zhFHCWmLdCCCQsBFRys28BE0S5oMTJmU9YIMbLSzRv nc08gVFgFpLULCSpBYxMqxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQLjYNuxn1t2MK589VHv ECMTB+MhRgkOZiUR3rdLolOEeFMSK6tSi/Lji0pzUosPMZoCnT2RWUo0OR8YiXkl8YZmBqaG JmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUy2Id4LLz3aqHPF+pdmWYW5+Epv /UohtnubH8i1mM73vvzKw85tsteG3a+Dv+qpr1i94KCr+urmFZtfVejd6XjwZe48jRTPDW/3 iiU4Lj4UMnt1/Uu/3mXVFuHy19cFz/wRnTzz4tz32S//9B5wEPu5eC7rf9GOw6Y+HFqX33z6 c/T+3pAa4+CvfeK/Ddq2RHgc9fGyPsRlEcQWEd0RUu3z63fww+PCVxp4C44rFZ5JkTL7PXWi SBxbbLbt0+sc+WUcenIfm32/nGLrlZJ8sY9lRWZGUf7jxfrX9Tu7fIOkd06cf4LLIuPPZcev e7tne3b7uf+cEJr88KPSoVuPD/CcD9CXXX7j2qvvK8M7g48psRRnJBpqMRcVJwIATqR5AwwD AAA= X-CMS-MailID: 20230512154351eucas1p1d6dab09b1b9812534360a617a8d1d79c X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230512154351eucas1p1d6dab09b1b9812534360a617a8d1d79c X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230512154351eucas1p1d6dab09b1b9812534360a617a8d1d79c References: <20230512154335.2536-1-t.dzieciol@partner.samsung.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: none client-ip=210.118.77.11; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout1.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=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 @samsung.com) X-ZM-MESSAGEID: 1683906321628100001 Signed-off-by: Tomasz Dzieciol Reviewed-by: Sriram Yagnaraman --- hw/net/igb_core.c | 4 +++- hw/net/igb_regs.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 0eabe7106e..6d95cccea3 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1415,7 +1415,9 @@ igb_rx_desc_get_packet_type(IGBCore *core, struct Net= RxPkt *pkt, uint16_t etqf) net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); =20 if (hasip6 && !(core->mac[RFCTL] & E1000_RFCTL_IPV6_DIS)) { - pkt_type |=3D E1000_ADVRXD_PKT_IP6; + eth_ip6_hdr_info *ip6hdr_info =3D net_rx_pkt_get_ip6_info(pkt); + pkt_type |=3D ip6hdr_info->has_ext_hdrs ? E1000_ADVRXD_PKT_IP6E : + E1000_ADVRXD_PKT_IP6; } else if (hasip4) { pkt_type =3D E1000_ADVRXD_PKT_IP4; } diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index 71a8833229..36763f2ff7 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -694,6 +694,7 @@ union e1000_adv_rx_desc { =20 #define E1000_ADVRXD_PKT_IP4 BIT(0) #define E1000_ADVRXD_PKT_IP6 BIT(2) +#define E1000_ADVRXD_PKT_IP6E BIT(3) #define E1000_ADVRXD_PKT_TCP BIT(4) #define E1000_ADVRXD_PKT_UDP BIT(5) #define E1000_ADVRXD_PKT_SCTP BIT(6) --=20 2.25.1 From nobody Wed May 15 18:44:51 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=partner.samsung.com ARC-Seal: i=1; a=rsa-sha256; t=1683906334; cv=none; d=zohomail.com; s=zohoarc; b=ZA7u17pVIYhQZqQX8qgCj+3COoOYUXTRyfjgtEuE+Fu7zLrFAAatxiXi+FngjybP40rti+DTMGjxEsRy+WqGpLBujqNkwAbVpjLV8itlFrTMnRT+K31CBkSx4/aDe3/l+ky8j8rgp75dJYxUhTv6NWFrcterNh6C++TM2HtoOHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683906334; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jPCQ8olN3OGY4ECkHi7vvVMHQZFLzzwipIXGnoCN+Ng=; b=MvOKYgtLLtxYizr7m/YFUhFTT581qYm5ZbAvKTj5Jw81ccc1o7/sYxv/lAoN3JPfRsKkPpkFumOYAuZbZifBAuHy9iVzwdXcChpfjn14PjfQ7N6VBDO90wwxdA58QZH15gIipK4sXtMnTS/mYbnzrhoryz6teqhZfz0y0s7SG/M= 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 1683906334180125.64271135008835; Fri, 12 May 2023 08:45:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxUw5-0005Qb-Dc; Fri, 12 May 2023 11:44:01 -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 1pxUw4-0005Oi-4B for qemu-devel@nongnu.org; Fri, 12 May 2023 11:44:00 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxUw0-0007jt-8c for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:59 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230512154352euoutp01c30ade44639f5ee39fddbc998238862d~eb8v0BeKL0546205462euoutp01P for ; Fri, 12 May 2023 15:43:52 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230512154352eucas1p1ac04c898c3ff79ea40a1889feb16e671~eb8voGjOQ2347123471eucas1p1l; Fri, 12 May 2023 15:43:52 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 1D.B0.37758.8BE5E546; Fri, 12 May 2023 16:43:52 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230512154351eucas1p20e8e8cbae78e9725243a3542ceee466a~eb8vLcjbm1436614366eucas1p2v; Fri, 12 May 2023 15:43:51 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230512154351eusmtrp14e7ea55e5a8232c23110cb594ca543aa~eb8vK9PKW1998019980eusmtrp12; Fri, 12 May 2023 15:43:51 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 94.B6.14344.7BE5E546; Fri, 12 May 2023 16:43:51 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230512154351eusmtip15d38bd2732ace6606a8a6d1593f37721~eb8umN_3C1630116301eusmtip1G; Fri, 12 May 2023 15:43:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230512154352euoutp01c30ade44639f5ee39fddbc998238862d~eb8v0BeKL0546205462euoutp01P DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683906232; bh=jPCQ8olN3OGY4ECkHi7vvVMHQZFLzzwipIXGnoCN+Ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TzOfsdJ98fD2ToeXcmFX2KXDWBgUYCQWI6Kv5QWCMstX4CYYprZGZD7LFWCmGdq6Q n/6kDyuu1byhq3G4qJEE8XpwQ2jQPAv21vKWfcuW7XAcl1MXU4b5W93B7JeB4UiHrP w56pI747h0PrgE94xRdUHU2K87uPouioptsjWAkQ= X-AuditID: cbfec7f5-7ffff7000002937e-f8-645e5eb826a5 From: Tomasz Dzieciol To: qemu-devel@nongnu.org, akihiko.odaki@daynix.com Cc: sriram.yagnaraman@est.tech, jasowang@redhat.com, k.kwiecien@samsung.com, m.sochacki@samsung.com Subject: [PATCH v6 6/7] igb: packet-split descriptors support Date: Fri, 12 May 2023 17:43:34 +0200 Message-Id: <20230512154335.2536-7-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230512154335.2536-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42LZduzned0dcXEpBrdncFp8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujGVrdzAVbJjHWLHo/kv2BsY7OV2MnBwSAiYSrZMes3cxcnEICaxglPg8 +yYjhPOFUeL4uiaozGdGid5v25lhWp5NfsgGkVjOKHFx0gpWCKedSeLO1U1gVWwCZhKPvswD SnBwiAgYS3xsFwcJMwukShz9c5AFxBYWsJXoWbqSDcRmEVCVOLPtAlgrr4CTRMPfN+wQy+Ql Zl76zg4yhlPAWWLeCiGIEkGJkzOfsECMlJdo3jqbGeQECYEtHBJbj0xkgeh1kdgwdSLU0cIS r45vgZopI3F6cg9UTbnEz7Pb2CGaWxgl9kydDFVkLXFp60+w+5kFNCXW79KHCDtKbG56ygYS lhDgk7jxVhDiBj6JSdumM0OEeSU62oQgqnUkvm2aCVUtJbHwRh1E2ENi8fvljBMYFWcheWYW kmdmIaxdwMi8ilE8tbQ4Nz212DgvtVyvODG3uDQvXS85P3cTIzDBnP53/OsOxhWvPuodYmTi YDzEKMHBrCTC+3ZJdIoQb0piZVVqUX58UWlOavEhRmkOFiVxXm3bk8lCAumJJanZqakFqUUw WSYOTqkGpm4Trt9hvtYv1dherFjwreAa/5V7Pp1Lts/XCzzvlXx9/g9xI/v9f5aZiUdq7S5c WaptUdg3Jb2r5NeqNY8Ts/x/aHA2JC28yPjq1FED03P98xI380l8k4mVm7JVcO/qCdeWvhEv aZOo4j4Sl8FxJI9zasiSTVHHfYUzFqm7H9ELeG9pkb5ppl+Xa/OKhxuavs2fdbb2UUkLd83U dTPbwmX+9m9PkPLfsdcndvoJxv0rFbeJqG5WYeYRL8hPc7N8ubRCb0KLixBDHeP9X3taDrsf iXv1yr2sLtHuRfbZsgax4DtawgFC14/VfpvX9XTtYfkrkrJH+RYuZHN+Vn6tvXXF9u2JLkIy N0+vvnvURomlOCPRUIu5qDgRACp2PX+fAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xu7rb4+JSDP59VbP4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GcvW7mAq 2DCPsWLR/ZfsDYx3croYOTkkBEwknk1+yNbFyMUhJLCUUWLrvUfMEAkpiX09/9khbGGJP9e6 oIpamSROfD3OApJgEzCTePRlHmsXIweHiICpxLO9kiBhZoFMidOv9rGB2MICthI9S1eC2SwC qhJntl0Am88r4CTR8PcN1Hx5iZmXvrODjOEUcJaYt0IIJCwEVHKzbwETRLmgxMmZT1ggxstL NG+dzTyBUWAWktQsJKkFjEyrGEVSS4tz03OLjfSKE3OLS/PS9ZLzczcxAmNh27GfW3Ywrnz1 Ue8QIxMH4yFGCQ5mJRHet0uiU4R4UxIrq1KL8uOLSnNSiw8xmgKdPZFZSjQ5HxiNeSXxhmYG poYmZpYGppZmxkrivJ4FHYlCAumJJanZqakFqUUwfUwcnFINTEJB6SJ/thf++N/9QHON8zr/ /vodnz8da7MN7W2ZpcvaOO142dvJF230evY9Z/slFbBD8aJVemOSR8R+vrpD4knRrUl/Lh+K FPQ/Z5GVr7Xo1YnnB4WiH/YI/16U8VnyCdPm4k8/dd9+DFM+Lxm8uKplp8tnPtVTWwx/iPz6 wi9U9O/Va1brYu555132vs09/vqysLZHb1/j9RfeR/teLyiUYF22J+rFW/3jKbMCX2ecuTk3 9O+ROt0Nko224fsvnvs0zfD41atrDDgLHjw9ppAx652b1sJkg2PebwW+3mdozt94JnxF3QH7 2a4CBk/MXBKvX+AXWZDJ0tfUY+3Ou6S1yanP1evAmo6XXiLfu5RYijMSDbWYi4oTAaz+oJYO AwAA X-CMS-MailID: 20230512154351eucas1p20e8e8cbae78e9725243a3542ceee466a X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230512154351eucas1p20e8e8cbae78e9725243a3542ceee466a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230512154351eucas1p20e8e8cbae78e9725243a3542ceee466a References: <20230512154335.2536-1-t.dzieciol@partner.samsung.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: none client-ip=210.118.77.11; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout1.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=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 @samsung.com) X-ZM-MESSAGEID: 1683906335739100001 Packet-split descriptors are used by Linux VF driver for MTU values from 20= 48 Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 360 ++++++++++++++++++++++++++++++++++++++------ hw/net/igb_regs.h | 9 ++ hw/net/trace-events | 2 +- 3 files changed, 328 insertions(+), 43 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 6d95cccea3..51cd62cedd 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -267,6 +267,29 @@ igb_rx_use_legacy_descriptor(IGBCore *core) return false; } =20 +typedef struct E1000ERingInfo { + int dbah; + int dbal; + int dlen; + int dh; + int dt; + int idx; +} E1000ERingInfo; + +static uint32_t +igb_rx_queue_desctyp_get(IGBCore *core, const E1000ERingInfo *r) +{ + return core->mac[E1000_SRRCTL(r->idx) >> 2] & E1000_SRRCTL_DESCTYPE_MA= SK; +} + +static bool +igb_rx_use_ps_descriptor(IGBCore *core, const E1000ERingInfo *r) +{ + uint32_t desctyp =3D igb_rx_queue_desctyp_get(core, r); + return desctyp =3D=3D E1000_SRRCTL_DESCTYPE_HDR_SPLIT || + desctyp =3D=3D E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS; +} + static inline bool igb_rss_enabled(IGBCore *core) { @@ -694,15 +717,6 @@ static uint32_t igb_rx_wb_eic(IGBCore *core, int queue= _idx) return (ent & E1000_IVAR_VALID) ? BIT(ent & 0x1f) : 0; } =20 -typedef struct E1000ERingInfo { - int dbah; - int dbal; - int dlen; - int dh; - int dt; - int idx; -} E1000ERingInfo; - static inline bool igb_ring_empty(IGBCore *core, const E1000ERingInfo *r) { @@ -1233,12 +1247,25 @@ igb_read_lgcy_rx_descr(IGBCore *core, struct e1000_= rx_desc *desc, } =20 static inline void -igb_read_adv_rx_descr(IGBCore *core, union e1000_adv_rx_desc *desc, - hwaddr *buff_addr) +igb_read_adv_rx_single_buf_descr(IGBCore *core, union e1000_adv_rx_desc *d= esc, + hwaddr *buff_addr) { *buff_addr =3D le64_to_cpu(desc->read.pkt_addr); } =20 +static inline void +igb_read_adv_rx_split_buf_descr(IGBCore *core, union e1000_adv_rx_desc *de= sc, + hwaddr *buff_addr) +{ + buff_addr[0] =3D le64_to_cpu(desc->read.hdr_addr); + buff_addr[1] =3D le64_to_cpu(desc->read.pkt_addr); +} + +typedef struct IGBBAState { + uint16_t written[IGB_MAX_PS_BUFFERS]; + uint8_t cur_idx; +} IGBBAState; + typedef struct IGBPacketRxDMAState { size_t size; size_t total_size; @@ -1249,20 +1276,41 @@ typedef struct IGBPacketRxDMAState { uint32_t rx_desc_header_buf_size; struct iovec *iov; size_t iov_ofs; + bool do_ps; bool is_first; - uint16_t written; - hwaddr ba; + IGBBAState bastate; + hwaddr ba[IGB_MAX_PS_BUFFERS]; } IGBPacketRxDMAState; =20 static inline void -igb_read_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, - hwaddr *buff_addr) +igb_read_rx_descr(IGBCore *core, + union e1000_rx_desc_union *desc, + IGBPacketRxDMAState *pdma_st, + const E1000ERingInfo *r) { + uint32_t desc_type; + if (igb_rx_use_legacy_descriptor(core)) { - igb_read_lgcy_rx_descr(core, &desc->legacy, buff_addr); - } else { - igb_read_adv_rx_descr(core, &desc->adv, buff_addr); + igb_read_lgcy_rx_descr(core, &desc->legacy, &pdma_st->ba[1]); + pdma_st->ba[0] =3D 0; + return; + } + + /* advanced header split descriptor */ + if (igb_rx_use_ps_descriptor(core, r)) { + igb_read_adv_rx_split_buf_descr(core, &desc->adv, &pdma_st->ba[0]); + return; + } + + /* descriptor replication modes not supported */ + desc_type =3D igb_rx_queue_desctyp_get(core, r); + if (desc_type !=3D E1000_SRRCTL_DESCTYPE_ADV_ONEBUF) { + trace_igb_wrn_rx_desc_modes_not_supp(desc_type); } + + /* advanced single buffer descriptor */ + igb_read_adv_rx_single_buf_descr(core, &desc->adv, &pdma_st->ba[1]); + pdma_st->ba[0] =3D 0; } =20 static void @@ -1405,6 +1453,13 @@ igb_write_lgcy_rx_descr(IGBCore *core, struct e1000_= rx_desc *desc, desc->status =3D (uint8_t) le32_to_cpu(status_flags); } =20 +static bool +igb_rx_ps_descriptor_split_always(IGBCore *core, const E1000ERingInfo *r) +{ + uint32_t desctyp =3D igb_rx_queue_desctyp_get(core, r); + return desctyp =3D=3D E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS; +} + static uint16_t igb_rx_desc_get_packet_type(IGBCore *core, struct NetRxPkt *pkt, uint16_t = etqf) { @@ -1492,16 +1547,67 @@ igb_write_adv_rx_descr(IGBCore *core, d->wb.lower.lo_dword.pkt_info =3D cpu_to_le16(rss_type | (pkt_type << = 4)); } =20 +typedef struct IGBSplitDescriptorData { + bool sph; + bool hbo; + size_t hdr_len; +} IGBSplitDescriptorData; + static inline void -igb_write_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, - struct NetRxPkt *pkt, const E1000E_RSSInfo *rss_info, - uint16_t etqf, bool ts, uint16_t length) +igb_write_adv_ps_rx_descr(IGBCore *core, + union e1000_adv_rx_desc *d, + struct NetRxPkt *pkt, + const E1000E_RSSInfo *rss_info, + const E1000ERingInfo *r, + uint16_t etqf, + bool ts, + IGBSplitDescriptorData *ps_desc_data, + IGBPacketRxDMAState *pdma_st) +{ + size_t pkt_len; + size_t hdr_len =3D ps_desc_data->hdr_len; + + bool split_always =3D igb_rx_ps_descriptor_split_always(core, r); + if (!split_always) { + if (pdma_st->do_ps) { + pkt_len =3D pdma_st->bastate.written[1]; + } else { + pkt_len =3D pdma_st->bastate.written[0] + pdma_st->bastate.wri= tten[1]; + } + } else { + pkt_len =3D pdma_st->bastate.written[1]; + } + + igb_write_adv_rx_descr(core, d, pkt, rss_info, etqf, ts, pkt_len); + + d->wb.lower.lo_dword.hdr_info =3D (hdr_len << E1000_ADVRXD_HDR_LEN_OFF= SET) & + E1000_ADVRXD_ADV_HDR_LEN_MASK; + d->wb.lower.lo_dword.hdr_info |=3D ps_desc_data->sph ? E1000_ADVRXD_HD= R_SPH + : 0; + d->wb.upper.status_error |=3D ps_desc_data->hbo ? + E1000_ADVRXD_ST_ERR_HBO_OFFSET : 0; +} + +static inline void +igb_write_rx_descr(IGBCore *core, + union e1000_rx_desc_union *desc, + struct NetRxPkt *pkt, + const E1000E_RSSInfo *rss_info, + uint16_t etqf, + bool ts, + IGBSplitDescriptorData *ps_desc_data, + IGBPacketRxDMAState *pdma_st, + const E1000ERingInfo *r) { if (igb_rx_use_legacy_descriptor(core)) { - igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, length= ); + igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, + pdma_st->bastate.written[1]); + } else if (igb_rx_use_ps_descriptor(core, r)) { + igb_write_adv_ps_rx_descr(core, &desc->adv, pkt, rss_info, r, etqf= , ts, + ps_desc_data, pdma_st); } else { igb_write_adv_rx_descr(core, &desc->adv, pkt, rss_info, - etqf, ts, length); + etqf, ts, pdma_st->bastate.written[1]); } } =20 @@ -1562,26 +1668,182 @@ igb_rx_descr_threshold_hit(IGBCore *core, const E1= 000ERingInfo *rxi) ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; } =20 +static bool +igb_do_ps(IGBCore *core, + const E1000ERingInfo *r, + struct NetRxPkt *pkt, + size_t *hdr_len, + IGBSplitDescriptorData *ps_desc_data) +{ + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + bool fragment; + bool split_always; + size_t bheader_size; + size_t total_pkt_len; + + if (!igb_rx_use_ps_descriptor(core, r)) { + return false; + } + + memset(ps_desc_data, 0, sizeof(IGBSplitDescriptorData)); + + total_pkt_len =3D net_rx_pkt_get_total_len(pkt); + bheader_size =3D igb_get_queue_rx_header_buf_size(core, r); + split_always =3D igb_rx_ps_descriptor_split_always(core, r); + if (split_always && total_pkt_len <=3D bheader_size) { + *hdr_len =3D total_pkt_len; + ps_desc_data->hdr_len =3D total_pkt_len; + return true; + } + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); + + if (hasip4) { + fragment =3D net_rx_pkt_get_ip4_info(pkt)->fragment; + } else if (hasip6) { + fragment =3D net_rx_pkt_get_ip6_info(pkt)->fragment; + } else { + ps_desc_data->hdr_len =3D bheader_size; + goto header_not_handled; + } + + if (fragment && (core->mac[RFCTL] & E1000_RFCTL_IPFRSP_DIS)) { + ps_desc_data->hdr_len =3D bheader_size; + goto header_not_handled; + } + + /* no header splitting for SCTP */ + if (!fragment && (l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_UDP || + l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_TCP)) { + *hdr_len =3D net_rx_pkt_get_l5_hdr_offset(pkt); + } else { + *hdr_len =3D net_rx_pkt_get_l4_hdr_offset(pkt); + } + + ps_desc_data->sph =3D true; + ps_desc_data->hdr_len =3D *hdr_len; + + if (*hdr_len > bheader_size) { + ps_desc_data->hbo =3D true; + goto header_not_handled; + } + + return true; + +header_not_handled: + if (split_always) { + *hdr_len =3D bheader_size; + return true; + } + + return false; +} + static void igb_truncate_to_descriptor_size(IGBPacketRxDMAState *pdma_st, size_t *size) { - if (*size > pdma_st->rx_desc_packet_buf_size) { - *size =3D pdma_st->rx_desc_packet_buf_size; + if (pdma_st->do_ps && pdma_st->is_first) { + if (*size > pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_len= ) { + *size =3D pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_l= en; + } + } else { + if (*size > pdma_st->rx_desc_packet_buf_size) { + *size =3D pdma_st->rx_desc_packet_buf_size; + } + } +} + +static inline void +igb_write_hdr_to_rx_buffers(IGBCore *core, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + const char *data, + dma_addr_t data_len) +{ + assert(data_len <=3D pdma_st->rx_desc_header_buf_size - + pdma_st->bastate.written[0]); + pci_dma_write(d, + pdma_st->ba[0] + pdma_st->bastate.written[0], + data, data_len); + pdma_st->bastate.written[0] +=3D data_len; + pdma_st->bastate.cur_idx =3D 1; +} + +static void +igb_write_packet_hdr_to_descr_addr(IGBCore *core, + struct NetRxPkt *pkt, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + size_t *copy_size) +{ + size_t iov_copy; + size_t ps_hdr_copied =3D 0; + + if (!pdma_st->is_first) { + /* Leave buffer 0 of each descriptor except first */ + /* empty */ + pdma_st->bastate.cur_idx =3D 1; + return; } + + do { + iov_copy =3D MIN(pdma_st->ps_hdr_len - ps_hdr_copied, + pdma_st->iov->iov_len - pdma_st->iov_ofs); + + igb_write_hdr_to_rx_buffers(core, d, pdma_st, + pdma_st->iov->iov_base, + iov_copy); + + *copy_size -=3D iov_copy; + ps_hdr_copied +=3D iov_copy; + + pdma_st->iov_ofs +=3D iov_copy; + if (pdma_st->iov_ofs =3D=3D pdma_st->iov->iov_len) { + pdma_st->iov++; + pdma_st->iov_ofs =3D 0; + } + } while (ps_hdr_copied < pdma_st->ps_hdr_len); + + pdma_st->is_first =3D false; } =20 static void igb_write_payload_frag_to_rx_buffers(IGBCore *core, PCIDevice *d, - hwaddr ba, - uint16_t *written, - uint32_t cur_buf_len, + IGBPacketRxDMAState *pdma_st, const char *data, dma_addr_t data_len) { - trace_igb_rx_desc_buff_write(ba, *written, data, data_len); - pci_dma_write(d, ba + *written, data, data_len); - *written +=3D data_len; + while (data_len > 0) { + assert(pdma_st->bastate.cur_idx < IGB_MAX_PS_BUFFERS); + + uint32_t cur_buf_bytes_left =3D + pdma_st->rx_desc_packet_buf_size - + pdma_st->bastate.written[pdma_st->bastate.cur_idx]; + uint32_t bytes_to_write =3D MIN(data_len, cur_buf_bytes_left); + + trace_igb_rx_desc_buff_write( + pdma_st->bastate.cur_idx, + pdma_st->ba[pdma_st->bastate.cur_idx], + pdma_st->bastate.written[pdma_st->bastate.cur_idx], + data, + bytes_to_write); + + pci_dma_write(d, + pdma_st->ba[pdma_st->bastate.cur_idx] + + pdma_st->bastate.written[pdma_st->bastate.cur_idx], + data, bytes_to_write); + + pdma_st->bastate.written[pdma_st->bastate.cur_idx] +=3D bytes_to_w= rite; + data +=3D bytes_to_write; + data_len -=3D bytes_to_write; + + if (pdma_st->bastate.written[pdma_st->bastate.cur_idx] =3D=3D + pdma_st->rx_desc_packet_buf_size) { + pdma_st->bastate.cur_idx++; + } + } } =20 static void @@ -1598,9 +1860,7 @@ igb_write_payload_to_rx_buffers(IGBCore *core, while (*copy_size) { iov_copy =3D MIN(*copy_size, pdma_st->iov->iov_len - pdma_st->iov_= ofs); igb_write_payload_frag_to_rx_buffers(core, d, - pdma_st->ba, - &pdma_st->written, - pdma_st->rx_desc_packet_buf_s= ize, + pdma_st, pdma_st->iov->iov_base + pdma_st->iov_ofs, iov_copy); @@ -1616,9 +1876,7 @@ igb_write_payload_to_rx_buffers(IGBCore *core, if (pdma_st->desc_offset + pdma_st->desc_size >=3D pdma_st->total_size= ) { /* Simulate FCS checksum presence in the last descriptor */ igb_write_payload_frag_to_rx_buffers(core, d, - pdma_st->ba, - &pdma_st->written, - pdma_st->rx_desc_packet_buf_s= ize, + pdma_st, (const char *) &fcs_pad, e1000x_fcs_len(core->mac)); } @@ -1632,7 +1890,7 @@ igb_write_to_rx_buffers(IGBCore *core, { size_t copy_size; =20 - if (!pdma_st->ba) { + if (!(pdma_st->ba)[1]) { /* as per intel docs; skip descriptors with null buf addr */ trace_e1000e_rx_null_descriptor(); return; @@ -1646,6 +1904,14 @@ igb_write_to_rx_buffers(IGBCore *core, igb_truncate_to_descriptor_size(pdma_st, &pdma_st->desc_size); copy_size =3D pdma_st->size - pdma_st->desc_offset; igb_truncate_to_descriptor_size(pdma_st, ©_size); + + /* For PS mode copy the packet header first */ + if (pdma_st->do_ps) { + igb_write_packet_hdr_to_descr_addr(core, pkt, d, pdma_st, ©_si= ze); + } else { + pdma_st->bastate.cur_idx =3D 1; + } + igb_write_payload_to_rx_buffers(core, pkt, d, pdma_st, ©_size); } =20 @@ -1660,6 +1926,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, union e1000_rx_desc_union desc; const E1000ERingInfo *rxi; size_t rx_desc_len; + IGBSplitDescriptorData ps_desc_data; =20 IGBPacketRxDMAState pdma_st =3D {0}; pdma_st.is_first =3D true; @@ -1678,8 +1945,12 @@ igb_write_packet_to_guest(IGBCore *core, struct NetR= xPkt *pkt, d =3D core->owner; } =20 + pdma_st.do_ps =3D igb_do_ps(core, rxi, pkt, + &pdma_st.ps_hdr_len, + &ps_desc_data); + do { - pdma_st.written =3D 0; + memset(&pdma_st.bastate, 0, sizeof(IGBBAState)); bool is_last =3D false; =20 if (igb_ring_empty(core, rxi)) { @@ -1690,7 +1961,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, pci_dma_read(d, base, &desc, rx_desc_len); trace_e1000e_rx_descr(rxi->idx, base, rx_desc_len); =20 - igb_read_rx_descr(core, &desc, &pdma_st.ba); + igb_read_rx_descr(core, &desc, &pdma_st, rxi); =20 igb_write_to_rx_buffers(core, pkt, d, &pdma_st); pdma_st.desc_offset +=3D pdma_st.desc_size; @@ -1698,8 +1969,13 @@ igb_write_packet_to_guest(IGBCore *core, struct NetR= xPkt *pkt, is_last =3D true; } =20 - igb_write_rx_descr(core, &desc, is_last ? core->rx_pkt : NULL, - rss_info, etqf, ts, pdma_st.written); + igb_write_rx_descr(core, &desc, + is_last ? pkt : NULL, + rss_info, + etqf, ts, + &ps_desc_data, + &pdma_st, + rxi); pci_dma_write(d, base, &desc, rx_desc_len); igb_ring_advance(core, rxi, rx_desc_len / E1000_MIN_RX_DESC_LEN); diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index 36763f2ff7..ed7427b8fe 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -452,6 +452,7 @@ union e1000_adv_rx_desc { #define E1000_SRRCTL_BSIZEHDRSIZE_MASK 0x00000F00 #define E1000_SRRCTL_BSIZEHDRSIZE_SHIFT 2 /* Shift _left_ */ #define E1000_SRRCTL_DESCTYPE_ADV_ONEBUF 0x02000000 +#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT 0x04000000 #define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS 0x0A000000 #define E1000_SRRCTL_DESCTYPE_MASK 0x0E000000 #define E1000_SRRCTL_DROP_EN 0x80000000 @@ -699,6 +700,14 @@ union e1000_adv_rx_desc { #define E1000_ADVRXD_PKT_UDP BIT(5) #define E1000_ADVRXD_PKT_SCTP BIT(6) =20 +#define IGB_MAX_PS_BUFFERS 2 + +#define E1000_ADVRXD_HDR_LEN_OFFSET (21 - 16) +#define E1000_ADVRXD_ADV_HDR_LEN_MASK ((BIT(10) - 1) << \ + E1000_ADVRXD_HDR_LEN_OFFSET) +#define E1000_ADVRXD_HDR_SPH BIT(15) +#define E1000_ADVRXD_ST_ERR_HBO_OFFSET BIT(3 + 20) + static inline uint8_t igb_ivar_entry_rx(uint8_t i) { return i < 8 ? i * 4 : (i - 8) * 4 + 2; diff --git a/hw/net/trace-events b/hw/net/trace-events index def651c186..e97e9dc17b 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -277,7 +277,7 @@ igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRIT= E: PHY[%u] UNHANDLED" igb_link_set_ext_params(bool asd_check, bool speed_select_bypass, bool pfr= std) "Set extended link params: ASD check: %d, Speed select bypass: %d, PF = reset done: %d" =20 igb_rx_desc_buff_size(uint32_t b) "buffer size: %u" -igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from: %p, length:= %u" +igb_rx_desc_buff_write(uint8_t idx, uint64_t addr, uint16_t offset, const = void* source, uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from= : %p, length: %u" =20 igb_rx_metadata_rss(uint32_t rss, uint16_t rss_pkt_type) "RSS data: rss: 0= x%X, rss_pkt_type: 0x%X" =20 --=20 2.25.1 From nobody Wed May 15 18:44:51 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=partner.samsung.com ARC-Seal: i=1; a=rsa-sha256; t=1683906308; cv=none; d=zohomail.com; s=zohoarc; b=KOob55ntkMbf8UkqtRplorgHBhMYoOkwpBCnbRL8puaKXXHxJo+BO3ycCRf3tnhDKuOu7P3eBpR+sFTwHxF5Z5Vk9/qz8ycrQIPHbb12+zBc6NpE4cPIBDFyQ8WuKa+4UiRGfaFgEy4VkCIZMOpC8s6QLuTBpz9OXws78SSQCLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683906308; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ynz/skC9Jzhq8J0h2QxYd6k1RgoOF0zcmKy7EC040b8=; b=QyF5y9u+uzxz+N6Nj4QkcTx54g/2tvHEeIDKPi1AiCvVu0J/notoxMsUCaARE9uifA4kSJILYOePIAF1xwvEmoQRafDveg2Xuv0jeYZLJk0d7OttwOxx2dDod1dh9EH/wbaAaEKDkMgzODIt73CCTSTv5fo6LpFEF3u4MvRmlI4= 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 1683906308605914.3563509467579; Fri, 12 May 2023 08:45:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxUw5-0005Qc-EG; Fri, 12 May 2023 11:44:01 -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 1pxUw3-0005OK-9A for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:59 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxUw0-0007k2-8I for qemu-devel@nongnu.org; Fri, 12 May 2023 11:43:59 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230512154352euoutp01a8a2855241beaea797cf2f4771c6e842~eb8wQzHS20546205462euoutp01Q for ; Fri, 12 May 2023 15:43:52 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230512154352eucas1p1d930b9322edfe17384e34a300503bdb0~eb8v69e7V3053030530eucas1p1C; Fri, 12 May 2023 15:43:52 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id BD.B0.37758.8BE5E546; Fri, 12 May 2023 16:43:52 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230512154352eucas1p25e99e73c4eef05376602d1686ddddb6d~eb8vl_1hM3014130141eucas1p2l; Fri, 12 May 2023 15:43:52 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230512154352eusmtrp128d85822e185d0132bc9c89329de6f92~eb8vlgdxD1998019980eusmtrp13; Fri, 12 May 2023 15:43:52 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id C2.73.10549.8BE5E546; Fri, 12 May 2023 16:43:52 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230512154351eusmtip1f9c2d80de58b2eea38059c53b27df115~eb8vHJLNy2547025470eusmtip1Q; Fri, 12 May 2023 15:43:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230512154352euoutp01a8a2855241beaea797cf2f4771c6e842~eb8wQzHS20546205462euoutp01Q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683906232; bh=Ynz/skC9Jzhq8J0h2QxYd6k1RgoOF0zcmKy7EC040b8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s446O+wF61eBuioUi/xXXOs1mukOq/ul++sSB0yS8s7DZ59nDGvEMafRj3JQsdOTL 8yFpOMrM3NEKdzP/fPZ4F3aCmO+WjvwP2pet5BP1UhcQLMoI9vbY3bssKRbgIwg5lC V9IZEnvoV7s8p4ykY9o6vBRcHzTbefMcKShNsE1U= X-AuditID: cbfec7f5-7ffff7000002937e-fa-645e5eb8b7c2 From: Tomasz Dzieciol To: qemu-devel@nongnu.org, akihiko.odaki@daynix.com Cc: sriram.yagnaraman@est.tech, jasowang@redhat.com, k.kwiecien@samsung.com, m.sochacki@samsung.com Subject: [PATCH v6 7/7] e1000e: rename e1000e_ba_state Date: Fri, 12 May 2023 17:43:35 +0200 Message-Id: <20230512154335.2536-8-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230512154335.2536-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduznOd0dcXEpBov2Slt8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujF+Xgwtm8VVcWfWasYFxPmcXIyeHhICJxNl9vYxdjFwcQgIrGCXW3/jC DOF8YZR4dG0nK4TzmVHi669FzDAtjeteskAkljNK7Pu6GKqlnUni/4OvjCBVbAJmEo++zANq 5+AQETCW+NguDhJmFkiVOPrnIAuILQxU8vPaXHYQm0VAVeLN7Y9MIDavgJPE6s7tUMvkJWZe +s4OMoZTwFli3gohiBJBiZMzn7BAjJSXaN46G+wECYG1HBI/J39lheh1kXjeMBdqjrDEq+Nb 2CFsGYnTk3tYIOxyiZ9nt7FDNLcwSuyZOhmqyFri0tafYPczC2hKrN+lDxF2lHh8dB8TSFhC gE/ixltBiBv4JCZtm84MEeaV6GgTgqjWkfi2aSYbRFhKYuGNOoiwh8ScS02MExgVZyF5ZhaS Z2YhrF3AyLyKUTy1tDg3PbXYOC+1XK84Mbe4NC9dLzk/dxMjMLmc/nf86w7GFa8+6h1iZOJg PMQowcGsJML7dkl0ihBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFebduTyUIC6YklqdmpqQWpRTBZ Jg5OqQamgKMLlq3KeFYe8V1u9qfKe8HiK96cjw0S2nl2bdSW5aIvcvbedE8MOD0vPT5+9eX3 mbu1WPcssD8a8draLLjqgGeCdPfMb+xHrlTYuC6/v+XAe9M5z70S3a+w1ntsS9ySt9VxBZue Xk2F9JGgmrmJb19VzVvapyx40oG9e+GEyISsJ/+er7xQIqRpU54W8W/T3q33Hzm+sdp3zPm3 2wrt3c+s1prHBc6oyV195gz/70LWmc6dE1VcWLq2tcZpcOswiqSYc/XvePpsFutyHt07f0zu 56/elFMVeDo/gGH3wxfWB5x6xLSapjM+mmM1udmmVSrv/9Lbq0rMly9i+/po/sX5rgwZDya8 e3L/NyeXlRJLcUaioRZzUXEiAPWWAJudAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xu7o74uJSDCbu4LD4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6Gb8uBxfM 4qu4suo1YwPjfM4uRk4OCQETicZ1L1m6GLk4hASWMkpMOf+VDSIhJbGv5z87hC0s8edaFxtE USuTxMv/J5lAEmwCZhKPvsxj7WLk4BARMJV4tlcSJMwskClx+tU+sDnCQCU/r80Fm8MioCrx 5vZHsFZeASeJ1Z3bmSHmy0vMvPSdHWQMp4CzxLwVQiBhIaCSm30LoMoFJU7OfMICMV5eonnr bOYJjAKzkKRmIUktYGRaxSiSWlqcm55bbKhXnJhbXJqXrpecn7uJERgH24793LyDcd6rj3qH GJk4GA8xSnAwK4nwvl0SnSLEm5JYWZValB9fVJqTWnyI0RTo7InMUqLJ+cBIzCuJNzQzMDU0 MbM0MLU0M1YS5/Us6EgUEkhPLEnNTk0tSC2C6WPi4JRqYDLudr5/2a+lTe2ah9O9zhSp5S+m s2rNq3uWff5J4pflL77++OuYfUbX6aS1hrQoS19X77UMjStvbhhxHHeq25C9ME7onU2u4RHW MrXFS/wlrp5dfU1SJiNqsbS7y4SbVo6fC0tEuW3C8o42XFnQUsH3ol1W/8Fsp+xoe6VP+Qde KTxamN69ojd97du64MS27w+cmpcuNnv13drOw+LhsvdJ7IWFMsve7DwaksSf/nmTzb1VdT90 fThkvZUFVjKvDNB+eD9ju+elpPV7b8ZstPy8dbmAuVzX1IR5iVdvhwvrB1ifafmyk8v/3prv Llunhsxx4rkdsXxt5eek03IybCxfTYylbuZyVJ+4vnXDJyWW4oxEQy3mouJEAPsQ6kgMAwAA X-CMS-MailID: 20230512154352eucas1p25e99e73c4eef05376602d1686ddddb6d X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230512154352eucas1p25e99e73c4eef05376602d1686ddddb6d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230512154352eucas1p25e99e73c4eef05376602d1686ddddb6d References: <20230512154335.2536-1-t.dzieciol@partner.samsung.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: none client-ip=210.118.77.11; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout1.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=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 @samsung.com) X-ZM-MESSAGEID: 1683906310812100005 Rename e1000e_ba_state according to qemu typdefs guide. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index f9ff31fd70..be0cf2f941 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1397,15 +1397,15 @@ e1000e_pci_dma_write_rx_desc(E1000ECore *core, dma_= addr_t addr, } } =20 -typedef struct e1000e_ba_state_st { +typedef struct E1000EBAState { uint16_t written[MAX_PS_BUFFERS]; uint8_t cur_idx; -} e1000e_ba_state; +} E1000EBAState; =20 static inline void e1000e_write_hdr_to_rx_buffers(E1000ECore *core, hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, + E1000EBAState *bastate, const char *data, dma_addr_t data_len) { @@ -1420,7 +1420,7 @@ e1000e_write_hdr_to_rx_buffers(E1000ECore *core, static void e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core, hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, + E1000EBAState *bastate, const char *data, dma_addr_t data_len) { @@ -1530,7 +1530,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, =20 do { hwaddr ba[MAX_PS_BUFFERS]; - e1000e_ba_state bastate =3D { { 0 } }; + E1000EBAState bastate =3D { { 0 } }; bool is_last =3D false; =20 desc_size =3D total_size - desc_offset; --=20 2.25.1