From nobody Sat May 11 17:17:00 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=1685369044; cv=none; d=zohomail.com; s=zohoarc; b=JAcVnWoyjzNCYQWMx/J3uOKkGQ8FYruP9NLmTjQnWr3y9RilIlrVAW1MkT73glH8tSOzSQSWREm432Ki9A/VSQxOh+TPaGkKJBgrj4F4e5ja4fIRpGqS7YFY9o8npmcTPya3eSWhxuflLzX1lkTjjU/xEpF7F+DCcGYWJX2K5FU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685369044; 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=lunVsi6HsaJ1+/9Yrq8KWQx64hHneMocNeqfFm1EqMY=; b=k2OO6KmNS+cquac+8OlDK1m4MwgKlxlGpGIZenujTP+lz0MIcUqOY+UBnrWY691+5lg3I0u8OuKsF096yfaZqEsSZEHEbgLny/qgwnZUj4pk6LspjWq1+UBvH3dWyrWvoBPhp311T1ZhLIIc6VkGiMaCDe2W2aotISHLc2KRNV8= 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 1685369044729349.80166509737114; Mon, 29 May 2023 07:04:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3dRu-0002q1-OE; Mon, 29 May 2023 10:02:14 -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 1q3dRr-0002mm-7A for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:11 -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 1q3dRp-0006nw-ID for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:10 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230529140203euoutp01578a6dcf5d812ddf617499fc90db3fea~johs7D_Pi1419514195euoutp010 for ; Mon, 29 May 2023 14:02:03 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230529140203eucas1p135a4750334729a519b6d3d9358f9db25~johspkB-L1338413384eucas1p1v; Mon, 29 May 2023 14:02:03 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 93.91.42423.A50B4746; Mon, 29 May 2023 15:02:03 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230529140202eucas1p1c29796815f0cdf65f72d300842da16b8~johsYLIIR2126721267eucas1p1z; Mon, 29 May 2023 14:02:02 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230529140202eusmtrp21370e5b101f5c2b9b710ba3bda478f71~johsXpS7v0803108031eusmtrp2W; Mon, 29 May 2023 14:02:02 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id A7.38.14344.A50B4746; Mon, 29 May 2023 15:02:02 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230529140202eusmtip2b0e5e0d734fb1b002de7f2f7017f13eb~johr1TIkt3109331093eusmtip2d; Mon, 29 May 2023 14:02:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230529140203euoutp01578a6dcf5d812ddf617499fc90db3fea~johs7D_Pi1419514195euoutp010 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685368923; bh=lunVsi6HsaJ1+/9Yrq8KWQx64hHneMocNeqfFm1EqMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pN2wnzD9qkLxAI1NjozDf5ar3Dg0/CL+k7WvpuCe8m18YdM64tbdD2upOG0qiTYdp Uu4bdQqbgatgieRgZsC9Bz1bGtGqSetSHWlLrS5VovcNgmWkReDwNFZUZCix/pnZTl czLaA+PWuzz6JXhqZEK6+YGdijvAaFg8qQ7p4ISg= X-AuditID: cbfec7f2-a51ff7000002a5b7-d8-6474b05a3387 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 v10 1/7] igb: remove TCP ACK detection Date: Mon, 29 May 2023 16:01:47 +0200 Message-Id: <20230529140153.4053-2-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529140153.4053-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduznOd3oDSUpBve2Mll8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujL5dC1kKbrNW9Oy+wNbAuIeli5GTQ0LAROLA/03MXYxcHEICKxglzi5/ wwbhfGGUWPh5BQuE85lR4vPhs0wwLU1z3rCC2EICyxklZk3OhChqZ5LonL6GGSTBJmAm8ejL PKAiDg4RAWOJj+3iIGFmgVSJo38Ogq0WBio5t7EfrJxFQFViw6qNYDavgJNE++/TUOfJS8y8 9J0dZAyngLNE52kOiBJBiZMzn7BAjJSXaN46G+wDCYG1HBK/dj1nheh1kfjS/Q9qjrDEq+Nb 2CFsGYn/O+dD/VIu8fPsNnaI5hZGiT1TJ0MVWUtc2voT7H5mAU2J9bv0IcKOEr+2XAQLSwjw Sdx4KwhxA5/EpG3TmSHCvBIdbUIQ1ToS3zbNZIMIS0ksvFEHEfaQ+Lmij2kCo+IsJM/MQvLM LIS1CxiZVzGKp5YW56anFhvmpZbrFSfmFpfmpesl5+duYgQml9P/jn/awTj31Ue9Q4xMHIyH GCU4mJVEeG0Ti1OEeFMSK6tSi/Lji0pzUosPMUpzsCiJ82rbnkwWEkhPLEnNTk0tSC2CyTJx cEo1MGWIzA/8XZXIWd976OPGuVbh7S+WXujJ9l2436du7UOWO+XX9wZqTLBi32r4zKeR4Wh/ s5z+RtNZey4/q/+7977x3zarprKbCpm6ay8e8Xeyn1bjbt63+RbPXd6kbKOeuqX5fBPadrX+ /1avlVqf81ju/uPIfXEJixY/Xe33TD/K/ISe8rInTQckvyxue83X7OMe8iBOrMPA5AzzE9U/ +e3y2aKH7/XPWlawSenlsinm/6eEsv64cbbnJ1OxRk0655uQ+lcRp5rt/FUCf/NwnWRQ5d6c 9si08LLB+kte6Q5W1ZcZnj4Usg2IT+a12ZLX+u3cEYaDr06uDZln1ar1nMfjS03Kp6lX+l+F 9MQaK7EUZyQaajEXFScCAChN5p+dAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7pRG0pSDJY+0rH4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GX27FrIU 3Gat6Nl9ga2BcQ9LFyMnh4SAiUTTnDesXYxcHEICSxklrp9/yAiRkJLY1/OfHcIWlvhzrYsN oqiVSeJH81E2kASbgJnEoy/zgLo5OEQETCWe7ZUECTMLZEqcfrUPrEQYqOTcxn5mEJtFQFVi w6qNYDavgJNE++/TUEfIS8y89J0dZAyngLNE52kOkLAQUEnnvZusEOWCEidnPmGBGC8v0bx1 NvMERoFZSFKzkKQWMDKtYhRJLS3OTc8tNtIrTswtLs1L10vOz93ECIyEbcd+btnBuPLVR71D jEwcjIcYJTiYlUR4bROLU4R4UxIrq1KL8uOLSnNSiw8xmgKdPZFZSjQ5HxiLeSXxhmYGpoYm ZpYGppZmxkrivJ4FHYlCAumJJanZqakFqUUwfUwcnFINTPvLY9JttVoeZ52Sbja5dN+f86e/ R50UR3374RmMwXMN4+azPTpwQ+nGjSpm5St7typpr8zWU5OcavqVgWO7H3v7QtMV2ReMLW7x 8rOq7dqeKN629pb7q//mQfxeuSnPz7ybOCW/9a3LjrVFD0JkEj6K799synFMSbbWZr5X+gqe gnVNa1Wzu61mvDstcK4wL32Si115cmfWdkYFySnRh6I4OJ4euXjxeLPlntIHvGzdisenhskt jFV84v919ZFNq2/eC4h69bFXRCQ/XPta75Q/totlvFVWTm83firQ/iHbTpMrZnLl9nvJ54R7 LEwd5W4HbootY271tDGTaL6Q6mYfe+yQ/l/JP7tVtacosRRnJBpqMRcVJwIAKgdF9A0DAAA= X-CMS-MailID: 20230529140202eucas1p1c29796815f0cdf65f72d300842da16b8 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230529140202eucas1p1c29796815f0cdf65f72d300842da16b8 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230529140202eucas1p1c29796815f0cdf65f72d300842da16b8 References: <20230529140153.4053-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: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.16, 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: 1685369059089100002 TCP ACK detection is no longer present in igb. Signed-off-by: Tomasz Dzieciol Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- 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 d00b1caa6a..e927c51061 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 11 17:17:00 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=1685369027; cv=none; d=zohomail.com; s=zohoarc; b=Yydpv83AYULcwYpNV8uoFa0peyUqRfOHMSEP4ggBCeH7TMycWExY4XtaxwcNfysH3sLq6EUPNUkH8CGEmCOOyF6157g56WIGTU1n6WEgD0P3c1TmBqdpweN9IrJ+joQEMI67a2VAXMPZeHuGa6DfAeqQL++D0/ZLL5WmiTNkLdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685369027; 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=zA/8FB39zbVbvqXYpTGtVq1emGaCToIPGE2RXa9MnJY=; b=G/DWSnOLIKITkUDY5bAay+nxt+DVTD4KZ0cYWljQ4BaNsi9r5N1S9A3dWf+/1pn9MKof8lPO1g11xtrr81dsuYDCX/U2AqpK98DTvhCXQh5ILwjhE/o/YUcC4/Twq30qOx/M7tPGZJjFBNI3LVWeZ7jPKRGbqyaFydiBeo3WWYE= 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 168536902730765.48896237415647; Mon, 29 May 2023 07:03:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3dRw-0002qS-Fp; Mon, 29 May 2023 10:02:16 -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 1q3dRs-0002nV-Ls for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:12 -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 1q3dRq-0006oA-5Q for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:12 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230529140203euoutp02429bac1bd5e9ce5a13b3fe17f78e0dd5~johtZsYzy1118311183euoutp02n for ; Mon, 29 May 2023 14:02:03 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230529140203eucas1p24988edcdfbec8b226f4c7b97bb6a8618~johtNbNas0737807378eucas1p2K; Mon, 29 May 2023 14:02:03 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 9D.8B.11320.B50B4746; Mon, 29 May 2023 15:02:03 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230529140203eucas1p22232810ddde5658a5849b0f6cf145e91~johs1vFpJ2046920469eucas1p26; Mon, 29 May 2023 14:02:03 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230529140203eusmtrp141de8428398bb5d704a3f0ee5c1aad96~johs1Kl4b0620706207eusmtrp19; Mon, 29 May 2023 14:02:03 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 8C.06.10549.B50B4746; Mon, 29 May 2023 15:02:03 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230529140202eusmtip23cf89d9478a8951c001ae8cd6d93f1a7~johsVz9KD1126611266eusmtip2s; Mon, 29 May 2023 14:02:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230529140203euoutp02429bac1bd5e9ce5a13b3fe17f78e0dd5~johtZsYzy1118311183euoutp02n DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685368923; bh=zA/8FB39zbVbvqXYpTGtVq1emGaCToIPGE2RXa9MnJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rBYx3mf22kpf/VFEjNHhOtGXcwmwhqZtaf7wrgxZaPRZLOk0Pvd2KyzyFxRQE8HGc IiJ91u+2o3ihYmc5SjoZhFBASF9gtO6xziwJ+blC1NTw2iJueAp6626LK58pTMPQCh oA9NkVuHEudvLlhX4/r7w1DZ6E5W6LSUpqgH41sY= X-AuditID: cbfec7f4-993ff70000022c38-7b-6474b05b029d 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 v10 2/7] igb: rename E1000E_RingInfo_st Date: Mon, 29 May 2023 16:01:48 +0200 Message-Id: <20230529140153.4053-3-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529140153.4053-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42LZduzned3oDSUpBm3vlSw+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXRvf9q8wF0+IqXh6Zz9bA+NOri5GTQ0LARKL711OWLkYuDiGBFYwSF14c hnK+MErMebCPDcL5zCjx79RGFpiWhXdbmSESyxkltrSfg3LamSSuntnGDlLFJmAm8ejLPNYu Rg4OEQFjiY/t4iBhZoFUiaN/DoINEhYwlzh1/hgjiM0ioCqx+t0msDivgJPE7s7bjBDL5CVm XvrODjKGU8BZovM0B0SJoMTJmU9YIEbKSzRvnQ12goTADg6JN3/mQR3qIrHsQCM7hC0s8er4 FihbRuL05B6omnKJn2dBTgZpbmGU2DN1MlSRtcSlrT/B7mcW0JRYv0sfxJQQcJR4tdwbwuST uPFWEOIEPolJ26YzQ4R5JTrahCBm6Eh82zSTDSIsJbHwRh2E6SHxcH7wBEbFWUhemYXklVkI SxcwMq9iFE8tLc5NTy02ykst1ytOzC0uzUvXS87P3cQITC2n/x3/soNx+auPeocYmTgYDzFK cDArifDaJhanCPGmJFZWpRblxxeV5qQWH2KU5mBREufVtj2ZLCSQnliSmp2aWpBaBJNl4uCU amBi1ji8rZ3XudLveO2Tcx90WvS604yu3n57U+zg1fg11evrUicamBl6T3RTeXrMyYnd7PL0 1c4mHLqPS14ZVZhfPXvo7KNd69X2Rsdyyf7/MutH2YZbfFE3/PJrL6XYFW38vU7J4vTHtzZR yRm3K18fesxgIfhMLMmGqypiad/xWPV9N9skrhU0PnuXUH412ezsqf8OXBcn6i+x1Emqklgx Wzq0sefICpnQ5vW/XRd5J7ewR83NTBEXco/1Xs75df3KlkDf8My2mk9rQzMnrM/IL2yVea5V vM5Bl5W50fHU5E/TT/rmOnzJLfolmLBk+QEn4cc/d9klKIvJ7XileKp354Jbalyp1+4t3f/t 1y0lluKMREMt5qLiRAApkMionAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7rRG0pSDJqv8Fl8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jO77V5kL psVVvDwyn62B8adXFyMnh4SAicTCu63MXYxcHEICSxklTv7bxwSRkJLY1/OfHcIWlvhzrYsN oqiVSaKlr4MFJMEmYCbx6Ms81i5GDg4RAVOJZ3slQcLMApkSp1/tYwOxhQXMJU6dP8YIYrMI qEqsfrcJrJVXwElid+dtRoj58hIzL31nBxnDKeAs0XmaAyQsBFTSee8mK0S5oMTJmU9YIMbL SzRvnc08gVFgFpLULCSpBYxMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQIjYduxn5t3MM57 9VHvECMTB+MhRgkOZiURXtvE4hQh3pTEyqrUovz4otKc1OJDjKZAZ09klhJNzgfGYl5JvKGZ gamhiZmlgamlmbGSOK9nQUeikEB6YklqdmpqQWoRTB8TB6dUAxPTpZdlohzbVAs/PDpfls16 dmHYwd+mX7hLGpQn9aZMZvzqWf7GVFpI+9HlZIGS1EWvk9NErisYXl60unX1O9m9doXfso5d SDzyon7a/zDZonefd71+wTs5QP/rHpnflZI/0mf712nElf/qeV/fs1nDiVOvKcdv1duZ3Wnq qjVv7/fumem9SfvljmPVuf/n2dcc4PE0/LBN9W/Dw6vxbr/MpszPPf507tbL/HenRX6OWvRH WPyg/n6mGyzvO3b6vdnOaOw3b8+OezFCjt8Ya+YlpT59zT+Pp034xtOXstZB+l96lY0D/S0v zZpqo5/zgPNfZ8Gkk012M78s9vrNvNVrh9k8XtXdc/jWnNiiUMysxFKckWioxVxUnAgA26tx iQ0DAAA= X-CMS-MailID: 20230529140203eucas1p22232810ddde5658a5849b0f6cf145e91 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230529140203eucas1p22232810ddde5658a5849b0f6cf145e91 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230529140203eucas1p22232810ddde5658a5849b0f6cf145e91 References: <20230529140153.4053-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: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.16, 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: 1685369028665100001 Rename E1000E_RingInfo_st and E1000E_RingInfo according to qemu typdefs gui= de. Signed-off-by: Tomasz Dzieciol Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- 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 9f185d099c..f6b628eaef 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 e927c51061..051980b4f5 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 11 17:17:00 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=1685369013; cv=none; d=zohomail.com; s=zohoarc; b=OJg2OkhRkSEKFexQcbqExzjzZsnTMuNJ3hgHER0T/f9u5KoNvET7sM9C4qrHD1muFXFk1dKp9oE3nLYjnIaY16RjsR+VtHQ6MC8nyXW36UTqYKcwm9JD1JT6H0+DQ0408wqXnP/9ZKEmUmGArbTK8+a1qfBHFf1/yaD7kBw6qu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685369013; 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=HnUWazik/RcbkpE38Ii94NHLcI0ykUtfyb/ADn8jrlM=; b=a+lKaxsdIHchj3HcSJrL8KGv1XVGPOsCxUYRP6v9+ortfR9XBsXxaR2pXU8hKrcPESxhIFHH9jsD3VPloMQbEeG56NP9JrwNvtw0DdFrtqeZyYSeL9oOnN9H1f78wIyt5aOaD69lK8rnfXePJjC2bAIROLNnAVwX09Dlf8za/vM= 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 1685369013615405.5910838667969; Mon, 29 May 2023 07:03:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3dRv-0002q3-Hn; Mon, 29 May 2023 10:02:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3dRs-0002nU-Kv for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:12 -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 1q3dRp-0006oH-Jm for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:12 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230529140204euoutp02565b1f7e8ab1227513381edc057a1350~johtu_tet1118311183euoutp02p for ; Mon, 29 May 2023 14:02:04 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230529140204eucas1p1b5677e2737cc9dbc7346b2db4d523c19~johtl4RYD2126721267eucas1p12; Mon, 29 May 2023 14:02:04 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id F4.91.42423.C50B4746; Mon, 29 May 2023 15:02:04 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230529140203eucas1p22d5b4abfc497838b740807185913576e~johtTYepb2928329283eucas1p23; Mon, 29 May 2023 14:02:03 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230529140203eusmtrp24d08865202028b9f49676ced70896835~johtSyRWb1116611166eusmtrp2k; Mon, 29 May 2023 14:02:03 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 28.38.14344.B50B4746; Mon, 29 May 2023 15:02:03 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230529140203eusmtip226bfcd9c30cc7f2096bff5b5e38e22a6~johs0H_Pg1093610936eusmtip20; Mon, 29 May 2023 14:02:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230529140204euoutp02565b1f7e8ab1227513381edc057a1350~johtu_tet1118311183euoutp02p DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685368924; bh=HnUWazik/RcbkpE38Ii94NHLcI0ykUtfyb/ADn8jrlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Urd94jpHm2WSSBXJyaJZVhG3ig/3j28CMtY7q93VjKmdyhIZ+CuTjN1hlqu8AzdCj jjBvdpnd/Jjrw0Ird4ohUNrpKrMvxMWQCmYutqbjMKTCvqg9TIbeHPFQ2l3YWxxus2 I21a45/BwP9jMbV78XrG8Y6nSUWTJaqhYg523KsY= X-AuditID: cbfec7f2-a3bff7000002a5b7-dd-6474b05c4715 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 v10 3/7] igb: RX descriptors guest writting refactoring Date: Mon, 29 May 2023 16:01:49 +0200 Message-Id: <20230529140153.4053-4-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529140153.4053-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgleLIzCtJLcpLzFFi42LZduznOd2YDSUpBm+fMlt8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujB8rF7AWbPevuPfpKGMDY7d5FyMnh4SAicTyCe/Zuhi5OIQEVjBKLD6z H8r5wihx8P06RgjnM6PEt1VHgBwOsJbODf4Q8eWMErcOnGGHcNqZJA4v7WQBmcsmYCbx6Ms8 VpAGEQFjiY/t4iBhZoFUiaN/DoKVCAu4S3RfvQlmswioSrS8O8kEYvMKOEnMfH6MDeI8eYmZ l76zg4zhFHCW6DzNAVEiKHFy5hMWiJHyEs1bZzODnCAhsIND4kRvNxNEr4vEya3zoeYIS7w6 voUdwpaR+L9zPlRNucTPs9vYIZpbGCX2TJ0MVWQtcWnrT7D7mQU0Jdbv0of43VFi9uZKCJNP 4sZbQYgT+CQmbZvODBHmlehoE4KYoSPxbdNMNoiwlMTCG3UQpodESx/7BEbFWUhemYXklVkI SxcwMq9iFE8tLc5NTy02zEst1ytOzC0uzUvXS87P3cQITCyn/x3/tINx7quPeocYmTgYDzFK cDArifDaJhanCPGmJFZWpRblxxeV5qQWH2KU5mBREufVtj2ZLCSQnliSmp2aWpBaBJNl4uCU amBqdZ6Rybr4ffEJ5mlf7t7I5P277xnXz0d/VuWUPjGf8Vp1aqXMgQWPxZKulx5YZRRR0LH/ kjarx1S1itrMw6Fc170eZJ/80cyuMH/yxi+rqvrTJ8722Ob2qyen4sPfbQ/nXefOrfmgct/k od037osFMYLNeuUWKT+qpwbPdPasjymY+3b2ld5/wtOZX236/H/3ep0y+7CtHwz7AmtjbJ6u YJy4+Etq2BMuPvHIxD3vAreyLPA6m3eHvenk3xeeriyVq1bHp1f6Le5ct10lijc80u121w3d Q80NLqEqZaej6tYdX5p994jBi+slt9Y517r08357svilxbMzIa4+efvmzf2VpPRzRRn/i/CH sZGpSizFGYmGWsxFxYkAQ+OVaJsDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xe7rRG0pSDLb061p8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jB8rF7AW bPevuPfpKGMDY7d5FyMHh4SAiUTnBv8uRi4OIYGljBJvvt9l6mLkBIpLSezr+c8OYQtL/LnW xQZR1MokceXgPzaQBJuAmcSjL/NYQQaJCJhKPNsrCRJmFsiUOP1qH1iJsIC7RPfVmywgNouA qkTLu5Ng83kFnCRmPj/GBjFfXmLmpe/sIGM4BZwlOk9zgISFgEo6791khSgXlDg58wkLxHh5 ieats5knMArMQpKahSS1gJFpFaNIamlxbnpusZFecWJucWleul5yfu4mRmAcbDv2c8sOxpWv PuodYmTiYDzEKMHBrCTCa5tYnCLEm5JYWZValB9fVJqTWnyI0RTo7InMUqLJ+cBIzCuJNzQz MDU0MbM0MLU0M1YS5/Us6EgUEkhPLEnNTk0tSC2C6WPi4JRqYDJd/iJ76e59WscWLN3PvDZN 5nub1c+JZU7Pbn2Q2eXBOfd40vXyX5cDMrOP/yuV4ilsvvPiw9/nXHO8rtzcwGDwQCVR50r+ 0YNP/3fsnqW9ZR2LxN5D3VpaMoIXnt/LmLy3xMqtK7reO1pub1qFiRNzjsbBfa9TnxssDr70 ruLSpYmdErlnGHRXtb1Q7lg4LzatsbZdwHNh3pwzn1I2Hjob2O28xDTx/6PbPx1je55b899X nGrrcK27oEZhVt5dvgWrYr9UhBWYPknQfTHn0CUu705Vrrmu/SYvgpbdzvt7TOhJ+DKvP06H 98+IKVT5uywjecGju72nyifJ91Sr7fzpvPnjo3Tz8nMi7Srf73YqsRRnJBpqMRcVJwIAiCN5 tQwDAAA= X-CMS-MailID: 20230529140203eucas1p22d5b4abfc497838b740807185913576e X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230529140203eucas1p22d5b4abfc497838b740807185913576e X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230529140203eucas1p22d5b4abfc497838b740807185913576e References: <20230529140153.4053-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: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.16, 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: 1685369014755100001 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- hw/net/igb_core.c | 170 +++++++++++++++++++++++--------------------- hw/net/igb_regs.h | 10 +-- hw/net/trace-events | 4 +- 3 files changed, 96 insertions(+), 88 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 051980b4f5..3a6df0d55e 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,108 @@ 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; + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + + if (etqf < 8) { + pkt_type =3D BIT(11) | etqf; + return pkt_type; + } + + 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; + } else { + pkt_type =3D 0; + } + + 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, struct NetRxPkt *pkt, const E1000E_RSSInfo *rss_info, uint16_t etqf, bool= ts, uint16_t length) { + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + uint16_t rss_type =3D 0, pkt_type; + bool eop =3D (pkt !=3D NULL); + uint32_t adv_desc_status_error =3D 0; memset(&desc->wb, 0, sizeof(desc->wb)); =20 desc->wb.upper.length =3D cpu_to_le16(length); + igb_build_rx_metadata_common(core, pkt, eop, + &desc->wb.upper.status_error, + &desc->wb.upper.vlan); + + if (!eop) { + return; + } + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); + + if ((core->mac[RXCSUM] & E1000_RXCSUM_PCSD) !=3D 0) { + if (rss_info->enabled) { + desc->wb.lower.hi_dword.rss =3D cpu_to_le32(rss_info->hash); + rss_type =3D rss_info->type; + trace_igb_rx_metadata_rss(desc->wb.lower.hi_dword.rss, rss_typ= e); + } + } else if (hasip4) { + adv_desc_status_error |=3D E1000_RXD_STAT_IPIDV; + desc->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( + desc->wb.lower.hi_dword.csum_ip.ip_id); + } + + if (ts) { + adv_desc_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); + desc->wb.lower.lo_dword.pkt_info =3D cpu_to_le16(rss_type | (pkt_type = << 4)); + desc->wb.upper.status_error |=3D cpu_to_le32(adv_desc_status_error); } =20 static inline void @@ -1468,8 +1475,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..159df09014 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -279,7 +279,7 @@ igb_link_set_ext_params(bool asd_check, bool speed_sele= ct_bypass, bool pfrstd) " 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" =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 11 17:17:00 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=1685368984; cv=none; d=zohomail.com; s=zohoarc; b=lT9ywJay/kpyZk6mHRQWMUG/UMFCMJIv2+KL5p8vQrL+ajsLgTtr+rr6+GoldXRxxHPi50UHW7N4RAcM58a9idltvB4ujvmOB7mVs3HY783yWD9FyAe8Wr3Q2kTrbKfrXg1TpQ/whTyAZDjHtW1iWJh32zA0DRgIbA3AypFb95s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685368984; 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=dfGALreN/MF0mSolQVaQBELyXAvMbONzJhn5NLENWs0=; b=iT6USBR0j6iOnT9pLR/u4OFJny/WBUkru/Lc9H2VHhjdWf7oPa83RYKE6QwGi5YiPAy93g2Pgw6ypx1Oc52rjQPHGbcQbk6XWeJ+7OTUW1vvC/DUyvW5Z96dFybrjACuEORHZCQ5SthxxTUkveK882nU0IYZBcQ0+EQBZvX6MeU= 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 168536898429843.58582529629143; Mon, 29 May 2023 07:03:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3dS1-0002rN-PI; Mon, 29 May 2023 10:02:21 -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 1q3dRr-0002mn-Bb for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:11 -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 1q3dRo-0006os-1A for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:11 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230529140205euoutp022a2f3fd8a34eddbc5effa0fb29796a50~johu52dJU0803508035euoutp02Y for ; Mon, 29 May 2023 14:02:05 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230529140204eucas1p20c3ee92ac1f2c0ffd7c7fe7960df1f64~johuVCdp-0736107361eucas1p2H; Mon, 29 May 2023 14:02:04 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 2E.8B.11320.C50B4746; Mon, 29 May 2023 15:02:04 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230529140204eucas1p1ef5ad7556e55e6e504d0bcf3092256f3~joht3kF2h2227322273eucas1p1C; Mon, 29 May 2023 14:02:04 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230529140204eusmtrp17e9dafae49663d28e1f91d15183786b6~joht3FPC60621006210eusmtrp16; Mon, 29 May 2023 14:02:04 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 9E.06.10549.C50B4746; Mon, 29 May 2023 15:02:04 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230529140203eusmtip24266b0ad5e31d57c51b9d6dac6e3fcea~johtSGfYt1092510925eusmtip25; Mon, 29 May 2023 14:02:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230529140205euoutp022a2f3fd8a34eddbc5effa0fb29796a50~johu52dJU0803508035euoutp02Y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685368925; bh=dfGALreN/MF0mSolQVaQBELyXAvMbONzJhn5NLENWs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G/b6hDlFLEOFB4VNUbljoziTHuFqPRf3Yr3tobZ6XT3qg2G9eP+LixRyQ0KSFaT6s Z81UiJ/hfVvyKP6rB3XEnKkd5E+m78u9Dh5EE4Bkd6MC2Oh6OvCJbJkOmDmk8P7OYl 88P6mPGrOaD2n8whw7bvZ4gOZClD4MWHWFlfthXY= X-AuditID: cbfec7f4-993ff70000022c38-7f-6474b05c92c6 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 v10 4/7] igb: RX payload guest writting refactoring Date: Mon, 29 May 2023 16:01:50 +0200 Message-Id: <20230529140153.4053-5-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529140153.4053-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42LZduznOd2YDSUpBrufG1p8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujB8dr9kLGtMr2ie3MjUwrnTqYuTgkBAwkXh1gL2LkYtDSGAFo8SJJT8Z IZwvjBK/Z02DynxmlPjz/jRbFyMnWMetJ5+hqpYzSmzb3c4EkhASaGeSuHVFDcRmEzCTePRl HivIChEBY4mP7eIgYWaBVImjfw6ygNjCAs4SS7b0s4LYLAKqEpN/nAEbwyvgJDEPbpe8xMxL 39lBxnAC1Xee5oAoEZQ4OfMJC8RIeYnmrbOZQc6RENjCIfF9w1eoXheJ73s2QNnCEq+Ob2GH sGUkTk/uYYGwyyV+nt3GDtHcwiixZ+pkqCJriUtbf4LdzyygKbF+lz5E2FHidM8fJkjI8Unc eCsIcQOfxKRt05khwrwSHW1CENU6Et82zWSDCEtJLLxRBxH2kLj65z3bBEbFWUiemYXkmVkI axcwMq9iFE8tLc5NTy02ykst1ytOzC0uzUvXS87P3cQITC2n/x3/soNx+auPeocYmTgYDzFK cDArifDaJhanCPGmJFZWpRblxxeV5qQWH2KU5mBREufVtj2ZLCSQnliSmp2aWpBaBJNl4uCU amDKW+jCttWo+cflZ6pf9uWzXtVpEDqXZjxt7cJbExWd1IQjIwsEhBzKW1ibIwqLVH2dr16y XV/EwrhzzsSzE4qP2E5nZ9r5wP6dVewu23CepO/d4i+SxFLjFiv28B0IvDCdqbsyZdKOQ8Ul bsYL3j1/t2mHFvP6rY5L5n3zO/hhTfD541eqZgZU5zEXGkbu7FzQqd7987h20/491bNSBbiO /18V9+HRxFnOmSbPV5/f7rPdTWhLr/fsDXUX7i9ePVFhynGTuT8yvKYuS95qlOV/9abrl19X jfd8UmnPOMzkk7V4p37rRPdX/w7lW248ssf+L1Pi+qu5ynwa6t+ML/+90ycqzer0PXBlndaa lsJZSizFGYmGWsxFxYkA+Ba8/ZwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xe7oxG0pSDD7M5bf4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GT86XrMX NKZXtE9uZWpgXOnUxcjJISFgInHryWdGEFtIYCmjxJMWZ4i4lMS+nv/sELawxJ9rXWxdjFxA Na1MEk1/ulhAEmwCZhKPvsxj7WLk4BARMJV4tlcSJMwskClx+tU+NhBbWMBZYsmWflYQm0VA VWLyjzNMIDavgJPEvPen2SDmy0vMvPSdHWQMJ1B952kOiHOcJDrv3WSFKBeUODnzCQvEeHmJ 5q2zmScwCsxCkpqFJLWAkWkVo0hqaXFuem6xoV5xYm5xaV66XnJ+7iZGYBxsO/Zz8w7Gea8+ 6h1iZOJgPMQowcGsJMJrm1icIsSbklhZlVqUH19UmpNafIjRFOjsicxSosn5wEjMK4k3NDMw NTQxszQwtTQzVhLn9SzoSBQSSE8sSc1OTS1ILYLpY+LglGpgUr01r9ri6m2Vcp/8FeLf7viH n1t5IHkz1wOdQMXn+3bZnE2KtD3jwfUucWXLtbv7ytfW/LaSLThpXs702XUSK0fylflvy4tV OPSL66YuPRVxP3r777MvF/w79UBKwyLBdnFdSwG/qeci15sCSx66TEtrj8lvkws/eUnp2OPT nht4710UNjO4zXjrzHxj5kmnbrYt3hNeW7Biabndxh8CK79723876rd2FdcSu5bfEaJlEptT L/ffa5/U2eX67eoChYbibc6F9ycfeNTo2e1/n73O0/TiD/EXH1+87gzhen8ktGhlaF35bJ6k +PqstLW9QflnXy98aqV00cSMnXP7+ZbLN11OV1w0sl+bfbidUYmlOCPRUIu5qDgRAIIoK0gM AwAA X-CMS-MailID: 20230529140204eucas1p1ef5ad7556e55e6e504d0bcf3092256f3 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230529140204eucas1p1ef5ad7556e55e6e504d0bcf3092256f3 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230529140204eucas1p1ef5ad7556e55e6e504d0bcf3092256f3 References: <20230529140153.4053-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: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.16, 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: 1685369021942100002 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- hw/net/e1000e_core.c | 18 ++-- hw/net/igb_core.c | 213 +++++++++++++++++++++++++-------------- tests/qtest/libqos/igb.c | 5 + 3 files changed, 150 insertions(+), 86 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index f6b628eaef..f29e5e2897 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 3a6df0d55e..8c248683c3 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) @@ -1514,19 +1537,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) @@ -1552,6 +1562,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, @@ -1561,91 +1658,51 @@ 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); + igb_pci_dma_write_rx_desc(core, 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 11 17:17:00 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=1685368985; cv=none; d=zohomail.com; s=zohoarc; b=nOv/gh72DO4mx8wu2dvO4qrNifmxF1zoJGOCYXYVgOsGsAT+FxmDrXNNHkgj/b3Agfkap3q0Q7w8rnGvCwL8gQwGLqlxo18XCXJVoI7VRta0IkE95vOS2OCq1mvQuWLwo+2Gm8272Esv7QNhCTCZk9XovhYwqL1Avb4KdcNc+wI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685368985; 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=BJFwp+qpLy3VsRJdf2coe0wRkVQnD7+Ws+fRABUaS4U=; b=SrJSo+XUaiJbhbORpE3iMdJT4TTuUm/3LNeQjnc57BvcofRJ+6qfgLwE5WtzbVrMeS0exG5BhsC6FpsYL2ETU2GsaM28zj6u2v0gOuDYUx4Lve9dnJ8LTcLoT9qCl9iFgRJbDZzndx+5+TpEzokySFgGYrSXXjKBMJLmr+Jsnn0= 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 1685368985058293.7783365774744; Mon, 29 May 2023 07:03:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3dRs-0002nP-J4; Mon, 29 May 2023 10:02:12 -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 1q3dRq-0002mX-ON for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:10 -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 1q3dRn-0006on-A0 for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:10 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230529140205euoutp02ed45e4449d8c7786143ee5a675fca2ba~johuwPaM11118711187euoutp02n for ; Mon, 29 May 2023 14:02:05 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230529140205eucas1p2c6b3e08bb00efec4d75c9088776322f0~johunAQrf0726107261eucas1p2N; Mon, 29 May 2023 14:02:05 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 0F.8B.11320.D50B4746; Mon, 29 May 2023 15:02:05 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230529140204eucas1p24077b0c513826b7d22592c77a4e5dbc5~johuVhzJD2932729327eucas1p2j; Mon, 29 May 2023 14:02:04 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230529140204eusmtrp170b3381e32259749e22afecf546323af~johuVABJ10617406174eusmtrp1H; Mon, 29 May 2023 14:02:04 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 8F.06.10549.C50B4746; Mon, 29 May 2023 15:02:04 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230529140204eusmtip24546d40a3754f1f9b3b3b963a4a04121~johtwNOp80256502565eusmtip2g; Mon, 29 May 2023 14:02:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230529140205euoutp02ed45e4449d8c7786143ee5a675fca2ba~johuwPaM11118711187euoutp02n DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685368925; bh=BJFwp+qpLy3VsRJdf2coe0wRkVQnD7+Ws+fRABUaS4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XtYlX0O0G+FSEVj4QmrasU1CaPbmWpJBkaj79/4nM+bMgVyK5fxhrIjfKMzZmntRU 4/pjmuTW398E2deNPA96LBUzGJo8u084bmLr+5gMsBUIUFBriLChLSBgPVbl5yxY9G 2xVLLVEEK8IF+s1AjK1rLke8d+ucXwmxI0F523g4= X-AuditID: cbfec7f4-993ff70000022c38-81-6474b05df58e 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 v10 5/7] igb: add IPv6 extended headers traffic detection Date: Mon, 29 May 2023 16:01:51 +0200 Message-Id: <20230529140153.4053-6-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529140153.4053-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpjleLIzCtJLcpLzFFi42LZduzned3YDSUpBiv/cFl8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujBP9fAW7uSquP5zH2MC4hqOLkZNDQsBE4u6eTmYQW0hgBaPEhGtqXYxc QPYXRolvb54yQTifGSWm33zJ2sXIAdZx670RRHw5o0RT60IWCKedSeLzn9nsIKPYBMwkHn2Z B9YgImAs8bFdHCTMLJAqcfTPQRYQW1jAU+J4Yz+YzSKgKvFxykImkHJeASeJrfcjII6Tl5h5 6Ts7SJhTwFmi8zTYzbwCghInZz5hgZgoL9G8dTYzyAUSAjs4JPb8m8EIcaaLxLlt2hBjhCVe Hd/CDmHLSJye3MMCYZdL/Dy7jR2it4VRYs/UyVBF1hKXtv4Eu55ZQFNi/S59iLCjROPGXiaI 8XwSN94KQpzAJzFp23RmiDCvREebEES1jsS3TTPZIMJSEgtv1EGEPSS2/93POIFRcRaSX2Yh +WUWwtoFjMyrGMVTS4tz01OLjfJSy/WKE3OLS/PS9ZLzczcxApPK6X/Hv+xgXP7qo94hRiYO xkOMEhzMSiK8tonFKUK8KYmVValF+fFFpTmpxYcYpTlYlMR5tW1PJgsJpCeWpGanphakFsFk mTg4pRqYesIzDReU9Eoke/8s+8a6tHP1rRmvPeNX/xVyUcs/3ctTrb1WeeoJuxWxm99tZNlw MjPBSET94fefOROvfM4XP5x55s7bKVxvXu5desGDYVe0w5+HQQodh/o6Ll3cHH1opvSNazZx 0X0FjU7ROqvlnwhe1mh2kztatcVKR983SoX9DheT9mmjj10Xl4hcWq5k2TLbUG69fXD0y5kx Z9l/ck/2PTBVdAVbu4ndzMM5nAqly2yXhO9UDqo+LHZpQ7BDn7O5ZeDjsJU3D+qkWLt0mNTn M8UrRnYWF5dExu3svi/YpvzziPCu+dHb7Xq/d/VOtGKNCJG0Dj/Vd55jf4DhrkW+bAZNYVYC G2qPLFFiKc5INNRiLipOBABtfAWvmQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRmVeSWpSXmKPExsVy+t/xe7oxG0pSDOb3GVh8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jBP9fAW7 uSquP5zH2MC4hqOLkYNDQsBE4tZ7oy5GLg4hgaWMEq8+L2TuYuQEiktJ7Ov5zw5hC0v8udbF BlHUyiRxa+txVpAEm4CZxKMv81hBBokImEo82ysJEmYWyJQ4/WofG4gtLOApcbyxnwXEZhFQ lfg4ZSETSDmvgJPE1vsREOPlJWZe+s4OEuYUcJboPM0BEhYCqui8dxNsEa+AoMTJmU9YIKbL SzRvnc08gVFgFpLULCSpBYxMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQJjYNuxn5t3MM57 9VHvECMTB+MhRgkOZiURXtvE4hQh3pTEyqrUovz4otKc1OJDjKZAV09klhJNzgdGYV5JvKGZ gamhiZmlgamlmbGSOK9nQUeikEB6YklqdmpqQWoRTB8TB6dUA1NgYMLy8181A6eZ7Lg5zXD6 Xev3i/SPSHCWHYsJvH/JYHes2bNTf2ZO5D9nIyv758bbhmkucpxxWQd+HDhey+tqW10jIXX2 5lnmPZa3FQyKsiabZj8+lLLnlZwS94vdHT09Roqr/1a/tEhb4rKe+6fx3MNefdFXFzR4XlrO Uq2ye8PXubN3+9rfqv20/M6SnR4Pgv3K/y1ocvCK2BiQ39q173iO+aUZe7qemb1Nf9PgyMe/ 5HL7q20RXIb375w+E/1m0e4Nb4J2cRxiUC+Wmi73cr5d4Zs1RyOMN8ZtrbjTtawuwl/hVbFw xHZVFc3kyYY1zMlSFmVp0QvCGTRjFqRZtYvLTpeullM1t0z+5KHEUpyRaKjFXFScCAAxHRNg CgMAAA== X-CMS-MailID: 20230529140204eucas1p24077b0c513826b7d22592c77a4e5dbc5 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230529140204eucas1p24077b0c513826b7d22592c77a4e5dbc5 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230529140204eucas1p24077b0c513826b7d22592c77a4e5dbc5 References: <20230529140153.4053-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: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.16, 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: 1685368986298100003 Signed-off-by: Tomasz Dzieciol Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- 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 8c248683c3..b54d7af8d8 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1420,7 +1420,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; } else { 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 11 17:17:00 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=1685369029; cv=none; d=zohomail.com; s=zohoarc; b=KlMAfG+jYlUZR8OqsdCY6RKNrfcM4CguNpK4zuSWtm9jB0FvSQEbPI8rS4H1gaQRmKWE+ORZf/KUklDWIpC48OP94wgRO8k/f43LXhwPmpLSTtFIftCMkKgnZnrFjJkT8Lk6fX4+hMYSTWjph/8yBv0xieS2OZ5GO3zgqMO+ZPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685369029; 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=RNn8ntBdho+SKu3WMO8aPSrceNjtwJMQfpMiKCVrURU=; b=k/wOodua9bzoE5u+8/u0NSOxsSI/gls3EZ921c8krMUx//MTN/C3KggjXwL1DouTBBeT0EyyAQ/w+g+d1KAMd8vD4L/YD5ixOC5Y0u01P3gsbvPLirka9ycGZ0UVm1npqi72gNJVLu+qiOT0Nut71+bsfRdN0Y5JLMuNt8uJ4HA= 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 1685369029930425.7414352983868; Mon, 29 May 2023 07:03:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3dRw-0002q4-0M; Mon, 29 May 2023 10:02:16 -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 1q3dRu-0002ph-62 for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:14 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q3dRr-0006qZ-Gl for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:13 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230529140206euoutp0205b12fb7b49179ca7e02c1accfd1abb5~johv6URip0803508035euoutp02Z for ; Mon, 29 May 2023 14:02:06 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230529140206eucas1p27d31a46736418bed4d7d4f35300227b5~johvZM5vK0724907249eucas1p2S; Mon, 29 May 2023 14:02:06 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 7F.8B.11320.D50B4746; Mon, 29 May 2023 15:02:05 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230529140205eucas1p1a2629668352844ca6db412905d3546c1~johu5xq-F2051820518eucas1p18; Mon, 29 May 2023 14:02:05 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230529140205eusmtrp26fbb78665bbb1fc10c3a9d6ecae31472~johu5T0O91116611166eusmtrp2m; Mon, 29 May 2023 14:02:05 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id A9.38.14344.D50B4746; Mon, 29 May 2023 15:02:05 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230529140204eusmtip2c8ebe7f534ade5fa8a1369d446845664~johuQwDNB1603416034eusmtip2J; Mon, 29 May 2023 14:02:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230529140206euoutp0205b12fb7b49179ca7e02c1accfd1abb5~johv6URip0803508035euoutp02Z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685368926; bh=RNn8ntBdho+SKu3WMO8aPSrceNjtwJMQfpMiKCVrURU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cRlwekAMgcFc7A98j+TXiLbEEZ+byjEG0kdVogqoMvV6k3HXH0K+ldAmUiqcDQfov MBUJKBDIAjV/P2Z93qe1aFqp80mO2wkXDL7YCrpi4PzHEVQPZ2z1oPPHr+tS8+Tute aHrvIV90x/hzX+tV3n0nr7aJsJ0cg7aKI58T2DuY= X-AuditID: cbfec7f4-993ff70000022c38-83-6474b05d461f 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 v10 6/7] igb: packet-split descriptors support Date: Mon, 29 May 2023 16:01:52 +0200 Message-Id: <20230529140153.4053-7-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529140153.4053-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA01SfSyUcRzv9zz38tDOHnc236l161YZFaHVNZLS6pZZkoixXHdPTnHVPafE VRoLRbNk3FG0FhLR5eWk1dwWSnS7nPQyo1dd6Q1JK3IeLf999nn5fT+f7Ufg/LNsFyJeqaZU SmmCiGPPamybeLwypk4tX2Vs9hWPPKzhisvNI5j4VGkJW9xg+ckVt+caWOJc/RAWwJF0DLey JaZX3bjkTe8tTPLlroUjOVdfhULYUfZ+cioh/gil8vSPtVd8LhjDD70tQslf6i1YGtLuP4Ps CCBXQ1fhR/wMsif4ZCWCq8UDmE3gk6MIPn3AGGEEwVDeOPdfosNYxGaECgSP0htn45kYWIw5 My4OuQZejV6adhGEE+kD3zKdbTROUnD/dyvLhgWkP/R+rWPbMItcCjXPpmYwj9wENyYHceaY ELRm22GCsCMDIbuTYCyO8ED7hsU8KYT0huKZCkDWE2Ay9GBMdjMUPdYjBgvA2l4/O2AhTDWX znqOwkRXI5cJZyC4U5A/a/IFc8PETH+cdIPa254MvRFMzx9hNhpIB+gbdmQ6OMD5xkKcoXmQ dZrPuFfAD72Ww9AucLnvBENL4IrpOZaHFuvmjNHNGaP7f7YM4VXImUqiE+Mo2ltJHfWgpYl0 kjLOQ3YwUY+m/0vnZPuoAVVYv3kYEUYgIwICFznx1ktpOZ8nlx5LoVQH96iSEijaiBYQLJEz b/n6BzI+GSdVUwco6hCl+qdihJ1LGhYsGcwIDh17sUQjrB7V5HlXB/jU7XYzG66pk7f0y4dk R9xL1/r4OUhL/fRj0a4hymHJmo6Sk+Hm/nUVe4XLKkUy3RNd9/tetW/B8fRlxgUbogXxzUsj Ol2eCtNTtq11qnP9lRN2ckDwrKu21jP52Lg2yT/NzttL3tIdE6SLKOkJazJt7eFtP/ySznIN z8cV2dGmDfMsbf2BnLfuF53uWYdbYjX5f1Kb2sc2Re642TG08zpk4/TD1tpU5S7r/MggRU3Z Ro++UJHsnZku5Cj6Jx0DNPsEVvfsJQavKDev75m5nWRxSgbR5Ol8uQ8idq7WcM8Ky4K7Pr6O vFAdtKj8nYhFK6Re7riKlv4FHO9Csp4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xe7qxG0pSDGZ1Slh8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jHdTvzIX PJ3BWPF+y1WmBsaZWV2MnBwSAiYSJw7NYO1i5OIQEljKKHFt3yZmiISUxL6e/+wQtrDEn2td bBBFrUwSD7bMYQJJsAmYSTz6Mg+om4NDRMBU4tleSZAws0CmxOlX+9hAbGEBO4lrHzawgtgs AqoSa2/+B7N5BZwk1v17CLVLXmLmpe/sIGM4BZwlOk9zgISFgEo6792EKheUODnzCQvEeHmJ 5q2zmScwCsxCkpqFJLWAkWkVo0hqaXFuem6xkV5xYm5xaV66XnJ+7iZGYCxsO/Zzyw7Gla8+ 6h1iZOJgPMQowcGsJMJrm1icIsSbklhZlVqUH19UmpNafIjRFOjsicxSosn5wGjMK4k3NDMw NTQxszQwtTQzVhLn9SzoSBQSSE8sSc1OTS1ILYLpY+LglGpgqnzyPerdpgU9a0w60/8vuP9n jy3nnq1Ce/9J/P1X/2SFZUrs0x8ufa87+py2qCSEsTrcZGOwY3667dbZvyyHHs7O1FynKOje 9i2K/elr1/BP+heUDhfPvL1pYfWtmcv+lbA3zDx79kfuu4PR60sNz9/p3ng5P2hKztojU3wL V/q2HBcq+zH/7z/7jJboTu4zD+W1dlgk/Le62nvzZyz3pR9CSv/y14flzctM+vvt/byJd9L/ MbX3zdfvX6NY3VTMV7Ij5kuva0bxgX96/+eJ5EzdLOsc8cbxg1fiOfXdU+X9wqz45pdFqd29 6iLFG+d0SnJWy0T3g+HNvKq1/09c+xfo+z/5pVzPtlINs/q0y0osxRmJhlrMRcWJAKLlkWEO AwAA X-CMS-MailID: 20230529140205eucas1p1a2629668352844ca6db412905d3546c1 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230529140205eucas1p1a2629668352844ca6db412905d3546c1 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230529140205eucas1p1a2629668352844ca6db412905d3546c1 References: <20230529140153.4053-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: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.16, 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: 1685369055595100001 Packet-split descriptors are used by Linux VF driver for MTU values from 20= 48 Signed-off-by: Tomasz Dzieciol Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- hw/net/igb_core.c | 348 ++++++++++++++++++++++++++++++++++++++------ hw/net/igb_regs.h | 9 ++ hw/net/trace-events | 2 +- 3 files changed, 316 insertions(+), 43 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index b54d7af8d8..0a56aac1eb 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,31 @@ 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 IGBSplitDescriptorData { + bool sph; + bool hbo; + size_t hdr_len; +} IGBSplitDescriptorData; + typedef struct IGBPacketRxDMAState { size_t size; size_t total_size; @@ -1249,20 +1282,42 @@ 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]; + IGBSplitDescriptorData ps_desc_data; } 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 +1460,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) { @@ -1495,15 +1557,54 @@ igb_write_adv_rx_descr(IGBCore *core, union e1000_a= dv_rx_desc *desc, } =20 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 *desc, + struct NetRxPkt *pkt, + const E1000E_RSSInfo *rss_info, + const E1000ERingInfo *r, + uint16_t etqf, + bool ts, + IGBPacketRxDMAState *pdma_st) +{ + size_t pkt_len; + uint16_t hdr_info =3D 0; + + 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, desc, pkt, rss_info, etqf, ts, pkt_len); + + hdr_info =3D (pdma_st->ps_desc_data.hdr_len << E1000_ADVRXD_HDR_LEN_OF= FSET) & + E1000_ADVRXD_ADV_HDR_LEN_MASK; + hdr_info |=3D pdma_st->ps_desc_data.sph ? E1000_ADVRXD_HDR_SPH : 0; + desc->wb.lower.lo_dword.hdr_info =3D cpu_to_le16(hdr_info); + + desc->wb.upper.status_error |=3D cpu_to_le32( + pdma_st->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, + 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, + 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 @@ -1564,26 +1665,179 @@ 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, + IGBPacketRxDMAState *pdma_st) +{ + 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; + } + + 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) { + pdma_st->ps_hdr_len =3D total_pkt_len; + pdma_st->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 { + pdma_st->ps_desc_data.hdr_len =3D bheader_size; + goto header_not_handled; + } + + if (fragment && (core->mac[RFCTL] & E1000_RFCTL_IPFRSP_DIS)) { + pdma_st->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)) { + pdma_st->ps_hdr_len =3D net_rx_pkt_get_l5_hdr_offset(pkt); + } else { + pdma_st->ps_hdr_len =3D net_rx_pkt_get_l4_hdr_offset(pkt); + } + + pdma_st->ps_desc_data.sph =3D true; + pdma_st->ps_desc_data.hdr_len =3D pdma_st->ps_hdr_len; + + if (pdma_st->ps_hdr_len > bheader_size) { + pdma_st->ps_desc_data.hbo =3D true; + goto header_not_handled; + } + + return true; + +header_not_handled: + if (split_always) { + pdma_st->ps_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 @@ -1600,9 +1854,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); @@ -1618,9 +1870,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)); } @@ -1634,7 +1884,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; @@ -1648,6 +1898,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 @@ -1678,8 +1936,10 @@ 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); + do { - pdma_st.written =3D 0; + memset(&pdma_st.bastate, 0, sizeof(IGBBAState)); bool is_last =3D false; =20 if (igb_ring_empty(core, rxi)) { @@ -1690,7 +1950,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, pci_dma_read(d, base, &desc, rx_desc_len); trace_e1000e_rx_descr(rxi->idx, base, rx_desc_len); =20 - igb_read_rx_descr(core, &desc, &pdma_st.ba); + igb_read_rx_descr(core, &desc, &pdma_st, rxi); =20 igb_write_to_rx_buffers(core, pkt, d, &pdma_st); pdma_st.desc_offset +=3D pdma_st.desc_size; @@ -1698,8 +1958,12 @@ 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, + &pdma_st, + rxi); igb_pci_dma_write_rx_desc(core, 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); 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 159df09014..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) "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 11 17:17:00 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=1685369004; cv=none; d=zohomail.com; s=zohoarc; b=kYwYheTIr136wDbKtZMQ70sgyaloATRyPTBh6pdqsOhDDLg/fA3B9OkwFP2q9f/P15gQRO74uBHbNN+xDB/07/86e/ZFnPSSgZQRqJWrjRSpvG1v/+tjeVWH1l0EKkx1Nh2AMHUE+ydNKjk+cSrGy9a87G8dodh57e9PrDjCJSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685369004; 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=GpKLeGxhJ948k3AAv+MCQ78nH8+ei8bGGBtWQlF9R0A=; b=Qha/OJT0MiBNoTcOZOMP3QdENtesZPYjQ3nlBS7IbzgLNH/XPe83/EamyRW23OslcMPxTfqKxDmbHl+UookmglGlthzDF3yvIBicRQcLWKKT9be2Zv0iClPrpiPW9xZNZnGgGo0VT949W7i+BAr6t8NSK02mNg+SYBOFWwnk16g= 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 168536900491512.33930584339123; Mon, 29 May 2023 07:03:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3dS6-0002sf-QV; Mon, 29 May 2023 10:02: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 1q3dRt-0002nw-H9 for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:13 -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 1q3dRr-0006pK-PF for qemu-devel@nongnu.org; Mon, 29 May 2023 10:02:13 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230529140207euoutp0152eb2689a4adba32badbc82545c1e3f4~johwSvdS-1419514195euoutp015 for ; Mon, 29 May 2023 14:02:07 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230529140206eucas1p25ff5327773a648f415ed4f895e662183~johwA8soG0412804128eucas1p2_; Mon, 29 May 2023 14:02:06 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 70.9B.11320.E50B4746; Mon, 29 May 2023 15:02:06 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230529140206eucas1p2d93f9498af491b27b4ed36d83f8b9c72~johvXsCmN2932729327eucas1p2k; Mon, 29 May 2023 14:02:06 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230529140206eusmtrp28188e583aab038513d55766d3eaa622c~johvXLaAi1116611166eusmtrp2n; Mon, 29 May 2023 14:02:06 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 7A.38.14344.D50B4746; Mon, 29 May 2023 15:02:05 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230529140205eusmtip224d89463dce5a091b9c9aab565e76412~johu0OwNW0256502565eusmtip2h; Mon, 29 May 2023 14:02:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230529140207euoutp0152eb2689a4adba32badbc82545c1e3f4~johwSvdS-1419514195euoutp015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685368927; bh=GpKLeGxhJ948k3AAv+MCQ78nH8+ei8bGGBtWQlF9R0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J8vXOo1k89XkK/e/ULddXsCTzqMwe+M1GzPuTlfufYmDdI21Bcji8UENrYs0+ExZI DW5N/ulbYJ26hU/xRmb2CMXwcqGBJk3TFyOI9LoL5SB/bhIqBXwKyCckn7m4DhUdPU 6VXCX2PaQM06MXlT3bRC/jKYBtcLjyFYpCzdQIio= X-AuditID: cbfec7f4-993ff70000022c38-87-6474b05ef3fb 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 v10 7/7] e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_rx_buffers Date: Mon, 29 May 2023 16:01:53 +0200 Message-Id: <20230529140153.4053-8-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529140153.4053-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduznOd24DSUpBp+Oq1p8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujKlPr7MW7JKpWL7rIlsD4zf+LkZODgkBE4k/M9YzdjFycQgJrGCUeHrm LTOE84VR4uiC6VCZz4wSjddXMsO0vJ36mxHEFhJYzigxv8UAoqidSeLFzG9MIAk2ATOJR1/m sXYxcnCICBhLfGwXBwkzC6RKHP1zkAXEFhaIkbg6+wo7iM0ioCpxacF/sFZeASeJRfsnMEHs kpeYeek7O8gYTgFnic7THBAlghInZz5hgRgpL9G8dTbY0RICOzgkTs25DNXrIrFi8yUoW1ji 1fEt7BC2jMT/nfOh4uUSP89uY4dobmGU2DN1MlSRtcSlrT/B7mcW0JRYv0sfIuwosXriJmaQ sIQAn8SNt4IQN/BJTNo2HSrMK9HRJgRRrSPxbdNMNoiwlMTCG3UQYQ+J1Sv+sE5gVJyF5JlZ SJ6ZhbB2ASPzKkbx1NLi3PTUYqO81HK94sTc4tK8dL3k/NxNjMDkcvrf8S87GJe/+qh3iJGJ g/EQowQHs5IIr21icYoQb0piZVVqUX58UWlOavEhRmkOFiVxXm3bk8lCAumJJanZqakFqUUw WSYOTqkGJo3CyMiZGlzLDc2/pmU5/1bdqLGcaeIZgYVVrL21Ve90xdhWT++tvPcjbYVn8I1r P7eWV+w/e/PZo6PLJ12sPMTzyEq0vMe21HuiwB7HzRf09H6KGV9ISDjS7XxSaHsz0xcPfa8d 38J5mctrAiZrlfX8fLRcyP3Df9FOpQvKwWH5WnOYQ/KXyAs82Jvtep7D/n3Bx7UGnffXhMcc mBr3/xvHnDwzt095S6Jijh/wbaiu2Xj0540A5XeHjzBcPn925vb0DQt5fn63LnPd3OHD9jDW dP0VUX+umGt9Rc8ymZr3dZh6Pt4ycX3S567DVY4mvLozRWW7HIUytL4+rX622y8jbrempGRG XJXsHiZ7JZbijERDLeai4kQAdPe7iZ0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7qxG0pSDBYuNbP4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GVOfXmct 2CVTsXzXRbYGxm/8XYycHBICJhJvp/5m7GLk4hASWMoo8WHVRCaIhJTEvp7/7BC2sMSfa11s EEWtTBJnb19mBkmwCZhJPPoyj7WLkYNDRMBU4tleSZAws0CmxOlX+9hAbGGBKImNB1aAlbMI qEpcWvAfbD6vgJPEov0ToHbJS8y89J0dZAyngLNE52kOkLAQUEnnvZusEOWCEidnPmGBGC8v 0bx1NvMERoFZSFKzkKQWMDKtYhRJLS3OTc8tNtIrTswtLs1L10vOz93ECIyEbcd+btnBuPLV R71DjEwcjIcYJTiYlUR4bROLU4R4UxIrq1KL8uOLSnNSiw8xmgKdPZFZSjQ5HxiLeSXxhmYG poYmZpYGppZmxkrivJ4FHYlCAumJJanZqakFqUUwfUwcnFINTOUfblx2Otbgw3Tx0XH2e/kc Z3c9Plfw6vQpt0/a2WvPqXJc0o1a8y9yXdWhsGNXQ4tVJ9ds/uiu0savFLlR7EHc3UvXn/qz rlF/zu2/NW3C23+v/p/Y/lvolQ2/7zqjBZvmrmw09C8PYkkwE53Zz1N/xW9ZznM532cljKsv nlTeMulovsQkz2XmZ+4GXP1sdH36lk+PWN6LLPMt7dzTdepIxsNF+cemneO7a9VXNGPXwYap 6y/J7WbP2R21oO3Xgpayy5fTPHYaWUh88X4xs88xLdxm3ibpv3mty+Wtq4ILGtkjr+1dK7zC nGOxFnNE0qH1i2snsDRPnWhotcvc136O+aNZ19f9imvqnrsm8peiEktxRqKhFnNRcSIAkgfg 1Q0DAAA= X-CMS-MailID: 20230529140206eucas1p2d93f9498af491b27b4ed36d83f8b9c72 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230529140206eucas1p2d93f9498af491b27b4ed36d83f8b9c72 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230529140206eucas1p2d93f9498af491b27b4ed36d83f8b9c72 References: <20230529140153.4053-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: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.16, 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: 1685369006698100001 Rename e1000e_ba_state according and e1000e_write_hdr_to_rx_buffers for consistency with IGB. Signed-off-by: Tomasz Dzieciol Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki --- 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 f29e5e2897..bbeafd6fd7 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