From nobody Fri Apr 26 08:57:04 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=1685029105; cv=none; d=zohomail.com; s=zohoarc; b=K3s7eSDOMx5JA72vGRvnMweBctwflRky8VYsqEnuVRGaXENAB+BD08OATVywLzGJsxV6uG0TgcM/Uatvcu0dScj/ORze9nwDZuC1bS9uUyKQhsi4f/fcr7HUMZy2qzYpIDaxssxw03Eh9wTuck2SJjY/D4gjiV3w1/bymoS+qHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685029105; 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=KQ7TNvg+EBorBIDCo+Wlostm5KtD4wzu764nGIiEtQqX3y5JScZsNuXJNvPvs3/WpTQLSnwh5YHH/QeSj8Pa+oJRblrzM7gsugcxDBRt+wSrKOi3PxjY3NK/L8e2OstOSo0LdHgPnm2ECIAEBAo3wMO9iyt8cLRhfi5grsljAuc= 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 1685029105482285.68517160649526; Thu, 25 May 2023 08:38:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2D2J-0003KZ-2H; Thu, 25 May 2023 11:37:55 -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 1q2D2H-0003ID-2T for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:53 -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 1q2D2E-0000mU-Mg for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:52 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230525153744euoutp021e1e717acd1f38bbc47be37ec8bf8a81~ibQGQa-7P0292202922euoutp02T for ; Thu, 25 May 2023 15:37:44 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230525153743eucas1p24e3b65884024e5cd660bd2d9a5be98d5~ibQGHI5EC2758927589eucas1p2e; Thu, 25 May 2023 15:37:43 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id FC.28.11320.7C08F646; Thu, 25 May 2023 16:37:43 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230525153743eucas1p2cfe25bb5c0bfc59064189d58b328a537~ibQF0ASXR2954329543eucas1p2Q; Thu, 25 May 2023 15:37:43 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230525153743eusmtrp26c9250e2a7cc97f13ac2e6732a89b71f~ibQFzXLX90985909859eusmtrp22; Thu, 25 May 2023 15:37:43 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 48.A7.14344.7C08F646; Thu, 25 May 2023 16:37:43 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230525153742eusmtip2f38d56f4724934f3c35b9573700e773e~ibQFNmCrd2411924119eusmtip2E; Thu, 25 May 2023 15:37:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230525153744euoutp021e1e717acd1f38bbc47be37ec8bf8a81~ibQGQa-7P0292202922euoutp02T DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685029064; bh=lunVsi6HsaJ1+/9Yrq8KWQx64hHneMocNeqfFm1EqMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mOjCqeyLnUigZvEeRrEL6dueDCvYjEyJaWaKTKZLM4pCBn2bm2i9q58E6kmhDi46v GcMKQyC6OcJYQaKlt0XKklzklI9tduckqJR9C6pakVOIa0nWS7QOmkFXfTD3xA8FZ2 dFmA0ze6NVTka8CM5cfv2KLcDtL77Of0PLMAPf2I= X-AuditID: cbfec7f4-97dff70000022c38-d4-646f80c74da7 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 v9 1/7] igb: remove TCP ACK detection Date: Thu, 25 May 2023 17:37:27 +0200 Message-Id: <20230525153733.4104-2-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduzned3jDfkpBvs+Glh8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujL5dC1kKbrNW9Oy+wNbAuIeli5GTQ0LAROJuw03WLkYuDiGBFYwSZ548 YoZwvjBK/Pj+lAnC+cwocWd7O1AZB1jLktW6EPHljBLrriyD6mhnkuj/vIkNZC6bgJnEoy/z wBpEBIwlPraLg4SZBVIljv45CLZaWMBUovvXZDCbRUBV4vO//2A2r4CTxLl/h5ghzpOXmHnp OzvIGE4BZ4mVXyshSgQlTs58wgIxUl6ieetssBMkBLZwSNx70sgI0esisfDQT3YIW1ji1fEt ULaMxP+d85kg7HKJn2e3sUM0tzBK7Jk6GarIWuLS1p9g9zMLaEqs36UPEXaUeLV0ARMkHPgk brwVhLiBT2LStunMEGFeiY42IYhqHYlvm2ayQYSlJBbeqIMIe0gsuH2HfQKj4iwkz8xC8sws hLULGJlXMYqnlhbnpqcWG+WllusVJ+YWl+al6yXn525iBCaX0/+Of9nBuPzVR71DjEwcjIcY JTiYlUR4N+TkpwjxpiRWVqUW5ccXleakFh9ilOZgURLn1bY9mSwkkJ5YkpqdmlqQWgSTZeLg lGpgKpb4IifC+aRHTbTPPOUVb9+FyaeP24to3p+yO0Zj6qx3OctupOdMWZdXvW/Kpb0Ch2We mrvXOX4OVYl44PV+l5OboGjYgqY5Kyq/7GtbcsD1zWyHB12TZoic6nKaOms5t7Lp+T/XX0if m3xsd+SuT51cz5TMoz8/u/SlXeP4Y7snNuXF3ZPf62cqVmi7Xy9afKiX+9j/neJq09ecnHpx w6q6NZvZvrJs6/wu3SvAbci9sCahwyTsLm9z5WMrL3m2rJTy7PPLktmyGVeV+5/b6PK49z/n kz2PRDQ6IhWs7yZbAVPFvPt6e+RDdjq72r5LuPIqi+3Wiulqe1c9XGm6tOhTwYxpnNcZec2n KvStUmIpzkg01GIuKk4EADQ1+8CdAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xe7rHG/JTDJ6ulLH4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GX27FrIU 3Gat6Nl9ga2BcQ9LFyMHh4SAicSS1bpdjFwcQgJLGSWmd8xj72LkBIpLSezr+Q9lC0v8udbF BlHUyiSx6udrsASbgJnEoy/zWEEGiQiYSjzbKwkSZhbIlDj9ah8biC0MFO7+NZkFxGYRUJX4 /O8/mM0r4CRx7t8hZoj58hIzL31nBxnDKeAssfJrJUhYCKhk+4dprBDlghInZz5hgRgvL9G8 dTbzBEaBWUhSs5CkFjAyrWIUSS0tzk3PLTbSK07MLS7NS9dLzs/dxAiMg23Hfm7Zwbjy1Ue9 Q4xMHIyHGCU4mJVEeDfk5KcI8aYkVlalFuXHF5XmpBYfYjQFOnsis5Rocj4wEvNK4g3NDEwN TcwsDUwtzYyVxHk9CzoShQTSE0tSs1NTC1KLYPqYODilGpjCV829yD9TRSvpQ3n+hi1eacFu JhpT9R6/iFBO3ybBG+brFqaiUXFX0zql5fqq6xwv9OVcyxKYru2+5MGkfEdK4P48v9DMPb6X r5r67extf/tB4/bZNxOjTrA/Ps8a6J447+irkFdVQf+P3bj4oHd+1qekQ84nWhUqeGx+ensf 7DpRaVDZn5PyJO7C0zWiNxn3m5RaXtFsL3stqr/QKGpBWrryx6vCr0/WB4s8tBKwP/zls/9P OeefGtwBb0sY76VI7nXQFTgddFLn6hfNg06C6hNVp3jfWtC551jCuox5iWF33zYs8O64nhWo u4dNoXfh8buxnVMu38jN9Kv83j5ZstxNZ/l/9vsyJ5+6blNiKc5INNRiLipOBABMcNYJDAMA AA== X-CMS-MailID: 20230525153743eucas1p2cfe25bb5c0bfc59064189d58b328a537 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230525153743eucas1p2cfe25bb5c0bfc59064189d58b328a537 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230525153743eucas1p2cfe25bb5c0bfc59064189d58b328a537 References: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @samsung.com) X-ZM-MESSAGEID: 1685029107581100007 TCP ACK detection is no longer present in igb. Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 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 Fri Apr 26 08:57:04 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=1685029141; cv=none; d=zohomail.com; s=zohoarc; b=jGGtT5fGAsEul712tIj9YsWukspmarlqEZ2dSnvHCcpb3fmQCoZ0wzxgbhG0UsYjV9J3y42MCyLaRYUPbXoeFN8wtD+9eYz1ZcVEYvtDonfqlLsbtxVU2c8PyXfoZtHCo00ott/yywE3LV2FKgY/l9nSM/aeCE7HkjX96A5YtyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685029141; 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=BH/52OUcUdKVn6gyYhvHLko6HUSjaEIzxHP6eYfuhMNX6K0q+SJNWCbMs1G8X6SXcYLl5hySacollXR8/Z/OdXEYK4toYLYdDkYEI0wja14X6ae5zVrDtA/gN5sJqT0EzMr3lDARseE4OfG2e+zZkQ3zLbQN8WTMWsJOU4qnmbU= 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 1685029141290521.7139321096397; Thu, 25 May 2023 08:39:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2D2J-0003Lg-Ly; Thu, 25 May 2023 11:37:55 -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 1q2D2H-0003Jm-Oh for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:53 -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 1q2D2E-0000nf-Ks for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:53 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230525153744euoutp0234773a7a2e76fe33376915cd15c06ac3~ibQG5s_qW0293202932euoutp02O for ; Thu, 25 May 2023 15:37:44 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230525153744eucas1p22f8fa41e9c1857eb2842f76568697b42~ibQGw3WBO2758927589eucas1p2g; Thu, 25 May 2023 15:37:44 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id E3.52.37758.8C08F646; Thu, 25 May 2023 16:37:44 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230525153744eucas1p208318603e67e11c9ab3f0a6556b8d3a4~ibQGQXGp02755027550eucas1p2Z; Thu, 25 May 2023 15:37:44 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230525153744eusmtrp2c365b0b1af660b917ca68ed8949618d7~ibQGP2Sy30985909859eusmtrp24; Thu, 25 May 2023 15:37:44 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 69.A7.14344.7C08F646; Thu, 25 May 2023 16:37:43 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230525153743eusmtip2007f52f1e8124c6c38d364b65828f80a~ibQFuzEEM2502125021eusmtip2r; Thu, 25 May 2023 15:37:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230525153744euoutp0234773a7a2e76fe33376915cd15c06ac3~ibQG5s_qW0293202932euoutp02O DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685029064; bh=zA/8FB39zbVbvqXYpTGtVq1emGaCToIPGE2RXa9MnJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aV1qVkelMb3fLlsJ1Ib2HJ6A2uCQKuQDOo+Iql00KLjegUEioV6bkgTS7j3M9OUpo 2AlE4kmR6/OcUZ6PIU5m/C6pIPT6KXwB4HTrZ/2/mwnToDj4Tev4eDxfjkHA8UkgVU DLrfz/FXPXrKxuM9DEzux40lVbUxPstWZ1jZTKVI= X-AuditID: cbfec7f5-7ffff7000002937e-56-646f80c8badf 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 v9 2/7] igb: rename E1000E_RingInfo_st Date: Thu, 25 May 2023 17:37:28 +0200 Message-Id: <20230525153733.4104-3-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42LZduzned0TDfkpBjs/yVl8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujO77V5kLpsVVvDwyn62B8adXFyMnh4SAicTZ+XsZuxi5OIQEVjBKXPr4 nB3C+cIo8e3lbTYI5zOjxMQ7s1hhWubObYRqWc4o8WhiOxOE084kMff/b7AqNgEziUdf5gHZ HBwiAsYSH9vFQcLMAqkSR/8cZAGxhYFKPk88xwZiswioSqy9fgCslVfASaJp5gt2iGXyEjMv fWcHGcMp4Cyx8mslRImgxMmZT1ggRspLNG+dzQxygoTAWg6JSa1NTBC9LhLzPrUwQ9jCEq+O b4GaKSPxf+d8qJpyiZ9nt7FDNLcwSuyZOhmqyFri0tafYPczC2hKrN+lDxF2lGib+pcJJCwh wCdx460gxA18EpO2TWeGCPNKdLQJQVTrSHzbNJMNIiwlsfBGHUTYQ2LzteUsExgVZyF5ZhaS Z2YhrF3AyLyKUTy1tDg3PbXYOC+1XK84Mbe4NC9dLzk/dxMjML2c/nf86w7GFa8+6h1iZOJg PMQowcGsJMK7ISc/RYg3JbGyKrUoP76oNCe1+BCjNAeLkjivtu3JZCGB9MSS1OzU1ILUIpgs EwenVAOTSESt9gbOp1N4rmj/e+xX+Pr21lAuoUuaSd2zKyK3yOabbp6R/PGCs8m9xlsGkzcz u32Ot5pyscnSZW+169/y10lzyp57GJxalrBr6Ydmj8iXB4w55z7dpWkx5ci8/QeP7L6zryOi JEDp3fHbpz8prnS+M8d6tpHzs0v8yoe6tc6sUFoRnGlwz7p0+YUvLTeCuTMYN5ytmVzAve6I 4/W3rzS+FEpslPDyk2CR7//SGB6ZyHcokmPvu309C/avNdTmjm/bE6ayNCd/LTdb6PcrCfP3 vXXn5JxxyCcle9Z587DOCQL75nrOuVtlUDzNN3//vDu+Uvun+ZkdvmZx922mcYiVbLGF9AWx Y1Vz0jdIKbEUZyQaajEXFScCADoDt3CeAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7rHG/JTDC7NsLH4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6Gd33rzIX TIureHlkPlsD40+vLkZODgkBE4m5cxsZuxi5OIQEljJK7FvawAyRkJLY1/OfHcIWlvhzrYsN oqiVSWLO2QmsIAk2ATOJR1/mAdkcHCICphLP9kqChJkFMiVOv9rHBmILA5V8nngOzGYRUJVY e/0AWCuvgJNE08wXUPPlJWZe+s4OMoZTwFli5ddKkLAQUMn2D9OgygUlTs58wgIxXl6ieets 5gmMArOQpGYhSS1gZFrFKJJaWpybnltspFecmFtcmpeul5yfu4kRGAnbjv3csoNx5auPeocY mTgYDzFKcDArifBuyMlPEeJNSaysSi3Kjy8qzUktPsRoCnT2RGYp0eR8YCzmlcQbmhmYGpqY WRqYWpoZK4nzehZ0JAoJpCeWpGanphakFsH0MXFwSjUw2Uf+3HJ7SVLM180b3s3/Kves8seD BforzmdEM1ssOtm4j1XXedNvdvfomxKSOnMaVu+dkbetREFkxQa/h782le1JeXefyf2L9OXK eyzlVScd+rOdX6nfMp6izGr+soyH9WPZk8O2AocS1N9XGM/OSjIrcc3dqn5KTeqG+q6PNfo+ /zqS33pwd1af4me4Pztxi6G6iVr+WvHac5feTXd/3BrH3bFoQ92d2Jzf7yU6ZR5tCNzn5vR3 6d8S9tap0ypuLjacZWh+49BxiRBRo9wS13dn95zeet80YlqwSl2yrfmjrzeOGB7X//4uPMW7 u0Hnxq2d5eK2LjZTDDtTHl4X3Zh4Kz5xbpnGB3fxjaqHlViKMxINtZiLihMBUxDtBA0DAAA= X-CMS-MailID: 20230525153744eucas1p208318603e67e11c9ab3f0a6556b8d3a4 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230525153744eucas1p208318603e67e11c9ab3f0a6556b8d3a4 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230525153744eucas1p208318603e67e11c9ab3f0a6556b8d3a4 References: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @samsung.com) X-ZM-MESSAGEID: 1685029142598100001 Rename E1000E_RingInfo_st and E1000E_RingInfo according to qemu typdefs gui= de. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 34 +++++++++++++++++----------------- hw/net/igb_core.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 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 Fri Apr 26 08:57:04 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=1685029184; cv=none; d=zohomail.com; s=zohoarc; b=jn82cL/iRRr6ht2/81bhqz7OQgmbasWbjiav690kldJh8GFlscFwJnkMRuKvJJKO320jJdxVxTi33E69hlYk/IsE6iE3fkeMsZP5aQ3rvsUv1JSuerY/WvSBeJmg6RpeVVfs0G3uMbhxMdEznhKwIshCqw3yW2fwDBy18CmtlE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685029184; 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=Mnp4On9nmqj3OmWw7fkO4TCO57nGtcj/zQcfclI4PAe5AzMV4p1UlpIrLxHNbHDOG+Ctp5SYsyKlIBc+5iZRxOx+LndmrM2Sz5RCiUbGFWEN7d5GYVJxRqrNmAmyKKCeRDW+vCBD2CrNDk1Oc5WS0pHnexXNjd3hEFTv05ZjU8E= 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 1685029184231886.3049370564075; Thu, 25 May 2023 08:39:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2D2K-0003Ln-6a; Thu, 25 May 2023 11:37:56 -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 1q2D2H-0003Jp-TM for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:53 -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 1q2D2E-0000ny-Mq for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:53 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230525153745euoutp0239d104c740741d25907a1baea2fb6f5d~ibQHZmL5M0292402924euoutp02Z for ; Thu, 25 May 2023 15:37:45 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230525153744eucas1p2990b72353361ecba748066367f147b38~ibQG-af6r2758927589eucas1p2k; Thu, 25 May 2023 15:37:44 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 94.52.37758.8C08F646; Thu, 25 May 2023 16:37:44 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230525153744eucas1p1844ba0a10563caff4bb0f92c82f30f7d~ibQGwAQMN0128401284eucas1p12; Thu, 25 May 2023 15:37:44 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230525153744eusmtrp101bdbf492039ca411ad1910a8bd7fd3f~ibQGvdeVK0103701037eusmtrp1E; Thu, 25 May 2023 15:37:44 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id D9.C4.10549.8C08F646; Thu, 25 May 2023 16:37:44 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230525153744eusmtip286fc9ba5aa70a961f62a3f8e9a73aa10~ibQGNwG9C1970019700eusmtip2U; Thu, 25 May 2023 15:37:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230525153745euoutp0239d104c740741d25907a1baea2fb6f5d~ibQHZmL5M0292402924euoutp02Z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685029065; bh=HnUWazik/RcbkpE38Ii94NHLcI0ykUtfyb/ADn8jrlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LErrvDXkzR4bWjSE42Z1IBgjAW3NmxOsPcUCws4BlRAv08ybAd/Drj0A33MQp0auP rwKQxLD6xMyXxXRTKo3MgNOtGajKgu1+OHQufMKDifqOeBcCj9O6Kflnl1fyFaqmf2 7B/5a49Od1iy2EPGtF8dFZ7Auu5hjPcjeQIeYxrk= X-AuditID: cbfec7f5-815ff7000002937e-59-646f80c8bfa7 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 v9 3/7] igb: RX descriptors guest writting refactoring Date: Thu, 25 May 2023 17:37:29 +0200 Message-Id: <20230525153733.4104-4-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42LZduzned0TDfkpBievGVh8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1igu m5TUnMyy1CJ9uwSujB8rF7AWbPevuPfpKGMDY7d5FyMnh4SAicSaOyuYuxi5OIQEVjBK9K5+ DuV8YZToOdzDBOF8ZpR48+80K0zL/bUTWCESyxkl9pzcwALhtDNJ3Nl5EayKTcBM4tGXeUA2 B4eIgLHEx3ZxkDCzQKrE0T8HWUBsYQE3iXmbF4LZLAKqEo1PTzOD2LwCThKzFnYzQiyTl5h5 6Ts7yBhOAWeJlV8rIUoEJU7OfMICMVJeonnrbLCrJQS2cEisv/2TGaLXRaJj234WCFtY4tXx LewQtozE6ck9UPFyiZ9nt7FDNLcAPTN1MlSRtcSlrT/B7mcW0JRYv0sfIuwo8f55CzNIWEKA T+LGW0GIG/gkJm2bDhXmlehoE4Ko1pH4tmkmG0RYSmLhjTqIsIfE7+0PGCcwKs5C8swsJM/M Qli7gJF5FaN4amlxbnpqsXFearlecWJucWleul5yfu4mRmB6Of3v+NcdjCtefdQ7xMjEwXiI UYKDWUmEd0NOfooQb0piZVVqUX58UWlOavEhRmkOFiVxXm3bk8lCAumJJanZqakFqUUwWSYO TqkGpjx27ZdxVrLLRVdq+sqq35jxTcb9sXdy/cK5Xw5Pz9vytez85oln5kxYNvm4/tPTvMud H2k+2pF2cn+dBMfsh1492mw86qoqvvukXLk1Ip3/RmlHVLH9ndxmxPBQQKLVdGXx60PJ7c3i 0/+vne5Ux9t9nufq3FVbD3dKrD6Rk776mvqBN9YeNe7XZl6xlDm84vJc9RJh38ezfBbMT2l4 cZXn5xVfsyyZEr3d7veWGt+e0RH067VxhdgJ2cMm0wxSp2748/Zn3rqlwTYmS6fZBb3u2xP4 oITv/jQuYTF2Hd2QOXmKPT0Gzdk+/K3/Nfzc/j+Y9upCyU/nqawbsqL97v63t7q7/2m2Q5X4 tDiHlUosxRmJhlrMRcWJAAXmMeaeAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xe7onGvJTDGbOkLP4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GT9WLmAt 2O5fce/TUcYGxm7zLkZODgkBE4n7ayewgthCAksZJZ6cKoeIS0ns6/nPDmELS/y51sXWxcgF VNPKJPFuYytYA5uAmcSjL/OAbA4OEQFTiWd7JUHCzAKZEqdf7WMDsYUF3CTmbV7IAmKzCKhK ND49zQxi8wo4Scxa2M0IMV9eYual7+wgYzgFnCVWfq2EOMdJYvuHaawQ5YISJ2c+YYEYLy/R vHU28wRGgVlIUrOQpBYwMq1iFEktLc5Nzy021CtOzC0uzUvXS87P3cQIjINtx35u3sE479VH vUOMTByMhxglOJiVRHg35OSnCPGmJFZWpRblxxeV5qQWH2I0BTp7IrOUaHI+MBLzSuINzQxM DU3MLA1MLc2MlcR5PQs6EoUE0hNLUrNTUwtSi2D6mDg4pRqY1h1qD3OQfOQrONftenVWxcac C7dl8qvr7PZd/cj0a15s6Ptri7T/pMvd39m7qrOPj83ynj7ninUPbv+dYdPtGTGNRS/Vr39V nurx6nlsmtzv+g4mBSuLKtRkT9xnJP+uNmm/1knma7rFz2p6k9If6czmPbuS5esb10j/C3uC Y6KVI1SqLecebA5kz5tU57CLc5tR2pRzG6V2n3u2+mn1+h1191LE5yos2/I01mGZ5Y/8nMT3 580+Rd3j54rOs9HauoPptqIUNysDw8eb+SIbv/mHJfiVb9tok3zmkDenRPmW9e0TD03WFZto HWcauTpk2cz1DwRnxeX8rZCtOys/We9+3PdTLevNP58q5BFRYinOSDTUYi4qTgQAXDnGFwwD AAA= X-CMS-MailID: 20230525153744eucas1p1844ba0a10563caff4bb0f92c82f30f7d X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230525153744eucas1p1844ba0a10563caff4bb0f92c82f30f7d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230525153744eucas1p1844ba0a10563caff4bb0f92c82f30f7d References: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @samsung.com) X-ZM-MESSAGEID: 1685029184516100001 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 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 Fri Apr 26 08:57:04 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=1685029173; cv=none; d=zohomail.com; s=zohoarc; b=B04Q+USMCny++WdejchmQ2fjrYNZbRw5WFpVy8ahD0AQYYfVdMcVykjPowQDWGWY42rnjRllZZUl0ZdNSppn74s4/t88qac43rcclsyAT4EJlDVeECylvk4/zfmv2Ae03rTDq586Sma/gAkqrqshjgtcNUhPgSNEb+fqwDHj/78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685029173; 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=6+yeCNnYMU7Bn+UWrdDvD034/jL7YTPt+NNRRS/nSME=; b=Zg32Yn1YXRbswjKPYgk92QlcJONI50BGcYGO4FzRAobZPpnRYvD8v8ZrHWY+lLk9a9TcM4FyVBqh4qu30B1NJHQ5oXo6UbWpzvSZ9PYJReZx6SaYZ6/rvVt3ldYuzfjG/R+n+cGXSOymRZJGWw2h7opGLrY3w0gA5V/tCS7Yff4= 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 1685029173862783.6766003141072; Thu, 25 May 2023 08:39:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2D2I-0003Jy-10; Thu, 25 May 2023 11:37:54 -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 1q2D2G-0003Hu-9r for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:52 -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 1q2D2D-0000o2-6A for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:52 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230525153745euoutp017163aa13a15646b3e181ae3d8c1b9fbc~ibQHw6t1v0295002950euoutp01P for ; Thu, 25 May 2023 15:37:45 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230525153745eucas1p29b1bbe18c1e4617355a2b486112fe60e~ibQHicujl0108501085eucas1p2B; Thu, 25 May 2023 15:37:45 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id ED.28.11320.9C08F646; Thu, 25 May 2023 16:37:45 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230525153745eucas1p1cd6d947ed0cd46a8fdf637b514c237ff~ibQHMlqJn0128401284eucas1p13; Thu, 25 May 2023 15:37:45 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230525153745eusmtrp2b96a068ccd0285686e1b94b19ab87f78~ibQHL-YFw0985909859eusmtrp29; Thu, 25 May 2023 15:37:45 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 5B.A7.14344.8C08F646; Thu, 25 May 2023 16:37:44 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230525153744eusmtip277d75860e9b8db66ea893769550678a9~ibQGr18Az1886218862eusmtip23; Thu, 25 May 2023 15:37:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230525153745euoutp017163aa13a15646b3e181ae3d8c1b9fbc~ibQHw6t1v0295002950euoutp01P DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685029065; bh=6+yeCNnYMU7Bn+UWrdDvD034/jL7YTPt+NNRRS/nSME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D8z2Jielw9hDZMDNWx61vdRWOJtyGkFKz55X9V9uQiNL+G/kfLuSUaU4Rje7qDvDS +Pqf3f4UjEPYcRhmVEUpidzQd7fh0UOZKdlV8hX+gekmDrQ8hReMttve3PhvPmMgXG i8g+yBfKi8B6ztZKDtWQKY88Le+SN6qFDdGrtDCc= X-AuditID: cbfec7f4-97dff70000022c38-da-646f80c95c9c 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 v9 4/7] igb: RX payload guest writting refactoring Date: Thu, 25 May 2023 17:37:30 +0200 Message-Id: <20230525153733.4104-5-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42LZduzned2TDfkpBp3TRC0+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXxqnmDSwFc9IrprS0MzUwrnLqYuTkkBAwkXi3YidLFyMXh5DACkaJv4fu M0E4XxglHq6bzwrhfGaUuHbyEBNMy/Xfq6ASyxklHr2ezA7htDNJfP/5D6yKTcBM4tGXeUBV HBwiAsYSH9vFQcLMAqkSR/8cZAGxhQWcJP7f7gezWQRUJXb+aWMEsXmB4ls+t7BDLJOXmHnp OzvIGE4BZ4mVXyshSgQlTs58wgIxUl6ieetsZpATJATWckhseXuaBaLXRWLe7TtQRwtLvDq+ BWqmjMT/nfOh4uUSP89uY4dobmGU2DN1MlSRtcSlrT/B7mcW0JRYv0sfIuwo8a1nDyNIWEKA T+LGW0GIG/gkJm2bzgwR5pXoaBOCqNaR+LZpJhtEWEpi4Y06iLCHxO1zf9knMCrOQvLMLCTP zEJYu4CReRWjeGppcW56arFRXmq5XnFibnFpXrpecn7uJkZgejn97/iXHYzLX33UO8TIxMF4 iFGCg1lJhHdDTn6KEG9KYmVValF+fFFpTmrxIUZpDhYlcV5t25PJQgLpiSWp2ampBalFMFkm Dk6pBiYW7up2u5fak5PSz16/cH3ONi5G34oJdu/LlOVUPlwNmlHkmWyUbD03hH2KmQ7T1YgP un+DltRJ/p8fvGTD7IBJDx22Jy9KkS34u9Se0+//vksSTHfi2QsObLYN3uyqpb482UByUam+ TLfGPu4wlRsmvZMef3/kmJl5a0mwW036iXMq+U0vI6+UT1Hhbljef3cei+b9b1Nv+/xau37a saCieIWKEm+r909if7yRjXgszcJ8WHLKvKv7Xm6OuOL0eNsXk4TH0yxFQp0ZfOUFDrjLPa6b vKZsSk77Wbtq4Yt3T15+emGrd2JQ8vkEOZ5/77mFFh1vYJymun6mlugVge9S1Ycaf9btDtLo 3735oZESS3FGoqEWc1FxIgB03g2/ngMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xe7onG/JTDObrWHw+tZbdYtmlz0wW jfPnsFpsvfqD3eJ47w4Wi95NL5gc2DxOvD3I6nHh0TlmjyfXNjN5vN93lc2jb8sqxgDWKD2b ovzSklSFjPziElulaEMLIz1DSws9IxNLPUNj81grI1MlfTublNSczLLUIn27BL2MU80bWArm pFdMaWlnamBc5dTFyMkhIWAicf33KtYuRi4OIYGljBIHr+xggUhISezr+c8OYQtL/LnWxQZR 1Mok8fXVdFaQBJuAmcSjL/OAbA4OEQFTiWd7JUHCzAKZEqdf7WMDsYUFnCT+3+4Hm8kioCqx 808bI4jNCxTf8rkFar68xMxL39lBxnAKOEus/FoJEhYCKtn+YRorRLmgxMmZT1ggxstLNG+d zTyBUWAWktQsJKkFjEyrGEVSS4tz03OLjfSKE3OLS/PS9ZLzczcxAuNg27GfW3Ywrnz1Ue8Q IxMH4yFGCQ5mJRHeDTn5KUK8KYmVValF+fFFpTmpxYcYTYHOnsgsJZqcD4zEvJJ4QzMDU0MT M0sDU0szYyVxXs+CjkQhgfTEktTs1NSC1CKYPiYOTqkGpjk7DtgHHr/XOePD9zRPadc98uv1 LL9o2WRruZbdObD/wN2IyWuLJKt5Ij3DFJIim6Yabby8fI2l0vwPJZ8EVVP4tj5imvtAf3cs p4NjO+/hlG8H2fLVJylodtgufXPjVMbkHWsffVvIJRxvPWVmbWy3sv/OqS+5Nk15Y5xXyrTD Q7vya7r1G0d7wQ8yt7MMNGU4JP9NWys7e0K4WeTlm6vPMczoqVtxQOWr2LRkDgV/FzPxI59r FPZ/XTQx1DLBlOe0/ZQ4jlM9nBvmzCyuWT91nafclZm3U4T9Baevz79u/Tzj8h+ZFZ72EmWB 8/fW27pNXqooa/aCeWpK5fKLQY4VDamGh/cJ7gtX2xJjr8RSnJFoqMVcVJwIAGu2dJcMAwAA X-CMS-MailID: 20230525153745eucas1p1cd6d947ed0cd46a8fdf637b514c237ff X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230525153745eucas1p1cd6d947ed0cd46a8fdf637b514c237ff X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230525153745eucas1p1cd6d947ed0cd46a8fdf637b514c237ff References: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.11; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout1.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @samsung.com) X-ZM-MESSAGEID: 1685029174586100003 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 18 ++-- hw/net/igb_core.c | 214 +++++++++++++++++++++++++-------------- tests/qtest/libqos/igb.c | 5 + 3 files changed, 151 insertions(+), 86 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 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..8e32f39ece 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,52 @@ igb_write_packet_to_guest(IGBCore *core, struct Net= RxPkt *pkt, PCIDevice *d; dma_addr_t base; union e1000_rx_desc_union desc; - size_t desc_size; - size_t desc_offset =3D 0; - size_t iov_ofs =3D 0; - - struct iovec *iov =3D net_rx_pkt_get_iovec(pkt); - size_t size =3D net_rx_pkt_get_total_len(pkt); - size_t total_size =3D size + e1000x_fcs_len(core->mac); - const E1000ERingInfo *rxi =3D rxr->i; - size_t bufsize =3D igb_rxbufsize(core, rxi); - + const E1000ERingInfo *rxi; + size_t rx_desc_len; + + IGBPacketRxDMAState pdma_st =3D {0}; + pdma_st.is_first =3D true; + pdma_st.size =3D net_rx_pkt_get_total_len(pkt); + pdma_st.total_size =3D pdma_st.size + e1000x_fcs_len(core->mac); + + rxi =3D rxr->i; + rx_desc_len =3D core->rx_desc_len; + pdma_st.rx_desc_packet_buf_size =3D igb_rxbufsize(core, rxi); + pdma_st.rx_desc_header_buf_size =3D igb_rxhdrbufsize(core, rxi); + pdma_st.iov =3D net_rx_pkt_get_iovec(pkt); d =3D pcie_sriov_get_vf_at_index(core->owner, rxi->idx % 8); if (!d) { d =3D core->owner; } =20 do { - hwaddr ba; - uint16_t written =3D 0; + pdma_st.written =3D 0; bool is_last =3D false; =20 - desc_size =3D total_size - desc_offset; - - if (desc_size > bufsize) { - desc_size =3D bufsize; - } - if (igb_ring_empty(core, rxi)) { return; } =20 base =3D igb_ring_head_descr(core, rxi); + pci_dma_read(d, base, &desc, rx_desc_len); + trace_e1000e_rx_descr(rxi->idx, base, rx_desc_len); =20 - pci_dma_read(d, base, &desc, core->rx_desc_len); - - trace_e1000e_rx_descr(rxi->idx, base, core->rx_desc_len); - - igb_read_rx_descr(core, &desc, &ba); - - if (ba) { - if (desc_offset < size) { - static const uint32_t fcs_pad; - size_t iov_copy; - size_t copy_size =3D size - desc_offset; - if (copy_size > bufsize) { - copy_size =3D bufsize; - } - - /* Copy packet payload */ - while (copy_size) { - iov_copy =3D MIN(copy_size, iov->iov_len - iov_ofs); - - igb_write_to_rx_buffers(core, d, ba, &written, - iov->iov_base + iov_ofs, iov_c= opy); + igb_read_rx_descr(core, &desc, &pdma_st.ba); =20 - copy_size -=3D iov_copy; - iov_ofs +=3D iov_copy; - if (iov_ofs =3D=3D iov->iov_len) { - iov++; - iov_ofs =3D 0; - } - } - - if (desc_offset + desc_size >=3D total_size) { - /* Simulate FCS checksum presence in the last descript= or */ - igb_write_to_rx_buffers(core, d, ba, &written, - (const char *) &fcs_pad, e1000x_fcs_len(core->ma= c)); - } - } - } else { /* as per intel docs; skip descriptors with null buf addr= */ - trace_e1000e_rx_null_descriptor(); - } - desc_offset +=3D desc_size; - if (desc_offset >=3D total_size) { + igb_write_to_rx_buffers(core, pkt, d, &pdma_st); + pdma_st.desc_offset +=3D pdma_st.desc_size; + if (pdma_st.desc_offset >=3D pdma_st.total_size) { is_last =3D true; } =20 igb_write_rx_descr(core, &desc, is_last ? core->rx_pkt : NULL, - rss_info, etqf, ts, written); - igb_pci_dma_write_rx_desc(core, d, base, &desc, core->rx_desc_len); - - igb_ring_advance(core, rxi, core->rx_desc_len / E1000_MIN_RX_DESC_= LEN); - - } while (desc_offset < total_size); + rss_info, etqf, ts, pdma_st.written); + 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 Fri Apr 26 08:57:04 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=1685029165; cv=none; d=zohomail.com; s=zohoarc; b=BTc5XWcuRSqp+L3dAtQJCT7/EzIWHk5DY2ueHJPDoaOCl6q5Ew3BCuFGQ+BHA0N6CY2Bk1YkwYqfs8Tr9a/fAOGoE0SWmzeUBsDGyAiAk24F5tbvWbE+mMQ9aG7cy/57qHP3knFDVmBOccLgFPuTNfk0Mn3JV1na8yI/TSuP85o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685029165; 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=AITdTqYKHscQqKN5hDpOQN76OhnFRQlLVPImMdPnlqM=; b=OSTpikuOwJG+4xhFXgSh7VxDTVLHBXvBtPEtXkfG18JHjPqDft5e2XWzC9/8fEZg0YZgTIvSnrYCJv2qnxi6AAOPV23VY/Nv94XcqDOr6+HlZ33akT2/cPJ7eeTf4iTuky7dpo8tCI3/p+/PReFW6vC5bg5lHqR5ryVFprUNBxE= 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 1685029165418610.072538342286; Thu, 25 May 2023 08:39:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2D2K-0003MX-Qg; Thu, 25 May 2023 11:37:56 -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 1q2D2H-0003I9-1N for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:53 -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 1q2D2C-0000o7-Fu for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:52 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230525153746euoutp019fd8e7802c6ae4d3d3fadb1becadbd65~ibQIMlZ9I0295002950euoutp01Q for ; Thu, 25 May 2023 15:37:46 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230525153745eucas1p25baa66bc28b1927ae00a8d9d83e7b7a8~ibQH_VUag2952929529eucas1p2O; Thu, 25 May 2023 15:37:45 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id FE.28.11320.9C08F646; Thu, 25 May 2023 16:37:45 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230525153745eucas1p22c62582ef16e6d6c9da9ab58243414f0~ibQHtXMwi2755027550eucas1p2c; Thu, 25 May 2023 15:37:45 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230525153745eusmtrp20b80a71f20fa9bec49a86418f660a62d~ibQHs3E1I0985909859eusmtrp2_; Thu, 25 May 2023 15:37:45 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id DB.A7.14344.9C08F646; Thu, 25 May 2023 16:37:45 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230525153745eusmtip2cea6c9a2bece86d3e21724314f902d2a~ibQHKh9kr1970019700eusmtip2V; Thu, 25 May 2023 15:37:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230525153746euoutp019fd8e7802c6ae4d3d3fadb1becadbd65~ibQIMlZ9I0295002950euoutp01Q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685029066; bh=AITdTqYKHscQqKN5hDpOQN76OhnFRQlLVPImMdPnlqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=goqlmUzxmjJoBurGcBUHCoh/E4zBsCPZl5PCDiwAaYnlb1sta1loqYw8/bvyZvEPk PR5W/ohtxREd0njGrGcCt1IcYY25J/dYtfRaSrsyKZpyNPj3B1Vd7EXpXoNFgQG3jI MrcqpzSbEA8ZIJPlzd+4cMC3au+qX4R2libBjVDw= X-AuditID: cbfec7f4-993ff70000022c38-db-646f80c9d8e8 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 v9 5/7] igb: add IPv6 extended headers traffic detection Date: Thu, 25 May 2023 17:37:31 +0200 Message-Id: <20230525153733.4104-6-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA02Se2xLcRTH/e6jvSuVqx472bCpiGDm0Y2b2Tz3xyWCPyzikdFs14auXdrN jJB6bso2qTAbsTWyR2sLZl2qs0Y3VNVmZmVhQRrDjKzVYUXM6hL+++R7vud7zkkOhUvyyDBq hzKLUyvlCqlARDTcDTyc7dSqUuea+mSM/36tkKns8GPMwbILJGN2DwoZR4GFYArq3mFLBey9 j3aSbfe04ezrJ9cxtt/mFrCF9Sa0jtwkik/lFDt2c+o5i7eJ0rt8n4SZjaI91T/f4FpUQ+lQ CAV0DHgL9GSQJXQ1gntPKZ4HEOj0i3VINMx+BINNDuJvg8/dSfKFKgSu8iME35GHwSU3E2QB vQA8AxeHTRQ1jpaBLy80KOM0B3d+2H/bx9IsFOVXYEEm6GnQ0lSJgiyml0Pr6f4/syKgpOOr MBgTQq8A4+dc3jIGnCWvCT4yAg6bz+PBdYC2UPDqiwsF/UAngrFxPB8zFt476oU8T4ShG2UY zzkQaG0Q8r1HENw8c/qPaRF0mAO/18fpGXDFOoeXl4HR7iH5+NHQ9XEMv8Jo0DcU47wshvxj Et4dBV/qSgS8HAaGrgO8zMKLl6fQKTSl9L9bSv+7pfTf2HKEm1Aol63JSOM085VcTrRGnqHJ VqZFp6gy6tDwr7h+OgYsqOq9L7oZYRRqRkDh0nHiqwpVqkScKs/dy6lVW9XZCk7TjMIpQhoq npXgTJHQafIsbhfHZXLqv1WMCgnTYutkXXGljeGFRbP9H55LtsTLrlHt35TSid2BhGz7y7wo 9dTvdckJQ/W6MmPs3pUKqK28Hj4Y2eaKaHkQ3p6Sax+qzZeqetOVibfiDu/KLK/3Fh3fuiS+ tdB27MfCVVdPHnUujLF4n67fXzOX9N5uuWXNH7EnurcC7z3Qk7DcakbKHLOps4Ld5NeCbWnn 2ir4rk3WyXyX3/ZMf9Z6dkHxKGvimuMxa4icSNH2pKy+TnN/n6m6ZrMr0mAtOrhKn9ufFDi0 YV9S22RD7EaaucTu7H5nJOMKbRebjD2xk6Y5BqpXR3lrT+g9EyINIx/ZHhvY5JP3h5pGWM45 uxl3ieeDlNCky+fNxNUa+S/zOE9zmgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7onG/JTDL4sU7L4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GTc+fmIv 2M1VseLfM+YGxjUcXYycHBICJhIfr15h7WLk4hASWMooceDXHRaIhJTEvp7/7BC2sMSfa11s EEWtTBJL525lAkmwCZhJPPoyD6ibg0NEwFTi2V5JkDCzQKbE6Vf72EBsYQEPif6OpWDlLAKq Eof3LmMEsXkFnCTOTn4PtUteYual7+wgYzgFnCVWfq0ECQsBlWz/MI0VolxQ4uTMJywQ4+Ul mrfOZp7AKDALSWoWktQCRqZVjCKppcW56bnFRnrFibnFpXnpesn5uZsYgZGw7djPLTsYV776 qHeIkYmD8RCjBAezkgjvhpz8FCHelMTKqtSi/Pii0pzU4kOMpkBnT2SWEk3OB8ZiXkm8oZmB qaGJmaWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QDU4vpLIanmx3vlLNufFJ+QpB7 wm+98IWdj2r3ed45ts+06YprktQnnw9vyja9LMltzHwQ4VZlZJu0eMkZtzWHu4UtQiV6GO3m ii/32rDgqpnvuvlnI/U3fuJ8rMN+oOtOYp14uNHJvjfqL59cWBDZoL657cXyE3E73zJsn7Qi Yv7KboPvVie17HITfwsvnui/2q1tRdSdmhLF9cwiesIzZnbuvha5qTHEKWHD6YeZ/4qDGLSb vzu0WPKbC+/bvf/RdyfuialMFdcvrNaf2ue2P2/DT94JHY5xm3ec67h5nEu56dFrx3VLH61u vVVep7b6ssviA07nAqetXilYtEghUDlwWuGFnSYh5k5cki+XcymxFGckGmoxFxUnAgBFfSJM DQMAAA== X-CMS-MailID: 20230525153745eucas1p22c62582ef16e6d6c9da9ab58243414f0 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230525153745eucas1p22c62582ef16e6d6c9da9ab58243414f0 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230525153745eucas1p22c62582ef16e6d6c9da9ab58243414f0 References: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.11; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout1.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @samsung.com) X-ZM-MESSAGEID: 1685029167530100003 Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 4 +++- hw/net/igb_regs.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 8e32f39ece..2bfae517fc 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 Fri Apr 26 08:57:04 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=1685029173; cv=none; d=zohomail.com; s=zohoarc; b=khAhgR5u47FQv/E3spiy5IeHCxyWUFWWRbT4OC5irl4qLnvwxcweCAJDcSGoHNyDXvtUTcRDz690YJ3WnfqZ0PoukWPkCw6GJ/TaxY/yqP0/yk6dfmi5TUy6ZdS+lAWD1RwN/KJJI4I072fCasyWa3EFnY/B2PbXRv4JDZ6/A5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685029173; 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=dbWL4RIfXeXcGY6r3658f8p0ZYGC2z8aX/hom6apjFw=; b=Bj+2Do32s1plkMWjPWEvjYzw0yBW1YvwnBJ06QTs8SCM/FbQJSvvvIVNJOiItYMaJ7STQsS3RaLxJY+8Ju4brBAmopYW767K2L9jlLz5zg5KAeiNC2ngpVtHO+1VzB3N6qiUb1R1NcnP8oP8eFj8I41RUKr06vbiBF3kudBJw4A= 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 1685029173151198.0999068898543; Thu, 25 May 2023 08:39:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2D2L-0003My-F0; Thu, 25 May 2023 11:37:57 -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 1q2D2J-0003Ka-2J for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:55 -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 1q2D2E-0000oV-Mv for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:54 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230525153747euoutp02987412a3c289a720467105030b7ad081~ibQJUmBsZ0292202922euoutp02X for ; Thu, 25 May 2023 15:37:47 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230525153746eucas1p2602115ab6df483a0c348a0b53546beb1~ibQI6E9ma2773427734eucas1p2f; Thu, 25 May 2023 15:37:46 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 85.52.37758.AC08F646; Thu, 25 May 2023 16:37:46 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230525153746eucas1p1957a3a91d90521a6d1c684595c848f52~ibQIPWe1q1861918619eucas1p1g; Thu, 25 May 2023 15:37:46 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230525153746eusmtrp11cde4ff688815148aae6720cabcdac2d~ibQIO5DFW0103701037eusmtrp1F; Thu, 25 May 2023 15:37:46 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id AA.C4.10549.AC08F646; Thu, 25 May 2023 16:37:46 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230525153745eusmtip221738c5a37fa36873e54450ad9bfe89e~ibQHsC_kQ1970019700eusmtip2W; Thu, 25 May 2023 15:37:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230525153747euoutp02987412a3c289a720467105030b7ad081~ibQJUmBsZ0292202922euoutp02X DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685029067; bh=dbWL4RIfXeXcGY6r3658f8p0ZYGC2z8aX/hom6apjFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z6/UhCXHRUqtemLOF0vNNhOPyFH3kkaEtbxBs37JA+aL6BGpkm4CPmu9mMJT8u139 kzWA1s17vcgN4UKTBSHxEsU/JA1FnniJAwxtzXl+JfQ6VliEzBZ6hJrK1FH2BSUOGB 04egYrok9NM4sZaE210mvDG8r+WMmFXSCVShkGZc= X-AuditID: cbfec7f5-815ff7000002937e-5d-646f80cadfcc 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 v9 6/7] igb: packet-split descriptors support Date: Thu, 25 May 2023 17:37:32 +0200 Message-Id: <20230525153733.4104-7-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA02Sa0hTYRjHe3fOtqM2O81ijxqIU7tYaqOwk6VoRUyT6oMhXVCHO6g1N9lx mpWpaVmmFYqV6zbNyklZ2TbMS5GVppGZYCYkkpmXYuZdpxE5T5HffvzeP//neeAlMOFprhMR p0yk1UqZQsyzxU0Nlhav5nSVfH3FNwk11vyAT91tG+NQGbeucylj+zSfasyrwqm8ygFOIE/6 xvyCK23tacGkvR+fcKQ/n7XzpBcM5Wgv94DtVjmtiEui1T4BUbax/SOHEm7dQEfNHY/xdNSq yEE2BJAboaq3B1lZSJYhyP28kuVxBH2WJSyPIbjaI/2XN/af57H+HoK2OjwH2c5xNgcaOvXz RTzSF3rGb3JzEEEsIzfASLbIqjGShte/XuBWdiD9Ia/p2jzjpAfo3gzxrSwgt0Fr/iBiZ7lA UdsU31pjQ24H/UQKG1kKTUW9OFvpApnGaxgbNxCgex3M8g648yr3r3eA740GPssr4G1BLs5y MljemfjW9YHMQlBbWPA3tAXajJb59TFyDTys9mF1EIyWXkRWDaQ9fDIvZVewh3zTFYzVAjh7 Rsim18FkZRGP1U5Q/Okki1IYPZd0CblqF5yiXXCK9v9UHcLKkYjWMPExNLNBSSd7M7J4RqOM 8Y5WxVeiuZ/y9nfjRBUq+z7iXY84BKpHQGDiZYJHCpVcKJDLUo7RalWkWqOgmXrkTOBikWCt f1O0kIyRJdJHaDqBVv975RA2TumcZIj26BooLp6tLdvp3OTu7xKYqTOVhMguuwVHmAzy3OYM epGDX4X5fqh75Gqfej35cFix2+KyR1vcMR5Wouv6IWG8irZEdsdwo/yol75hI47l9iG7SvTh 3DIqLExU4WpwHU40iEy7wlP13aERjouyJYjJ0ipWLBd8SAtZLJ75crhdWNgb0bee0g9NnI9V u43jpSebJTad+0URdaknnvPyLYPHF5fs8K2tXj1dwA3QUq5f31OqSWwyseN2HqehHwX1abKf 1gx3zVxN6zhknEnY9C56b8vBbfumPA2t3Z7+Gyu3r9oZGpKmmQi0M22Oyziln5w1T1+yU1aI 7TtrxDgTK5N4YmpG9gdCKEMZmAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7qnGvJTDGbO4bT4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6Gc8/xhTM n8tY8fb6RpYGxgs5XYycHBICJhJbn3ezdTFycQgJLGWUmP7uOBNEQkpiX89/dghbWOLPtS6o olYmif1rDrKCJNgEzCQefZkHZHNwiAiYSjzbKwkSZhbIlDj9ah8biC0sYCvRe3I2C4jNIqAq seDEO7CZvAJOEhcmvWSEmC8vMfPSd3aQMZwCzhIrv1aChIWASrZ/mMYKUS4ocXLmExaI8fIS zVtnM09gFJiFJDULSWoBI9MqRpHU0uLc9NxiQ73ixNzi0rx0veT83E2MwEjYduzn5h2M8159 1DvEyMTBeIhRgoNZSYR3Q05+ihBvSmJlVWpRfnxRaU5q8SFGU6CzJzJLiSbnA2MxryTe0MzA 1NDEzNLA1NLMWEmc17OgI1FIID2xJDU7NbUgtQimj4mDU6qBqeLEjhwh2+mpPZEmr08Ea637 k7J//6vvkk4lX52MYo+4m0jm8jcnfp1w6vbHFP69zSoleyYf4dJawHfJ6MUexi6Dgl+tjw7/ t93bUmzxX0PDmMlU2WkB95acafX7fu/991IjSnGW3nHNx/5fjEyfiP0zrtXgWvBbW/+fn/ln 7Xydz4kHGbhTw5bN1/twc3ey/nr+lkt+30V5GuLkV/vr9h7mXvcg1ipg5i4F04a/yf9d0l51 5Vjct+8y+Vq3rWN/3u67Qd/v/ojcrtv8Rif1ya2yDyxdt9Lzzp71Eg4z37dQ3ndeF7/rqYtc tw4evRSePXtBSNbrU5fmVzbWNDvpd3KuPBDw7fsP1sVBbElvlFiKMxINtZiLihMBZQEu8g0D AAA= X-CMS-MailID: 20230525153746eucas1p1957a3a91d90521a6d1c684595c848f52 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230525153746eucas1p1957a3a91d90521a6d1c684595c848f52 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230525153746eucas1p1957a3a91d90521a6d1c684595c848f52 References: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @samsung.com) X-ZM-MESSAGEID: 1685029174610100004 Packet-split descriptors are used by Linux VF driver for MTU values from 20= 48 Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 357 ++++++++++++++++++++++++++++++++++++++------ hw/net/igb_regs.h | 9 ++ hw/net/trace-events | 2 +- 3 files changed, 325 insertions(+), 43 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 2bfae517fc..c1a8dfbca8 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -267,6 +267,29 @@ igb_rx_use_legacy_descriptor(IGBCore *core) return false; } =20 +typedef struct E1000ERingInfo { + int dbah; + int dbal; + int dlen; + int dh; + int dt; + int idx; +} E1000ERingInfo; + +static uint32_t +igb_rx_queue_desctyp_get(IGBCore *core, const E1000ERingInfo *r) +{ + return core->mac[E1000_SRRCTL(r->idx) >> 2] & E1000_SRRCTL_DESCTYPE_MA= SK; +} + +static bool +igb_rx_use_ps_descriptor(IGBCore *core, const E1000ERingInfo *r) +{ + uint32_t desctyp =3D igb_rx_queue_desctyp_get(core, r); + return desctyp =3D=3D E1000_SRRCTL_DESCTYPE_HDR_SPLIT || + desctyp =3D=3D E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS; +} + static inline bool igb_rss_enabled(IGBCore *core) { @@ -694,15 +717,6 @@ static uint32_t igb_rx_wb_eic(IGBCore *core, int queue= _idx) return (ent & E1000_IVAR_VALID) ? BIT(ent & 0x1f) : 0; } =20 -typedef struct E1000ERingInfo { - int dbah; - int dbal; - int dlen; - int dh; - int dt; - int idx; -} E1000ERingInfo; - static inline bool igb_ring_empty(IGBCore *core, const E1000ERingInfo *r) { @@ -1233,12 +1247,25 @@ igb_read_lgcy_rx_descr(IGBCore *core, struct e1000_= rx_desc *desc, } =20 static inline void -igb_read_adv_rx_descr(IGBCore *core, union e1000_adv_rx_desc *desc, - hwaddr *buff_addr) +igb_read_adv_rx_single_buf_descr(IGBCore *core, union e1000_adv_rx_desc *d= esc, + hwaddr *buff_addr) { *buff_addr =3D le64_to_cpu(desc->read.pkt_addr); } =20 +static inline void +igb_read_adv_rx_split_buf_descr(IGBCore *core, union e1000_adv_rx_desc *de= sc, + hwaddr *buff_addr) +{ + buff_addr[0] =3D le64_to_cpu(desc->read.hdr_addr); + buff_addr[1] =3D le64_to_cpu(desc->read.pkt_addr); +} + +typedef struct IGBBAState { + uint16_t written[IGB_MAX_PS_BUFFERS]; + uint8_t cur_idx; +} IGBBAState; + typedef struct IGBPacketRxDMAState { size_t size; size_t total_size; @@ -1249,20 +1276,41 @@ typedef struct IGBPacketRxDMAState { uint32_t rx_desc_header_buf_size; struct iovec *iov; size_t iov_ofs; + bool do_ps; bool is_first; - uint16_t written; - hwaddr ba; + IGBBAState bastate; + hwaddr ba[IGB_MAX_PS_BUFFERS]; } IGBPacketRxDMAState; =20 static inline void -igb_read_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, - hwaddr *buff_addr) +igb_read_rx_descr(IGBCore *core, + union e1000_rx_desc_union *desc, + IGBPacketRxDMAState *pdma_st, + const E1000ERingInfo *r) { + uint32_t desc_type; + if (igb_rx_use_legacy_descriptor(core)) { - igb_read_lgcy_rx_descr(core, &desc->legacy, buff_addr); - } else { - igb_read_adv_rx_descr(core, &desc->adv, buff_addr); + igb_read_lgcy_rx_descr(core, &desc->legacy, &pdma_st->ba[1]); + pdma_st->ba[0] =3D 0; + return; + } + + /* advanced header split descriptor */ + if (igb_rx_use_ps_descriptor(core, r)) { + igb_read_adv_rx_split_buf_descr(core, &desc->adv, &pdma_st->ba[0]); + return; + } + + /* descriptor replication modes not supported */ + desc_type =3D igb_rx_queue_desctyp_get(core, r); + if (desc_type !=3D E1000_SRRCTL_DESCTYPE_ADV_ONEBUF) { + trace_igb_wrn_rx_desc_modes_not_supp(desc_type); } + + /* advanced single buffer descriptor */ + igb_read_adv_rx_single_buf_descr(core, &desc->adv, &pdma_st->ba[1]); + pdma_st->ba[0] =3D 0; } =20 static void @@ -1405,6 +1453,13 @@ igb_write_lgcy_rx_descr(IGBCore *core, struct e1000_= rx_desc *desc, desc->status =3D (uint8_t) le32_to_cpu(status_flags); } =20 +static bool +igb_rx_ps_descriptor_split_always(IGBCore *core, const E1000ERingInfo *r) +{ + uint32_t desctyp =3D igb_rx_queue_desctyp_get(core, r); + return desctyp =3D=3D E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS; +} + static uint16_t igb_rx_desc_get_packet_type(IGBCore *core, struct NetRxPkt *pkt, uint16_t = etqf) { @@ -1494,16 +1549,64 @@ igb_write_adv_rx_descr(IGBCore *core, union e1000_a= dv_rx_desc *desc, desc->wb.upper.status_error |=3D cpu_to_le32(adv_desc_status_error); } =20 +typedef struct IGBSplitDescriptorData { + bool sph; + bool hbo; + size_t hdr_len; +} IGBSplitDescriptorData; + static inline void -igb_write_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, - struct NetRxPkt *pkt, const E1000E_RSSInfo *rss_info, - uint16_t etqf, bool ts, uint16_t length) +igb_write_adv_ps_rx_descr(IGBCore *core, + union e1000_adv_rx_desc *desc, + struct NetRxPkt *pkt, + const E1000E_RSSInfo *rss_info, + const E1000ERingInfo *r, + uint16_t etqf, + bool ts, + IGBSplitDescriptorData *ps_desc_data, + IGBPacketRxDMAState *pdma_st) +{ + size_t pkt_len; + size_t hdr_len =3D ps_desc_data->hdr_len; + 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 (hdr_len << E1000_ADVRXD_HDR_LEN_OFFSET) & + E1000_ADVRXD_ADV_HDR_LEN_MASK; + hdr_info |=3D 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( + ps_desc_data->hbo ? E1000_ADVRXD_ST_ERR_HBO_OFFSET : 0); +} + +static inline void +igb_write_rx_descr(IGBCore *core, + union e1000_rx_desc_union *desc, + struct NetRxPkt *pkt, + const E1000E_RSSInfo *rss_info, + uint16_t etqf, + bool ts, + IGBSplitDescriptorData *ps_desc_data, + IGBPacketRxDMAState *pdma_st, + const E1000ERingInfo *r) { if (igb_rx_use_legacy_descriptor(core)) { - igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, length= ); + igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, + pdma_st->bastate.written[1]); + } else if (igb_rx_use_ps_descriptor(core, r)) { + igb_write_adv_ps_rx_descr(core, &desc->adv, pkt, rss_info, r, etqf= , ts, + ps_desc_data, pdma_st); } else { igb_write_adv_rx_descr(core, &desc->adv, pkt, rss_info, - etqf, ts, length); + etqf, ts, pdma_st->bastate.written[1]); } } =20 @@ -1564,26 +1667,182 @@ igb_rx_descr_threshold_hit(IGBCore *core, const E1= 000ERingInfo *rxi) ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; } =20 +static bool +igb_do_ps(IGBCore *core, + const E1000ERingInfo *r, + struct NetRxPkt *pkt, + size_t *hdr_len, + IGBSplitDescriptorData *ps_desc_data) +{ + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + bool fragment; + bool split_always; + size_t bheader_size; + size_t total_pkt_len; + + if (!igb_rx_use_ps_descriptor(core, r)) { + return false; + } + + memset(ps_desc_data, 0, sizeof(IGBSplitDescriptorData)); + + total_pkt_len =3D net_rx_pkt_get_total_len(pkt); + bheader_size =3D igb_rxhdrbufsize(core, r); + split_always =3D igb_rx_ps_descriptor_split_always(core, r); + if (split_always && total_pkt_len <=3D bheader_size) { + *hdr_len =3D total_pkt_len; + ps_desc_data->hdr_len =3D total_pkt_len; + return true; + } + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); + + if (hasip4) { + fragment =3D net_rx_pkt_get_ip4_info(pkt)->fragment; + } else if (hasip6) { + fragment =3D net_rx_pkt_get_ip6_info(pkt)->fragment; + } else { + ps_desc_data->hdr_len =3D bheader_size; + goto header_not_handled; + } + + if (fragment && (core->mac[RFCTL] & E1000_RFCTL_IPFRSP_DIS)) { + ps_desc_data->hdr_len =3D bheader_size; + goto header_not_handled; + } + + /* no header splitting for SCTP */ + if (!fragment && (l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_UDP || + l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_TCP)) { + *hdr_len =3D net_rx_pkt_get_l5_hdr_offset(pkt); + } else { + *hdr_len =3D net_rx_pkt_get_l4_hdr_offset(pkt); + } + + ps_desc_data->sph =3D true; + ps_desc_data->hdr_len =3D *hdr_len; + + if (*hdr_len > bheader_size) { + ps_desc_data->hbo =3D true; + goto header_not_handled; + } + + return true; + +header_not_handled: + if (split_always) { + *hdr_len =3D bheader_size; + return true; + } + + return false; +} + static void igb_truncate_to_descriptor_size(IGBPacketRxDMAState *pdma_st, size_t *size) { - if (*size > pdma_st->rx_desc_packet_buf_size) { - *size =3D pdma_st->rx_desc_packet_buf_size; + if (pdma_st->do_ps && pdma_st->is_first) { + if (*size > pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_len= ) { + *size =3D pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_l= en; + } + } else { + if (*size > pdma_st->rx_desc_packet_buf_size) { + *size =3D pdma_st->rx_desc_packet_buf_size; + } } } =20 +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; +} + 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 +1859,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 +1875,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 +1889,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 +1903,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 @@ -1662,6 +1925,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, union e1000_rx_desc_union desc; const E1000ERingInfo *rxi; size_t rx_desc_len; + IGBSplitDescriptorData ps_desc_data; =20 IGBPacketRxDMAState pdma_st =3D {0}; pdma_st.is_first =3D true; @@ -1678,8 +1942,12 @@ igb_write_packet_to_guest(IGBCore *core, struct NetR= xPkt *pkt, d =3D core->owner; } =20 + pdma_st.do_ps =3D igb_do_ps(core, rxi, pkt, + &pdma_st.ps_hdr_len, + &ps_desc_data); + do { - pdma_st.written =3D 0; + memset(&pdma_st.bastate, 0, sizeof(IGBBAState)); bool is_last =3D false; =20 if (igb_ring_empty(core, rxi)) { @@ -1690,7 +1958,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 +1966,13 @@ igb_write_packet_to_guest(IGBCore *core, struct NetR= xPkt *pkt, is_last =3D true; } =20 - igb_write_rx_descr(core, &desc, is_last ? core->rx_pkt : NULL, - rss_info, etqf, ts, pdma_st.written); + igb_write_rx_descr(core, &desc, + is_last ? pkt : NULL, + rss_info, + etqf, ts, + &ps_desc_data, + &pdma_st, + rxi); 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); 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 Fri Apr 26 08:57:04 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=1685029105; cv=none; d=zohomail.com; s=zohoarc; b=PKPlXTGkcqr7GKBu46AAaGQlLCTAS+adFb4PCmB8mu34xX6vGMZxQfnxk98Lglel3YcsGVCl02AUkJPEcYk6MGbUddKNe5+s8c86UY5gNe6D68NQx1WPjr/KUC8llJWraqKUONMdDwel/X0Z2gKYwQP6ZZ773O0OEMMBRxlmP+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685029105; 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=ViAJ63TafpVKouSE4qV8xSKO/QIFb1F697mmcLtp3PN7AEoFwpJYetZ4pkP/zXplUUDJ1LmYUywFmBK5IPc5SLMlkOE8EyCQsmV9wTFcU25eqJOFVvSmmeIO0VOjDzFsoSdPbJByevleBpMFQuuGfQe2pF6T449ZuqFeZmLnvOw= 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 1685029105534790.1747776928777; Thu, 25 May 2023 08:38:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2D2H-0003IY-Bz; Thu, 25 May 2023 11:37:53 -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 1q2D2F-0003Hl-Mr for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:51 -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 1q2D2C-0000oP-L3 for qemu-devel@nongnu.org; Thu, 25 May 2023 11:37:51 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230525153747euoutp01e6123464ad188f731978885359582e20~ibQJJBMUL0294602946euoutp01P for ; Thu, 25 May 2023 15:37:47 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230525153747eucas1p2d493d32cefe1afb8ec0cd8d987e46d7a~ibQJAGp-O2952929529eucas1p2Q; Thu, 25 May 2023 15:37:47 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id F5.52.37758.AC08F646; Thu, 25 May 2023 16:37:46 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230525153746eucas1p2903b5d0ecf65994f9b68ddf039d3d881~ibQItOdET0108401084eucas1p2G; Thu, 25 May 2023 15:37:46 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230525153746eusmtrp1b38e9274d0a3140c4dfc46d88b2da6a6~ibQIsrKLe0099000990eusmtrp1P; Thu, 25 May 2023 15:37:46 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 1B.C4.10549.AC08F646; Thu, 25 May 2023 16:37:46 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230525153746eusmtip2671deb7712f3ffb1c811dfadaffa3e84~ibQIO8pPB1848718487eusmtip2Y; Thu, 25 May 2023 15:37:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230525153747euoutp01e6123464ad188f731978885359582e20~ibQJJBMUL0294602946euoutp01P DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1685029067; bh=GpKLeGxhJ948k3AAv+MCQ78nH8+ei8bGGBtWQlF9R0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJXU2DMqgU3C55GGj1LVRRT+FrY5Xo5SSwSNy6UARDrwcOrP8Mb3mqNVZjMmUUdr8 jHGP0OLI6PaXm+AfZuQaCxYXtmhyCih4ALN1UnVxgD2l1fXk4BRGMdO1q1DvQb245e VRWq5Jd6pTja5mVd6SVSNqzE0AzfE0pFmdZvdv5I= X-AuditID: cbfec7f5-7ffff7000002937e-5e-646f80cad5c3 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 v9 7/7] e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_rx_buffers Date: Thu, 25 May 2023 17:37:33 +0200 Message-Id: <20230525153733.4104-8-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA01Se0hTcRTmt3t3d11Mr1PwpJJoFpivzKhptV6GsyJXUFFWNtxFpTl1c74i s3eN7CVprsfsgZqhqekys8cWttSSNHwkhEzTfPRELUdjq3mN/O873/m+c74Dh8T4arY7mShP oxVyicyH4OK6l+a2wJbcZOni4SfhgvGWCo6gpGOcJTiivcYW1HVOcQTGvHpckFczzFpDiF59 0bNFb/vbMNHHrgcs0bennYToXG05ErN3c1dKaVliOq0IFu7nJlwe7GanNHhmlja0E7nop5Ma OZBALYW+e7WYHfOpMgQVFUiNuH/xBIJPeSaCKcYRDPTpWf8cVb8tGNMoRWC5WM1hilMs6P5c OT2LoJZB/8QNthqRpCsVCj9OudlpjKKhyaLH7diFigHzAwthxzi1AGxfn01bedQ6aLrbijPL vKCo4xfHPsaBWg93J7MYiTM0F33EmZFecKzu6nQeoOpJsD4pn/FGQKG+l2CwC4waazkM9oTW /LMzmgwwv9FxGPNxBI2X82dEK6CjzjydH6P84H5DMEOvhdu6z7idBsoRer44Mxkc4ZKuEGNo Hpw+yWfUAfCzpohgaHe42ZPD0CLQT97kXEDemlnHaGYdo/m/thhh5ciNVimT4mllqJzOCFJK kpQqeXxQXHJSDfr7Lq1W42Q9Khv9EWRALBIZEJCYjyuvSpYs5fOkkqxsWpEcq1DJaKUBeZC4 jxvPf1VzHJ+Kl6TRB2g6hVb867JIB/dcVojnFW46McbJMf+Oi5wflh4UL1HurJyYemz8ZkHz rCbh2Ori88V+IfvaFu3ip4s3CaQb1TYn3xLbYGZ31fMXc920e1aO3LF51EUsEQc7RhuIh2ve a4oCN68rGCE3y1PzgV95+J3vh9J9ZKm2vU8NR71xWE6WCA7pwdfipbCNNb7Z4r0/yte4oXuo ICwwJ1roaBVGyw76P5LEOizUJQYP7M0I2FY2XpD9Xf54LCa1U9R1zFbP99sYTh/dM8ekubU8 0q8xdnuYa0O16vWQaQsu7NJarye0JGoNWTvKos6EHonMsfHMKs+e9lsnHh7aesc0tR31ine4 UNX+2rVWsQ+uTJCELMIUSskfRGiM7p0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7qnGvJTDL4s0LD4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6GVOfXmct 2CVTsXzXRbYGxm/8XYycHBICJhIbfv9h7mLk4hASWMooceFbLxNEQkpiX89/dghbWOLPtS42 iKJWJonvp1azgCTYBMwkHn2Zx9rFyMEhImAq8WyvJEiYWSBT4vSrfWwgtrBApMSvKa8YQWwW AVWJ/+/2M4PYvAJOEkdXnmaBmC8vMfPSd3aQMZwCzhIrv1aChIWASrZ/mMYKUS4ocXLmExaI 8fISzVtnM09gFJiFJDULSWoBI9MqRpHU0uLc9NxiQ73ixNzi0rx0veT83E2MwEjYduzn5h2M 81591DvEyMTBeIhRgoNZSYR3Q05+ihBvSmJlVWpRfnxRaU5q8SFGU6CzJzJLiSbnA2MxryTe 0MzA1NDEzNLA1NLMWEmc17OgI1FIID2xJDU7NbUgtQimj4mDU6qBiW2K1fVCC+0Cj1mL2nKC 9dJmzmiW15Rxvu04c9LZKyd4nDZOP3MyW6Z5Wbt6P7/10rWH/8xg7Hxrz37e6+/mcvY/st7/ /2W7fbnU8XDL+behabFd+kX699MbixRUPXyOb3ee0pGw6mLcwcRDOUHxv1wV1j7+7bTi0Pap KV6PtjgpvVpUvfdalnDKrr17G6uKDPkNen7YPEie+SBG37dRqV22n+EEt6nGgqTuxVevqK/R 7F+nknn3hZjbDFnXI4dvvd7i0q60/+KX5Jt2ymqvzWbVWx/adnbt/ZzSbYyd9T7XJKaYH+9m SAxmqkqWWWfzQvWrftgEg7+JG37+ME299/zc9Ph/t1er5M3YYHdZVYmlOCPRUIu5qDgRACSR VwgNAwAA X-CMS-MailID: 20230525153746eucas1p2903b5d0ecf65994f9b68ddf039d3d881 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230525153746eucas1p2903b5d0ecf65994f9b68ddf039d3d881 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230525153746eucas1p2903b5d0ecf65994f9b68ddf039d3d881 References: <20230525153733.4104-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.11; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout1.w1.samsung.com X-Spam_score_int: -69 X-Spam_score: -7.0 X-Spam_bar: ------- X-Spam_report: (-7.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @samsung.com) X-ZM-MESSAGEID: 1685029106846100001 Rename e1000e_ba_state according and e1000e_write_hdr_to_rx_buffers for consistency with IGB. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 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