From nobody Sat May 18 13:16:23 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=1684338480; cv=none; d=zohomail.com; s=zohoarc; b=dF5YH8EPVXtjr+pbfqu/lMBcOEUBPLk6xK46UtgOqDpRySRtcmPAVIZ0uH3RO1TXHo772QUWaMt1MQIm1iHvr/iPC4qyd7IkG6cycRueWMwF5CCrjxpL+0d1coVXk+1uQwscfcsHehHRmUSK4E2qSA2ajxp3EuuAsNe4nouzevI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684338480; 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=Zphl1uiYPqYdckAv1AZGnkM9WW7tZssxJr6wBXnA8ofnWGSX+OFp3obhjXz+Z/w4O1gFyMjnenh251V4+4IiUYrNuIl+Xc7W74eMObL1U846V6KuAGNhGXfMzgdsQ68nLwEWrAN6sPra0bhmhf52Vf+326IPuqo4BxlhVY1W2a0= 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 1684338480296134.18678566821075; Wed, 17 May 2023 08:48:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJN4-0004ge-VN; Wed, 17 May 2023 11:47:23 -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 1pzJMy-0004fi-L2 for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:19 -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 1pzJMw-0004fC-Jc for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:16 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230517154709euoutp024ee7c0863923bc51a917d6d64b62e8aa~f_OCVn6Fq0527405274euoutp02Q for ; Wed, 17 May 2023 15:47:09 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230517154708eucas1p1d45c3f3b6b737c99db4f9f21439588df~f_OCJ77Bj0470004700eucas1p1B; Wed, 17 May 2023 15:47:08 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 43.DD.42423.CF6F4646; Wed, 17 May 2023 16:47:08 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230517154708eucas1p2cb3cb75a307d9f13d981b07dabf683ee~f_OB0zciG2045220452eucas1p2b; Wed, 17 May 2023 15:47:08 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230517154708eusmtrp10cec8c04e4d26b9ead82c9a6889022c8~f_OB0N2BJ2897228972eusmtrp1I; Wed, 17 May 2023 15:47:08 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 2D.07.10549.CF6F4646; Wed, 17 May 2023 16:47:08 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230517154707eusmtip2830b0cc4cb818033cbb7f93c7fd25c50~f_OBPJFhn2117621176eusmtip2s; Wed, 17 May 2023 15:47:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230517154709euoutp024ee7c0863923bc51a917d6d64b62e8aa~f_OCVn6Fq0527405274euoutp02Q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684338429; bh=RAdTRgkb5cVy6FP5ribk2kxIlvYd4xCVAvY0Bobfcq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJ+k9Z44EYkmb2ivV/AEZRKsuwAmRBEm+yNOUC74G67i93C2ZhNdfDmCvmiHS5v7K 0Mp9d8Shphj1CkmV8L3yFvvupILtNFH4Hx+cdYSItDXIH1euMUvg0tei7ALlqsOa7K teSjo4FdoNBo+NN1iKn/pg8knKmpzJUEPf4nN8R0= X-AuditID: cbfec7f2-a3bff7000002a5b7-47-6464f6fc23ab 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 v7 1/7] igb: remove TCP ACK detection Date: Wed, 17 May 2023 17:46:56 +0200 Message-Id: <20230517154702.4215-2-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517154702.4215-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA01Se0iTcRTl9z22T2H1bRZeLLRGD8pShymj1MoKFmQvikSyXNuHs+a0bWZF hTHbRm9mD5y9NEyzolrbnCarCbrMtJIsQSIbPbZRhinz0egxv0X9d+6559x7D1wKF5wgY6gC lZZRq6RKISeSsLePdy8OBuTyJN1Eknj46R2u+EbPMCY+evUSKbb1jnHF7lMOQnzK4sVWcCRP vrpIyQtPNy758PoBJvnm7OVITlsb0EYyJzJNzigL9jHqxIy8SEXAbyGK+8n9g69eYmWohTiO Iiigl8Bzg59zHEVSAroegcuu57LFCIJPPW/CxTCCC31vyb+Wj7d/4SEsoOsQGGvnsCIDBjXB WizU4NCp4Bm58sdAUdPoZBgyRIdonGagLeiaXB1Fp8Ajl4MbwgQ9FyzGxkmeR2dCr7uRy+6K g8qe0UkcQa8C45CTw2r40FH5gWBnxoHOVoWHbgD6DgW2b004a14N1xv84UFR4Hdbw3gmdFac DOcvhfEuO5c1lyNoOV8RFi2DHtv4ZACcXgB3mxNZeiWYBt4TIRroKdD3lc/eMAVM9os4S/PA qBew6kUQsFRyWDoGqvuOsLQEBut15Fk02/xfGPN/Ycz/1l5DeAOKZko0hfmMRqRiShM00kJN iSo/QVZUaEF//qXzp/u7A132DyW0IoxCrQgoXDiNt+m0TC7gyaUHDjLqop3qEiWjaUUzKEIY zYtP75AJ6HypltnDMMWM+m8XoyJiyrDcmXdT08+uS8s9XFEXs16RPDunbc0R0etSryAjO4fO Jd91ew2ODWm+L+0FIj25+9yEYKgD/9xeU0upl15fJQtO9dWPlxdoA2vy5j+z2xKde73U9GZm oJXfmZjVrzXezE7Rcz0/q3xn2mtSzLNUA+6tmRG7zukzlm//kRKb64me5UzSkWhiven2+eGx +Kj+ncEZeRnzDdY998fiR2P5inm6gCGq6mn9oVjP4jOjdl/Tcq2124Tv6PLHZd4S7fcdLH9s /lHOjT1W+7Fti1P7sqQIc09sljUp1x1TKZtM27wtumvPhNVH+QoXkTW4V+awZlVvvictQ9JP q2+s7XgoJDQKqWghrtZIfwMtJ5AAngMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7p/vqWkGFy8IGXx+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mr692sRS cJu14t2Vi0wNjHtYuhg5OSQETCServnPDGILCSxllDjz0BAiLiWxr+c/O4QtLPHnWhdbFyMX UE0rk8S0w5fBEmwCZhKPvsxj7WLk4BARMJV4tlcSJMwskClx+tU+NhBbGCi8/+AOsHIWAVWJ TR3bwfbyCjhJXD2+HWq+vMTMS9/BbE4BZ4mOjxC9QkA1H591sELUC0qcnPmEBWK+vETz1tnM ExgFZiFJzUKSWsDItIpRJLW0ODc9t9hQrzgxt7g0L10vOT93EyMwErYd+7l5B+O8Vx/1DjEy cTAeYpTgYFYS4Q3sS04R4k1JrKxKLcqPLyrNSS0+xGgKdPdEZinR5HxgLOaVxBuaGZgamphZ GphamhkrifN6FnQkCgmkJ5akZqemFqQWwfQxcXBKNTAZPfvubB08y9LbM3+75Y43YvEZpevt 63a2+M5bLvTh+4ni7uNmx7Sl6h17zeRieHVKj61YXCLVYGTD3lt9OVo2d/XOz+en8ltzsBwU qjwYur3517/yVxNveVxhet0tuEM0pbLAZZ5yoqZpStGMbw52uQ/01mcdjsn88oLtf4+094L5 mQdnXz9btahL4VLriRL5mY1XRCUFNI54L/48yetpzQaLK3d0jJZOlJq/pW23sWOcgMaKRRNW rCpMXsp0/Rzb7IuJEx6+XexoPXupLs90320/LrJstK64taXsMP+8NxmH1W65rqnQjNqwjOXi mocdMTN2/O4y5HRdy5XwZH1LWNh6dsFMtsk3PBdu+OStxFKckWioxVxUnAgA3r1ahg0DAAA= X-CMS-MailID: 20230517154708eucas1p2cb3cb75a307d9f13d981b07dabf683ee X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230517154708eucas1p2cb3cb75a307d9f13d981b07dabf683ee X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230517154708eucas1p2cb3cb75a307d9f13d981b07dabf683ee References: <20230517154702.4215-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: 1684338487995100001 TCP ACK detection is no longer present in igb. Signed-off-by: Tomasz Dzieciol --- 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 Sat May 18 13:16:23 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=1684338522; cv=none; d=zohomail.com; s=zohoarc; b=CDLZ+b+SvLGokhiborZsgkccx2lnZaQ8PNrqqthqt5p6W0p9Pk54dQGRSI7Ai0FPUk5sZqfnh1OmW37oraBmD4HSL1dCUm/f8hBN/9a/c4OdGCZ0wZwU9MYJX6KKQxfDTjsY3e9NIGD7kYaIaOFcU5kaV2rQxb6lwwb1yb1GMyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684338522; 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=SJ+CvAWMkJR4XnsVL8WHcUca4WGPym2/Hi1gmPpdXHnqbutOKmj66GRlGr63nkAfcHtMJHNAl2h8YnNjOUA9rel+31s9sqdMlB44Xx3zVdsBUzuNBPCP3Xqb9x9LBEtDj04thxNJ7c57Vjp6RRKdhmyGKRcnV2ytjHPkDl7HnmI= 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 1684338522680783.9703368913475; Wed, 17 May 2023 08:48:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJN6-0004hy-EU; Wed, 17 May 2023 11:47:24 -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 1pzJN2-0004gS-4G for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:20 -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 1pzJMy-0004fF-S0 for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:19 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230517154709euoutp018583439f12885475eb5ae0998a8f8387~f_OCyIVgy0282502825euoutp01E for ; Wed, 17 May 2023 15:47:09 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230517154709eucas1p19a6a50d3e9da8fe8b5415136d9dd6e7d~f_OCnP6z40470004700eucas1p1E; Wed, 17 May 2023 15:47:09 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id E3.DD.42423.DF6F4646; Wed, 17 May 2023 16:47:09 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230517154709eucas1p2713ef60e2e2d6dec68b72723a3f9abaf~f_OCSwc_U1901319013eucas1p2c; Wed, 17 May 2023 15:47:09 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230517154709eusmtrp16df5a0ec2871310c2fdea5c834744913~f_OCSH-Wj2897428974eusmtrp1D; Wed, 17 May 2023 15:47:09 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 7E.07.10549.CF6F4646; Wed, 17 May 2023 16:47:08 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230517154708eusmtip20c375172688db25e91a0ddf3ff7219d2~f_OBvg8Bb1593615936eusmtip2i; Wed, 17 May 2023 15:47:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230517154709euoutp018583439f12885475eb5ae0998a8f8387~f_OCyIVgy0282502825euoutp01E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684338429; bh=EWsco+cJ7x7/FUF1IEPdzJA/MQGvkaw07RGP4KOVkTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BIQPBc/ySQg2qqThlDH9SMvNqXznMOkahTFIw2BIilXWdYnXxtsAr5nqzMd1GE3wI Xru1FOD/EBrDqchsmYnFu37BkFhLxxJYT1sg0K5zqx2i0y8DwN9cvy5YgsP9FZ4OYE +YdrxDV6bmx8l7nMV0LsqefPurp16YmfaAD4lC/g= X-AuditID: cbfec7f2-a3bff7000002a5b7-49-6464f6fdd858 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 v7 2/7] igb: rename E1000E_RingInfo_st Date: Wed, 17 May 2023 17:46:57 +0200 Message-Id: <20230517154702.4215-3-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517154702.4215-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA01SfVDLcRz2/b1sv8bcr5nrcyMpdidLUo4dIfTHOOdyiUNktZ+KWtnkpTvU IZnKy061hYWoc+jsTV4q60pqZKbUebskcZ2QpXTe5zfHf8/zfJ7n+/k8d18KF+SRIipZuY1R KeUpARweYb0z3DLt+6BCEfLaIZC6mi9zpRecLkyabThJSi1tX7jSxvwqQppvfItFcGR3+2yk zNHVgsu6H5sw2YeaNo6swHwRRZFreeEKJiV5O6OaPn8jL6mz/jieXrhh58+OK2QWGl6qQV4U 0DPB1mNBGsSjBHQFAnt2J5clAwhabWUe4kKQVWjk/I08uPrQEylH8Km8zUMOYtDQeB25XRx6 FnQNnCY1iKKEdBj0H/RxyzjNQMM3G+HGY35bik0nSTcmaDFUnLPibsynF8E7w2eMXeYHOucQ 14296MWQ21/DYT3e0KTrJtg3/WCfpQR33wC0mQJtk8MTjoScqlzP1WOgt9HMZfF4sGvzCBbv gOH7Vi4b3o/g1gmtxzQXnJbhPwVwOhAqb0xn5YXQU6/F3DLQo6Gjz5u9YTQctxbhrMyH3BwB 6w6CQaOOw8oiONOxh5VlcMJg4hxF/vr/yuj/K6P/t7YU4ReRD5OhTk1k1DOUzI5gtTxVnaFM DE5ISzWi3x/G/qPxUxU61dsfXIcwCtUhoPAAIX9FQYJCwFfId2UyqrQ4VUYKo65D4ygiwIcv mdeUIKAT5duYLQyTzqj+TjHKS5SFrSrxKvTfsz37SIVjxPL8uXn3a1+1rHwfEo138nRzJi+w +xZHPYs8OtYWq5U8f/XktCC2mztSvKks2RSaFnSmleyvCRzFbV/FRDbrjvXmOMULmPgeyaWY wIQsaYT16qEuYXPPYIQY9q7cLfp4uOippCadOh+uCH1ph/g0nmGd3vvr0NmRk9+WLUtfbdoc 27ApP/Ob3lAb13bk0YT2JQZetflZ9Od418CL1bd9Y8rXFJijbgr5xtDqsBaJGb2ZPUpw4KXG GfLEUZdpZ2q3ztGEr2tdLxZ1KIu0mJ9/eWnSg8dB1zRChW/zqXtaTcy82CGFq5KYVFl/z/J+ 4hWyb0pnagChTpLPmIqr1PJfLgN3k58DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xe7p/vqWkGEw7b2nx+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mh4cmcRc MC2u4v+NdawNjD+9uhg5OSQETCTOb7zI2MXIxSEksJRRouPuLCaIhJTEvp7/7BC2sMSfa11s EEWtTBI7n91iA0mwCZhJPPoyj7WLkYNDRMBU4tleSZAws0CmxOlX+8BKhIFKZmyewwpiswio SqxYvI0ZxOYVcJJ4M/8r1C55iZmXvoPt4hRwluj4CNErBFTz8VkHK0S9oMTJmU9YIObLSzRv nc08gVFgFpLULCSpBYxMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQJjYduxn5t3MM579VHv ECMTB+MhRgkOZiUR3sC+5BQh3pTEyqrUovz4otKc1OJDjKZAd09klhJNzgdGY15JvKGZgamh iZmlgamlmbGSOK9nQUeikEB6YklqdmpqQWoRTB8TB6dUA9P+Y5vNRPMz/u+0PqqxancBb7eA geHslHvuC03/6m6cGV9wqeRPZ7LZ9SUhnEot0lNYlY6+KJZaGP7KQNXDq+KJ/onelucmX7ha fGVeft7feKalYf/VPcF3pBgt5rz84SJ7LKJy076tPxLeqd0+fMjiZF+vk9b25mvyxuwVJfXT Vn+8WXZmhWDd5OAeU6uMvDlp+bed3kZP49yTlCj4PGlawAMbj+iDm1YxWR6I2brG3v2oV96r yDV5vw1YH7WdK846v/LNmjvmCzXffNzUG+3KJW71oX/KX/Mpa43Xy6mk1fDsNj8TvnWm+/dt kiLTfaYv65zR7tTrHHTnzy8RgV+vt5Rr1s3iqNwwWTrfKVKJpTgj0VCLuag4EQAizvYoDgMA AA== X-CMS-MailID: 20230517154709eucas1p2713ef60e2e2d6dec68b72723a3f9abaf X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230517154709eucas1p2713ef60e2e2d6dec68b72723a3f9abaf X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230517154709eucas1p2713ef60e2e2d6dec68b72723a3f9abaf References: <20230517154702.4215-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: 1684338523462100001 Rename E1000E_RingInfo_st and E1000E_RingInfo according to qemu typdefs gui= de. Signed-off-by: Tomasz Dzieciol --- 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 Sat May 18 13:16:23 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=1684338517; cv=none; d=zohomail.com; s=zohoarc; b=G8Gj8ilYR75xgpv8yYhobnLoFRyPxlP0S6k2TBg1vOli+R8Hi6t/LX0TbPI/h8zzWH9Tqx6t3bZXNes1qgmExZK0IWJGBhVCOyIfU/J4daImjv0CaQwSzMybCftgqiEkJB9irIEkvMLA6vnTfeF9NHJwa3gv2G4LUFR33QKnF4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684338517; 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=k45rwOucYMjA96O6cPJOTK8HJUQ47xgAoX8ZRlXZkjOBnYepFvm/h85UQSTErg/bUgzGqoSSpWGk49+UZIXrywxZ/J/9cW72/Hiqtj5bPBrTi7JetgV9ylaCHn/3Anv+/m4CNR/fs+Qzslqd1uyhHF5npZrzqCqKm6ItLrgZgVU= 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 1684338517691120.7678930387383; Wed, 17 May 2023 08:48:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJNS-0004ln-2q; Wed, 17 May 2023 11:47:46 -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 1pzJNE-0004kR-5L for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:33 -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 1pzJMy-0004fG-S5 for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:31 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230517154710euoutp01bf3683578853959d2d1c374687afb84e~f_ODY7IQb0235102351euoutp01Q for ; Wed, 17 May 2023 15:47:10 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230517154709eucas1p14874217ae6270c0a54e0c24f57230f20~f_ODFbErn3180031800eucas1p1J; Wed, 17 May 2023 15:47:09 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 25.DD.42423.DF6F4646; Wed, 17 May 2023 16:47:09 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230517154709eucas1p175f07cfb871664c854ce73663e7f5052~f_OCt-gST3180031800eucas1p1I; Wed, 17 May 2023 15:47:09 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230517154709eusmtrp17af48bc5acc7f50fa3a0af201a71b58e~f_OCtX-JB2897428974eusmtrp1E; Wed, 17 May 2023 15:47:09 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 0F.07.10549.DF6F4646; Wed, 17 May 2023 16:47:09 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230517154708eusmtip2aa751e981b03e561f588bec67272ba2e~f_OCNjiUP0867308673eusmtip2j; Wed, 17 May 2023 15:47:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230517154710euoutp01bf3683578853959d2d1c374687afb84e~f_ODY7IQb0235102351euoutp01Q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684338430; bh=84Izyxtoe0ZLd4hkuj/7JIPXuyS7G7dsSIvL3JsJP94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n2R1Dr5SrW+xdOaFxlk0txcBC44G1E0wcgOvpa8SaqxooAPxSHG80Vd/E6dczDrDP vX5xU2RpBCLvg1cEJgTe8Ki7cuyA6IA4H9a8cjeih+vJD/YQcGCYjKNtyl/U/EZMb2 p2ntbbRGTwgkqy4kkT/EEA4fIuEod7UpfVW5ngd4= X-AuditID: cbfec7f2-a51ff7000002a5b7-4e-6464f6fd4efd 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 v7 3/7] igb: RX descriptors guest writting refactoring Date: Wed, 17 May 2023 17:46:58 +0200 Message-Id: <20230517154702.4215-4-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517154702.4215-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42LZduzned2/31JSDJa0Glt8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujKaJlxkLmoIrnrWsYGpgfGLZxcjJISFgIrFg9lzmLkYuDiGBFYwS62d+ YIVwvjBKLOw4zQZSJSTwmVFi7Z8CmI453U+gOpYzSky9eJwdwmlnkrgzfRkzSBWbgJnEoy/z gEZxcIgIGEt8bBcHCTMLpEoc/XOQBcQWFnCTuHb/IyOIzSKgKrG7cTE7iM0r4CRx8N87Nohl 8hIzL30Hi3MKOEt0fNzHBlEjKHFy5hMWiJnyEs1bZ4MdJCGwhUPi7vdWZohmF4ldS3dBDRKW eHV8CzuELSNxenIPC4RdLvHz7DZ2iOYWRok9UydDFVlLXNr6E+wBZgFNifW79CHCjhJzzh1h AglLCPBJ3HgrCHEDn8SkbdOZIcK8Eh1tQhDVOhLfNs1kgwhLSSy8UQcR9pD43rGaaQKj4iwk z8xC8swshLULGJlXMYqnlhbnpqcWG+allusVJ+YWl+al6yXn525iBKaX0/+Of9rBOPfVR71D jEwcjIcYJTiYlUR4A/uSU4R4UxIrq1KL8uOLSnNSiw8xSnOwKInzatueTBYSSE8sSc1OTS1I LYLJMnFwSjUwNQUsk5ib+8SCz6vzyr+T9y5PZuBX3XfvmqsG+8sIpvdrDc89sXRgldu71HJN /x+dbJPH+ZeXdWbmbj3My7suY9Oyq0cSCk7b1Jsukr889Y3ss5Xyc6VWfLlpvGfxz6o1/60l drtqnv7alfzIqPt9TjyL4vbZsk2WH0NOTuN181/38M4sv4UXDrJZ9XvtPag8e/JJSU6JmeX5 MzLiY22rXRnMg4rdV82QVZ+5a0vD5d9yor/rnKeZcs56wV3H8+3kuY8zYucm+c3Z5/E5JHLp A3nFrgmqL3r25P9qP+m3ptt1ZvmbaulT21z0KpYb3CzrP1XtXuegllz7c86n2bnl6RNYOWKy 3jWF3ptYaL+YRYmlOCPRUIu5qDgRAEk/htieAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xe7p/v6WkGFxfKm3x+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0MpomXmYs aAqueNaygqmB8YllFyMnh4SAicSc7ifMXYxcHEICSxklzvavY4JISEns6/nPDmELS/y51sUG UdTKJLHsYwMzSIJNwEzi0Zd5rF2MHBwiAqYSz/ZKgoSZBTIlTr/axwZiCwu4SVy7/5ERxGYR UJXY3bgYbCavgJPEwX/v2CDmy0vMvPQdLM4p4CzR8RGiVwio5uOzDlaIekGJkzOfsEDMl5do 3jqbeQKjwCwkqVlIUgsYmVYxiqSWFuem5xYb6hUn5haX5qXrJefnbmIExsK2Yz8372Cc9+qj 3iFGJg7GQ4wSHMxKIryBfckpQrwpiZVVqUX58UWlOanFhxhNge6eyCwlmpwPjMa8knhDMwNT QxMzSwNTSzNjJXFez4KORCGB9MSS1OzU1ILUIpg+Jg5OqQYmheQjS41Pf9wnILZT6f3co5GH FjyXyt8ZsfRVUs614I3F57fWr25QjjsR+5A9NPPv9bS9ywTcdv4uY58zZVHTbdmzbwOWnc1e KmtnHXVKy+e3JMuNsFkH7nyvfcj2V0Y+9eoVdWtFm2DR0xYiMlGyjGk/Jnhd65/wUf7hlo0e AZtZpWQL2CuDgreLhebtneuous2g3+KTvYP4v78cz7ly81UnHPngffHiB46lXJfuTnbaKel5 U7Ikje3cFs70tnNWAgfeSgkf3frZpfftvnUzpM5dWV50sPGe87xyQ4aE0l2bHdp/t5rKdGdd yBb5zfR3Or/K9/uLN/4IYr+ygtuydeMz2VfpIoIMSx932PrKKbEUZyQaajEXFScCALhVQPkO AwAA X-CMS-MailID: 20230517154709eucas1p175f07cfb871664c854ce73663e7f5052 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230517154709eucas1p175f07cfb871664c854ce73663e7f5052 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230517154709eucas1p175f07cfb871664c854ce73663e7f5052 References: <20230517154702.4215-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: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.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_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: 1684338519582100003 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 Sat May 18 13:16:23 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=1684338551; cv=none; d=zohomail.com; s=zohoarc; b=B9MtJSRpS13sBfBcRPHBReiJqycI7o0qhlv+dt/AZylnOW4F8lFAhV6fnS5PJsmpXKxDJNxhA638gozQr5EHuERu+k+0MIDvO3NnqSYgn6o7VpPILahmfyjjF97E1bAgZNbn76+87eieXpeEkY9TGoNW2asB94rHU41/G5kHQpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684338551; 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=ybHzB1d4xQS35lDW4MWBADg114fq0y9YJRfGGzfBrNQ=; b=DgfYPVHVxNuDQIqskyhKtII2L2c//vDZ/iUER3c8cIAUypYj/VDygnNqDCheU+gq+Z9IhOQEOIZ3+Ay0bCcoUsI2ZHnKjA6oM3Hc4sOhmeGVGrCXdmrymu+DKhhlihUPD/O+uh4AFAObJKAlAy4yNeGoluZkoK320kYsJ1uyxBY= 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 1684338551652921.6829764585225; Wed, 17 May 2023 08:49:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJNQ-0004lE-W6; Wed, 17 May 2023 11:47:45 -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 1pzJN1-0004fm-3e for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:19 -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 1pzJMy-0004fI-Rf for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:18 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230517154710euoutp01717316009cf5ed98e97e63e46339e9b6~f_OD5_F5K0235102351euoutp01R for ; Wed, 17 May 2023 15:47:10 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230517154710eucas1p2bd9d6772edfc937568823c647d4310dc~f_ODeOP7D2205122051eucas1p2r; Wed, 17 May 2023 15:47:10 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 3E.F4.37758.EF6F4646; Wed, 17 May 2023 16:47:10 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230517154710eucas1p16d0d9aa2e516fce8f385fa888a602eb8~f_ODMBy9b2719527195eucas1p1M; Wed, 17 May 2023 15:47:10 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230517154710eusmtrp172284d5e025fe62fa04f5bd6c8f5da47~f_ODLYnsC2897428974eusmtrp1G; Wed, 17 May 2023 15:47:10 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 2D.F8.14344.DF6F4646; Wed, 17 May 2023 16:47:09 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230517154709eusmtip23beb019525dd6e07ee5524aa4d059a64~f_OCrtFWN0886608866eusmtip2m; Wed, 17 May 2023 15:47:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230517154710euoutp01717316009cf5ed98e97e63e46339e9b6~f_OD5_F5K0235102351euoutp01R DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684338430; bh=ybHzB1d4xQS35lDW4MWBADg114fq0y9YJRfGGzfBrNQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Du9zVAJwkyqJkz+kbj2wa2MAZTUCMnLmQ3hk4XCXMvSeuM5CpkeGN2CJUqdgGfKDb q2fzsAfgnX0XZNM7oIBrayRbioHstPTsnCchEyxU7GLSYdqxXqOhNUQrjv+1KzvqzQ 0xF+Nc2BJEBGC30WmLAi8Fdb5Z3ZogoYFolb8vWU= X-AuditID: cbfec7f5-815ff7000002937e-25-6464f6fe3f67 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 v7 4/7] igb: RX payload guest writting refactoring Date: Wed, 17 May 2023 17:46:59 +0200 Message-Id: <20230517154702.4215-5-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517154702.4215-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42LZduznOd1/31JSDJZ/4LP4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFFc NimpOZllqUX6dglcGdcW7GIt6Eqv6D1s0sA406mLkZNDQsBEYtPiM8wgtpDACkaJzxsCuxi5 gOwvjBJzL91mgnA+M0r8eXaQEabjwd8vrBAdyxklGiZLQRS1M0mcvr+CCSTBJmAm8ejLPKAi Dg4RAWOJj+3iIGFmgVSJo38OsoDYwgJOEmdbDoCVswioStz78wAszgsUb9++BmqXvMTMS9/Z QWxOAWeJjo/72CBqBCVOznzCAjFTXqJ562xmkBskBFZySGzYd58NotlFYlX7X6hBwhKvjm9h h7BlJE5P7mGBsMslfp7dxg7R3MIosWfqZKgia4lLW3+CPcAsoCmxfpc+RNhRYuuaVmaQsIQA n8SNt4IQN/BJTNo2HSrMK9HRJgRRrSPxbdNMNoiwlMTCG3UQYQ+JNafaWCcwKs5C8swsJM/M Qli7gJF5FaN4amlxbnpqsXFearlecWJucWleul5yfu4mRmBqOf3v+NcdjCtefdQ7xMjEwXiI UYKDWUmEN7AvOUWINyWxsiq1KD++qDQntfgQozQHi5I4r7btyWQhgfTEktTs1NSC1CKYLBMH p1QDU+guoZX3Mx82TMthd5rG8+3B55if9W9tdz5pXqJq8v3BwbxDz5MWcm4zD4/YOMuy+ITg qnubtOrWvUwNMo4OfLBg3vF5y5Yf/6LiWFQwgWN5Z6+Zl0bW88p5c8sesu04EzWld9rDfrWr QipzrM1efv61TCq1XvyfwV2GL92PfY4uZm1716kdenHPstWLM2Pkn3o/PyT8L9EwwVTv4IRV v9YLhRwNqdkU3nuq0K30Uf7fuaytinF2T/+25x9d0lr8Mrpd9KNM+srjMcLZmwT9Gw1Vls6V tD6tOvXQ/BXb0nIW6C3t68hnPeV97+i0HR6mbs4zWD69Ec5f+D/LhK9QyWT9gqfNG8P0eLcI BXEleSixFGckGmoxFxUnAgBcD9jAnAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7p/v6WkGNzfZmXx+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mq4t2MVa 0JVe0XvYpIFxplMXIyeHhICJxIO/X1i7GLk4hASWMko0rv7ACJGQktjX858dwhaW+HOtiw2i qJVJYubR62AJNgEziUdf5gF1c3CICJhKPNsrCRJmFsiUOP1qHxuILSzgJHG25QATiM0ioCpx 788DFhCbFyjevn0N1C55iZmXvoON5BRwluj4CNErBFTz8VkHK0S9oMTJmU9YIObLSzRvnc08 gVFgFpLULCSpBYxMqxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQIjYduxn1t2MK589VHvECMT B+MhRgkOZiUR3sC+5BQh3pTEyqrUovz4otKc1OJDjKZAd09klhJNzgfGYl5JvKGZgamhiZml gamlmbGSOK9nQUeikEB6YklqdmpqQWoRTB8TB6dUA5PStY/TVTtm9ymrzzCZHmfKyjqvN0T3 6+Ftx0OPq56cL7usZ8ej1BAn066mG9cE/ij9++MSEaHw6FLj0Qyvte7sodFVVyOPH9dS6/PI tTE9r/Zko2GK2+yKFTbfa+92cPzU79l2Vszz1Tfp/NWlHQ+qGu32Tc5O/+Q3v6vxg0TWzWX1 Ybo/D+8545Hrv4wzaF2t9OXWA8onb4XLnXFWsV2e62qQEdh69Lvu+wsyJbo+MnNnzM3icEj7 sVj73H/eVdNXPexkm5XjXPHTuvu6UdbBxWGrFR7lXJFQuXp7Zxd/qcLM+YlySVFCuxaVND27 WNRQUSKrVy/RXOy//kST/MUM1fZG1UUv3dOUNYW+KrEUZyQaajEXFScCAKDwpY4NAwAA X-CMS-MailID: 20230517154710eucas1p16d0d9aa2e516fce8f385fa888a602eb8 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230517154710eucas1p16d0d9aa2e516fce8f385fa888a602eb8 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230517154710eucas1p16d0d9aa2e516fce8f385fa888a602eb8 References: <20230517154702.4215-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: 1684338553775100005 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 | 214 +++++++++++++++++++++++++-------------- tests/qtest/libqos/igb.c | 5 + 3 files changed, 151 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..605ea09e41 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_rxhdrbufsize(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,52 @@ 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_rxhdrbufsize(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 Sat May 18 13:16:23 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=1684338517; cv=none; d=zohomail.com; s=zohoarc; b=hBpT4pbu9ZzIY/3wGTVDklvAD6LUHYljGPGozwHCsGY3suTMGX8H7+sgsSQgx7yujufhOlwVJ3RDwjv6AnFrXGojWglBZkuBKtik1sGcLA8OHCannoVIczegYBXZG6Pk1OAGJCno4ylaHP6JhoU7a9lr3F9/85IRybYxK6jPtQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684338517; 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=8d3d7knSA1h90GUq91lu8F35PzB2WKOhxcES94nBXuU=; b=m9Sfe10JyVrqYo5WtqYS5au/MVdK/PYgcQM1PRpynJc9XNXGzl52AlWBTQ0P44pajt9w0qwWztUj0zNZA0lSI4FWOn/edh2wRzgunVI+yQpN99pTv5STELVvmSr9cqkQTF2Kc6+ID96AcP3b+9uEDVug3P/4UTiDlLb7DUwm1iw= 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 1684338517087221.96515241893815; Wed, 17 May 2023 08:48:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJN8-0004jD-0V; Wed, 17 May 2023 11:47:26 -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 1pzJN5-0004i1-15 for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:23 -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 1pzJMy-0004fU-S1 for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:22 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230517154711euoutp01879ed8a1a20ae2777baa5110502a8504~f_OELgeVC0282502825euoutp01G for ; Wed, 17 May 2023 15:47:11 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230517154710eucas1p29074b3ca0770dc4d6d319a6a400653f3~f_OEBV0hi2204722047eucas1p2H; Wed, 17 May 2023 15:47:10 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 1F.BB.35386.EF6F4646; Wed, 17 May 2023 16:47:10 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230517154710eucas1p2dffb26312189b86214130220a5da3df8~f_ODrilgY2178421784eucas1p20; Wed, 17 May 2023 15:47:10 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230517154710eusmtrp1eee98032561b0580f116ef0e9ce3a9e6~f_ODq9htk2897228972eusmtrp1Q; Wed, 17 May 2023 15:47:10 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 01.17.10549.EF6F4646; Wed, 17 May 2023 16:47:10 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230517154710eusmtip233d75a9595132da6a2b8bf45026ec756~f_ODKOy5_1593615936eusmtip2k; Wed, 17 May 2023 15:47:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230517154711euoutp01879ed8a1a20ae2777baa5110502a8504~f_OELgeVC0282502825euoutp01G DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684338431; bh=8d3d7knSA1h90GUq91lu8F35PzB2WKOhxcES94nBXuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SRXaKL2KwzxzCFXr2Gqe+tc/D0uBBkBDnbezZRgySXBvAtvYlP9O+XjCooQRIF2if hocu5gw8Eu2WIFT3F2ahXx9y/UoFUCd6cczBnhRJva1nbTvbeYIpnqg3q4GCD5uzwk N/I1r6RO9DBuT0e8ozxteU6npDNHTAm1hTogR82E= X-AuditID: cbfec7f4-cc9ff70000028a3a-b4-6464f6feb698 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 v7 5/7] igb: add IPv6 extended headers traffic detection Date: Wed, 17 May 2023 17:47:00 +0200 Message-Id: <20230517154702.4215-6-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517154702.4215-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42LZduzned1/31JSDH6dM7H4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFFc NimpOZllqUX6dglcGdO3TGEq2MFV8fDFOpYGxpUcXYycHBICJhJNh86xdDFycQgJrGCUuHX7 LhOE84VRYv2xtUwgVUICnxklnj2ugOmYevAsK0R8OaNEy4tciIZ2JolrrVvAGtgEzCQefZkH VMTBISJgLPGxXRwkzCyQKnH0z0EWkLCwgIfE2rmMIGEWAVWJmzv3s4PYvAJOElf2/2eHWCUv MfPSdzCbU8BZouPjPjaIGkGJkzOfsECMlJdo3jqbGeQECYG1HBKPl/SwQTS7SHxpWMUMYQtL vDq+BWqojMTpyT0sEHa5xM+z29ghmlsYJfZMnQxVZC1xaetPsPuZBTQl1u/Shwg7ShxetJwd JCwhwCdx460gxA18EpO2TWeGCPNKdLQJQVTrSHzbNJMNIiwlsfBGHUTYQ+LFp3esExgVZyF5 ZhaSZ2YhrF3AyLyKUTy1tDg3PbXYKC+1XK84Mbe4NC9dLzk/dxMjMLWc/nf8yw7G5a8+6h1i ZOJgPMQowcGsJMIb2JecIsSbklhZlVqUH19UmpNafIhRmoNFSZxX2/ZkspBAemJJanZqakFq EUyWiYNTqoGJ3chP62jthzwhlY1LOeSFIs+XbDZtDalUO+bL8nX5jYNLt0ppmb0q3FSftmJO svqf/Nhntg98Wx0WqcWvt4vd8Pi8q8SvAomWEN+QftUPwk0PstcEKx7wNZuVlbj+nzpPiLvX 24KqkLzI52VpsyYxvBZwiG5aFxMouHi/wfyldx5HGd5dvmJyQob2j7kn3MRzri/fmPZxCnfN 633u0fXfXn+61PfOacuLGfLWO2N0EzP6AthNO1lYsxZ6fFHukPs6zcFz/uGu9as1c8XsJpRO uDyPObA9Ufa2e0Cm4pEVhWcDoxRP+05asnph9weVCyVzFkx6vXzKvzOi9i1df5/WLCi0OGSz 1vvbB54TK7cosRRnJBpqMRcVJwIAaupoRpwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xe7r/vqWkGNx+IWfx+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0MqZvmcJU sIOr4uGLdSwNjCs5uhg5OSQETCSmHjzLCmILCSxllNhziQ0iLiWxr+c/O4QtLPHnWhdQnAuo ppVJ4sLpBcwgCTYBM4lHX+YBNXNwiAiYSjzbKwkSZhbIlDj9ah8bSFhYwENi7VxGkDCLgKrE zZ37wUbyCjhJXNkPM15eYual72A2p4CzRMfHfWwQ5zhJfHzWwQpRLyhxcuYTFojx8hLNW2cz T2AUmIUkNQtJagEj0ypGkdTS4tz03GJDveLE3OLSvHS95PzcTYzAONh27OfmHYzzXn3UO8TI xMF4iFGCg1lJhDewLzlFiDclsbIqtSg/vqg0J7X4EKMp0N0TmaVEk/OBkZhXEm9oZmBqaGJm aWBqaWasJM7rWdCRKCSQnliSmp2aWpBaBNPHxMEp1cBU8zL2yaWydjVOJZVmobVy1rdXfrNr DrzaVqjNwShyeqFEi4WxpUHw4z6/6hWt3+YyqfuKBTzT3JwazKHO+er4YvFrEssNxNdM7ErI a78ZtsAr59NRxdl8SvYnPswuVRO4vy3njJvDia1JFx7vdWyKfMKlYq0hNe/ZvZ+Wqi1FNxWy G6rMCt4/fKe6L3tHVojb9Jjns1Ido+5vjF3w5L6NV2DCny3dcxlfnv1WNe3Kuzd/Pl9pfSpl dPhmUbyR5609n/W7vi9nEkp7vPS6x4p+fa0rmnusEr/8sIs0cKlqSHqZFSPIu5Y3P/62mHRG sMp5r83WC8M/cno8OLN/k7T7cbVrjed/2IYUTl9rsFeJpTgj0VCLuag4EQB3wPuWDAMAAA== X-CMS-MailID: 20230517154710eucas1p2dffb26312189b86214130220a5da3df8 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230517154710eucas1p2dffb26312189b86214130220a5da3df8 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230517154710eucas1p2dffb26312189b86214130220a5da3df8 References: <20230517154702.4215-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: 1684338519535100001 Signed-off-by: Tomasz Dzieciol --- 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 605ea09e41..442ad55cc0 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 Sat May 18 13:16:23 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=1684338573; cv=none; d=zohomail.com; s=zohoarc; b=hR+phYaC2KZmTNe2VLYOAHPhbjWqT+oriJ3C35UC3kHfj1Nqrrpk1Sul4SJeztEmekjzhzgXIX1JokbJ3Pt788JJnIGF4fTCUhnGolYYuCIoUf52YOwI6c5pkz/bgKTlag5CjMMox2uIvA5dHl6sxt1HtU5u1epga9+uBId4MR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684338573; 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=ltnbI2hDquvadGX9rMGT6ZlmJMZDMCcqUR3YGRByxOM=; b=bkHN9ZPiPsWkQGm2///R+gs+gOAEt4LA0uP/vQxLYsAhPHSHFMmrqk2yNdg/U9WCq/doHFxIkoJ0+3uTFUBVuAIAgitk75u7d4IIYeYgJYb30WMvDwM5G3zUS9+Hyitdj+IQlJ3I1TxnCrR0lEOGbUkwA646U7zxQTqlL1MZY5M= 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 1684338573431831.6481327441606; Wed, 17 May 2023 08:49:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJND-0004kQ-W8; Wed, 17 May 2023 11:47:32 -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 1pzJN0-0004fk-OT for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:19 -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 1pzJMw-0004fR-Jd for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:18 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230517154712euoutp01934e8ce80c815ccfceb08ac5db34c9a1~f_OFC-MTj0116201162euoutp01d for ; Wed, 17 May 2023 15:47:12 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230517154711eucas1p1fc59d4c4abd4b12b8d4b1f51f54681aa~f_OE5Bgua3180031800eucas1p1N; Wed, 17 May 2023 15:47:11 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id F6.DD.42423.FF6F4646; Wed, 17 May 2023 16:47:11 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230517154711eucas1p1e9aa6fa638af67ae1bd45fa605eb5584~f_OENx0EF2625726257eucas1p1W; Wed, 17 May 2023 15:47:11 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230517154711eusmtrp10fb423da86efdc5e3fe026a88c33189b~f_OENMW2V2897228972eusmtrp1S; Wed, 17 May 2023 15:47:11 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id AE.F8.14344.FF6F4646; Wed, 17 May 2023 16:47:11 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230517154710eusmtip291fce60cecf84c0d1612a64ecd96b8da~f_ODqzzNR2117621176eusmtip2u; Wed, 17 May 2023 15:47:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230517154712euoutp01934e8ce80c815ccfceb08ac5db34c9a1~f_OFC-MTj0116201162euoutp01d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684338432; bh=ltnbI2hDquvadGX9rMGT6ZlmJMZDMCcqUR3YGRByxOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c65shGAFt8A3c9Mwtety3x2MCVqxONhfDzpmj8CRRiXxwhuLoliUdmBmi/hAp4lI8 +0snGnXuW1l0fM56V1RWWFVfHeLLkc667IVop96JGRUXcMVYvEjzBceusHYmuW1l/5 DFmNOGqFeRyiJQrGIgbMGqclTzJpiXuqzieZRekc= X-AuditID: cbfec7f2-a3bff7000002a5b7-55-6464f6ffcc68 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 v7 6/7] igb: packet-split descriptors support Date: Wed, 17 May 2023 17:47:01 +0200 Message-Id: <20230517154702.4215-7-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517154702.4215-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42LZduznOd3/31JSDA7+07f4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFFc NimpOZllqUX6dglcGad2nWQqmDOXsaKv/wVrA+O37C5GTg4JAROJmRO/s3YxcnEICaxglOi/ uIwFwvnCKPFw2mxGCOczo8SjJw/YYVpWn5nHBJFYzihxetFqdginnUni/L0GRpAqNgEziUdf 5gEN5uAQETCW+NguDhJmFkiVOPrnIAuILSxgK7Hg1DY2EJtFQFVi968msAW8Ak4S757tY4ZY Ji8x89J3sDingLNEx8d9bBA1ghInZz5hgZgpL9G8dTYzyA0SAms5JFb+u88C0ewisfheHxOE LSzx6vgWqA9kJE5P7oGqKZf4eXYbO0RzC6PEnqmToYqsJS5t/Qn2ALOApsT6XfoQYUeJ/RNA HuYAsvkkbrwVhLiBT2LStunMEGFeiY42IYhqHYlvm2ayQYSlJBbeqIMwPSSaDiVNYFScheSX WUh+mYWwdQEj8ypG8dTS4tz01GLDvNRyveLE3OLSvHS95PzcTYzABHP63/FPOxjnvvqod4iR iYPxEKMEB7OSCG9gX3KKEG9KYmVValF+fFFpTmrxIUZpDhYlcV5t25PJQgLpiSWp2ampBalF MFkmDk6pBiYtduOpj14elfM8fGBD2eLpl5btvnao0+DLKyZup9LXE3YLfIw5s+DG4ottfBVK heszubfG/mHVqu6tZXfbtmpraD2bmaP5D708Cyudt2Wqe+Jt1eVnyIeKXJ894Xpy2yPJ4Py1 LyQrEveenaay9p5d/gO1Nanbn7ze+7cxbErzNl+NFzLJZ+4FyOboeHsGLOSTWbMzzW9uwWOh nz9Wvr3REbrlgP6/6KX/X7eeURZt//mlZo+5pfvCusIKhj07D+e07rANOc+j1/wy2lapVCjf 4YF4Q/q8e7b3W7Pk4/pXJT5LSl3763PI7mtLbZv/qXC/bPwtvdUjk1l9odPcP78ryg7/ri73 Z5xsY3+lc58SS3FGoqEWc1FxIgAowfhinwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRmVeSWpSXmKPExsVy+t/xe7r/v6WkGExezmzx+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mk7tOslU MGcuY0Vf/wvWBsZv2V2MnBwSAiYSq8/MY+pi5OIQEljKKNHz9Ck7REJKYl/PfyhbWOLPtS42 iKJWJonD89exgiTYBMwkHn2ZB2RzcIgImEo82ysJEmYWyJQ4/WofG4gtLGArseDUNjCbRUBV YvevJrCZvAJOEu+e7WOGmC8vMfPSd7A4p4CzRMdHiF4hoJqPzzpYIeoFJU7OfMICMV9eonnr bOYJjAKzkKRmIUktYGRaxSiSWlqcm55bbKRXnJhbXJqXrpecn7uJERgN24793LKDceWrj3qH GJk4GA8xSnAwK4nwBvYlpwjxpiRWVqUW5ccXleakFh9iNAW6eyKzlGhyPjAe80riDc0MTA1N zCwNTC3NjJXEeT0LOhKFBNITS1KzU1MLUotg+pg4OKUamBIZ3lU67mrd2sigLPVec0v1y5K6 8uVzrO5m32TZsGqqXo5jyA7D/y6Zhmcsw1hXi+25W6V1bmlFU1KA8twtx7atPv6yX6hDM0rs i69arffvh+LNbj+f/56wTFSpcpXEFpboPodv8TltnltMZ+2dG6Ip0dd2TfRB6NsrO7aY/F3o l/D5f8cBk3du7sHMjXLfNvlcC1v7fYOu5cmawMBuoQ0dKzZMsJXSXbpex0tN3SHusnzbxqK4 6Q6/RPX6YrIXJLfblhdaP7I9ZyfO4l09haMyyj41IvbB59TPp2a/YhfacUoxu+2xWqAr/7UD Do16lZcWrb77NJR7p96Lt5POsgnMmDBhI8sRqT8f1k6/ocRSnJFoqMVcVJwIAIKkPowPAwAA X-CMS-MailID: 20230517154711eucas1p1e9aa6fa638af67ae1bd45fa605eb5584 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230517154711eucas1p1e9aa6fa638af67ae1bd45fa605eb5584 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230517154711eucas1p1e9aa6fa638af67ae1bd45fa605eb5584 References: <20230517154702.4215-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: 1684338574399100003 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 | 355 ++++++++++++++++++++++++++++++++++++++------ hw/net/igb_regs.h | 9 ++ hw/net/trace-events | 2 +- 3 files changed, 323 insertions(+), 43 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 442ad55cc0..515a82d1ba 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,62 @@ 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; + + 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.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 +1663,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_rxhdrbufsize(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_frag_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_header_to_rx_buffers(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_frag_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 +1855,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 +1871,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 +1885,7 @@ igb_write_to_rx_buffers(IGBCore *core, { size_t copy_size; =20 - if (!pdma_st->ba) { + if (!(pdma_st->ba)[1] || (pdma_st->do_ps && !(pdma_st->ba[0]))) { /* as per intel docs; skip descriptors with null buf addr */ trace_e1000e_rx_null_descriptor(); return; @@ -1646,6 +1899,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_header_to_rx_buffers(core, pkt, d, pdma_st, ©_size); + } else { + pdma_st->bastate.cur_idx =3D 1; + } + igb_write_payload_to_rx_buffers(core, pkt, d, pdma_st, ©_size); } =20 @@ -1660,6 +1921,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; @@ -1676,8 +1938,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)) { @@ -1688,7 +1954,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; @@ -1696,8 +1962,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 Sat May 18 13:16:23 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=1684338483; cv=none; d=zohomail.com; s=zohoarc; b=IMJkP+Vm3jLK5Sp4FZzJ1yX9tSqrvholHCzqcdrgIsQ7SfY475rHZDAwp4QskxJLfYayCbgPGM+R6pRmiEF28n1EuhZjkZMuM1kkHYUWJ6zOc7kf3WpLvIDBNboW2R1kbRlqcTTgl8Q7urKFhUahDz7CQN7q2J1+bL558Tq/sY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684338483; 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=+EdCytTyEcIMBTi04ruCKz6tQx+pv46CQ6JPHaJIiNw=; b=FWjDFCoAw8hGk1NPV5pckVc2Bvxy3BoO4oTQG/TKdqV3mhJLlLOlo92sS85W3KPsEjmrytpWPrzAFXb7Ob/QWI+myMGYRHQZF9VjtC5qWQlwENM3Vru+4Tkq0yN9l/GtTAWvssKOMEiuH94EGOPkQGLCJtzR7Z1D4kn9t2FwtXI= 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 1684338483341612.8692435313668; Wed, 17 May 2023 08:48:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJNR-0004lQ-3g; Wed, 17 May 2023 11:47:45 -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 1pzJN4-0004gm-6o for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:22 -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 1pzJN1-0004gh-Ie for qemu-devel@nongnu.org; Wed, 17 May 2023 11:47:21 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230517154712euoutp0139656e044c836c3e3bc86c7955f89c20~f_OFay-5y0116201162euoutp01e for ; Wed, 17 May 2023 15:47:12 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230517154712eucas1p2f225fdb41a9c730228bfd2b80fc78536~f_OFFP0922205122051eucas1p2w; Wed, 17 May 2023 15:47:12 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id DF.BB.35386.FF6F4646; Wed, 17 May 2023 16:47:11 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230517154711eucas1p124a75ba193bf302825a2fa71d838725f~f_OErlz9E3180031800eucas1p1M; Wed, 17 May 2023 15:47:11 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230517154711eusmtrp1926c6c0efd0f3faa3ad7638f0170483b~f_OErFR7C2897428974eusmtrp1L; Wed, 17 May 2023 15:47:11 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 1F.F8.14344.FF6F4646; Wed, 17 May 2023 16:47:11 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230517154711eusmtip20c82b185f48ab13cd6ba7320f79e2dc0~f_OELld7q1009210092eusmtip2Z; Wed, 17 May 2023 15:47:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230517154712euoutp0139656e044c836c3e3bc86c7955f89c20~f_OFay-5y0116201162euoutp01e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684338432; bh=+EdCytTyEcIMBTi04ruCKz6tQx+pv46CQ6JPHaJIiNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OoR6/RmXd6EzYc8b2jqVZf7A5S2YfkJcCJJncbdQcmdUDPUmcI/Aup9ei/990s+GN 7xlYKDZo0eWt1yCIBQ8rHJ7n25aiTsc5NOclyzIgmQkllmeovH6fY6dHL59P23PfVQ SdLhm54bS5/E9n5w+uzfup9mMDAz2KrcExYSNcmQ= X-AuditID: cbfec7f4-cc9ff70000028a3a-b8-6464f6fff0a4 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 v7 7/7] e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_rx_buffers Date: Wed, 17 May 2023 17:47:02 +0200 Message-Id: <20230517154702.4215-8-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517154702.4215-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA02SfVCLcRzA/fbs2Z7GeCx3fW/coa6ImtfTjrjkbdc5hM7RXZrtsbBebCXq RJIS0pW3VfSia113DWvtMqTmVKSQli5MCF0n7LZbpZTWs07/fX6f7/vdj8B453E+cSgqllJE ieXuLA5TXz/40nfULpUuHdCtFlqfV7CFpa1WhjC5IB8XVpkG2MKGS9VM4SVtDyOAJWrsq8NF rz63YKLu9kqG6FeNiSXK1JWjHfg+jr+Ukh86RimWrAvnRPzsnxZjmHO88UwLdhrZZ2QgFwLI laAt+MF2MI8sQ1Bt98lAnDG2IbjfqcfohxWBWleHJiq6cpJxOqBG8MhscZanMUDzDncwi1wF n223xpggZpErwJLm5tAYScHT4Tqmg13JUNDkZbAczCQ94YtmZNxzyUCoV39g0rPmgqq1f7y9 C7kB0i01LDpnJjxTdTPpnnMhpSpvfFEgKwhQFZY6F90IRtswTrMr9Dbo2DTPgaaci84B8TDY rGfTxWcRPLya40xaA61Vg+MHYKQ33DEsofV6qC66gTk0kNOho28mvcN0yNZfd2oupJ/j0dk+ YNeqWLTmQ1FHEq1FYNX8xbLQ/NxJx+ROOib3/9hChJUjNypOGSmjlMujqHiBUhypjIuSCSTR kVo09luaRhps1UjdaxEYEYNARgQE5j6LG5wpkfK4UvGJBEoRvV8RJ6eURjSbYLq7cRevfSbh kTJxLHWEomIoxUSUQbjwTzOOxpcsjWzt26TZUxmA71bzdZLNT5IkL7b9Xn9qNChBsN2cZ7hy k9Vil2U+iojJTO/0akZcY3RTSn9cS/5dc5Kq9kHzFL9RyZ/hEuKahTTJ08x7O5Wl36b2YudC ao/48+qjtw59KpydiL/fsvP7rdupemlFWLhHr+8F/aaun649nTOCX/IbDps9EwPutb15xZlq YCOfvK6hw0H3BC6PF5iKr9d6evkWlIsP9rzZ6Jfv0b7V5+SOwtg/e7zmhRRno8ZdBzipfpbX 8+zhOkVwqIRfLB9it7llvfW2ZfV9NNV8Wv41MMIjv2j1b8wQutBqU3VXrEkM1IbJprkurC8r uhxjdGcqI8TLFmEKpfgfSeb2CpwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7r/v6WkGCxqVbL4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6Ge++8xTs kqk40XSOuYHxG38XIyeHhICJxIPJjaxdjFwcQgJLGSWublnNBpGQktjX858dwhaW+HOtiw2i qJVJYtr278wgCTYBM4lHX+YBdXNwiAiYSjzbKwkSZhbIlDj9ah/YHGGBSIn509+BzWERUJV4 vO4fC4jNK+AkcWz5XRaI+fISMy99B6vhFHCW6PgI0SsEVPPxWQcrRL2gxMmZT1gg5stLNG+d zTyBUWAWktQsJKkFjEyrGEVSS4tz03OLjfSKE3OLS/PS9ZLzczcxAiNh27GfW3Ywrnz1Ue8Q IxMH4yFGCQ5mJRHewL7kFCHelMTKqtSi/Pii0pzU4kOMpkB3T2SWEk3OB8ZiXkm8oZmBqaGJ maWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QDEzvLjqRNnSaf71rFGu0obWc+Y+oa Lvng3tHWP3P7YlQvarAX33hqpaCUp+86x8GdefU2gb2WOyUCu9kKFJ9t/X46ZtflTjn9vPZ5 /dFtDwReBCT9+lByc/veaQ0ztpbPkfm4gcmdbeLM9/Wuzl1vpY5/DAk4KM2mXJIcyFNSxHp7 94a37yNZtCKO/X1S9CUm1ku0e5fvb5VHS+p3rKvn9tkavcHk3cS9P3bvWdt8Xr5yGX/rmj27 /+xdLfGZg+FuxqGO1kfx14z4vxw89OLP97in/CfP1H/Y7Dmjxjp+U8J92wWW8ld99x9Pf8Nq 8uqRUHGAzYSv6xLfRJ/YbKvUqupuUajz7nN4zoQ1t1M5qpVYijMSDbWYi4oTAfCFploNAwAA X-CMS-MailID: 20230517154711eucas1p124a75ba193bf302825a2fa71d838725f X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230517154711eucas1p124a75ba193bf302825a2fa71d838725f X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230517154711eucas1p124a75ba193bf302825a2fa71d838725f References: <20230517154702.4215-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: 1684338491132100007 Rename e1000e_ba_state according and e1000e_write_hdr_to_rx_buffers for consistency with IGB. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index f9ff31fd70..62c5dcfda5 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1397,17 +1397,17 @@ 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, - const char *data, - dma_addr_t data_len) +e1000e_write_hdr_frag_to_rx_buffers(E1000ECore *core, + hwaddr ba[MAX_PS_BUFFERS], + E1000EBAState *bastate, + const char *data, + dma_addr_t data_len) { assert(data_len <=3D core->rxbuf_sizes[0] - bastate->written[0]); =20 @@ -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; @@ -1568,8 +1568,10 @@ e1000e_write_packet_to_guest(E1000ECore *core, struc= t NetRxPkt *pkt, iov_copy =3D MIN(ps_hdr_len - ps_hdr_copied, iov->iov_len - iov_ofs); =20 - e1000e_write_hdr_to_rx_buffers(core, ba, &bast= ate, - iov->iov_base, iov_c= opy); + e1000e_write_hdr_frag_to_rx_buffers(core, ba, + &bastate, + iov->iov_b= ase, + iov_copy); =20 copy_size -=3D iov_copy; ps_hdr_copied +=3D iov_copy; @@ -1585,8 +1587,8 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, } else { /* Leave buffer 0 of each descriptor except first = */ /* empty as per spec 7.1.5.1 = */ - e1000e_write_hdr_to_rx_buffers(core, ba, &bastate, - NULL, 0); + e1000e_write_hdr_frag_to_rx_buffers(core, ba, &bas= tate, + NULL, 0); } } =20 --=20 2.25.1