From nobody Sat May 18 15:49:39 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=1684418771; cv=none; d=zohomail.com; s=zohoarc; b=ZY0lX8DSvg7as6PV6gJSh1ISX9gIAtyUI3DJJdzerRq/94Pv+ezDsyT7s0LQdIPhZBtgTH4duZ+JpEwaRRXMt9WZ9ePe2nbTL+aCzYNBKTcT1wXjpbPAHsLqUyjEUxk0m75a6tHDglRQqBiUkiZG6JAP90wcxBGdykbCdbDKvFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684418771; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RAdTRgkb5cVy6FP5ribk2kxIlvYd4xCVAvY0Bobfcq8=; b=Z1AhsYLEAGkAPR8z1yBN+GcG0ny1V1RPQxOQTYIO1H70AWyIYDsruUT2SIKRh0uegJMom5Lq5rtWuDKGW0PoCP94LbJj9FWamsdwfz/U5bxyzlg/LUIahwyESgO1NDlIab8sBdd1TKW5EUyJKfuMQkEm93W3/wjs0h416bjcK3Q= 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 1684418771798321.00131022065545; Thu, 18 May 2023 07:06:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzeFi-0007Rt-UF; Thu, 18 May 2023 10:05:10 -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 1pzeFf-0007Qn-GZ for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:07 -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 1pzeFa-0003nh-MV for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:07 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230518140458euoutp022724a82e319abe0d52086e3a33489f35~gQeGzCQoR2931929319euoutp02u for ; Thu, 18 May 2023 14:04:58 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230518140458eucas1p1527bb6d1d151c8fdea164fbcb35a971c~gQeGpfZ7j1422214222eucas1p1a; Thu, 18 May 2023 14:04:58 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 88.AF.35386.98036646; Thu, 18 May 2023 15:04:58 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230518140457eucas1p21b5db6f35c3f2c77081eeaf1779ce3ab~gQeGXvJ051477214772eucas1p21; Thu, 18 May 2023 14:04:57 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230518140457eusmtrp1593fe0cbcc1a68136219becb44692135~gQeGXJ50q3006630066eusmtrp1T; Thu, 18 May 2023 14:04:57 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id E2.40.10549.98036646; Thu, 18 May 2023 15:04:57 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230518140457eusmtip240845607153f194ada952d6b590372a1~gQeF3W_RD0690106901eusmtip2T; Thu, 18 May 2023 14:04:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230518140458euoutp022724a82e319abe0d52086e3a33489f35~gQeGzCQoR2931929319euoutp02u DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684418698; bh=RAdTRgkb5cVy6FP5ribk2kxIlvYd4xCVAvY0Bobfcq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uTTB84Tw4+XathJ1rh4/l9cF9LwLHAMi9VtUb1z2my4l8tNLBgX8lhzlA1DhiAU1A 3NV9roibtjQiZLyU2H6wCwXRT2bnetMPenMMMIMVTkxoXZbdAUNO7yxqtummmg/Lz7 dXiRcGdupOsmPZr1Dwb8TsBL7gugZO5KrQ5kHQkw= X-AuditID: cbfec7f4-cc9ff70000028a3a-9d-646630891992 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 v8 1/7] igb: remove TCP ACK detection Date: Thu, 18 May 2023 16:04:42 +0200 Message-Id: <20230518140448.2001-2-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518140448.2001-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42LZduzned0ug7QUgx2tTBafT61lt1h26TOT ReP8OawWW6/+YLc43ruDxaJ30wsmBzaPE28PsnpceHSO2ePJtc1MHu/3XWXz6NuyijGANYrL JiU1J7MstUjfLoEr49urTSwFt1kr3l25yNTAuIeli5GTQ0LARGLLhFfsXYxcHEICKxgltt9Z BeV8YZRo3/mYCcL5zCjRsmMOG0zLu4VX2EFsIYHljBL7TitDFLUzSax4fYsJJMEmYCbx6Ms8 1i5GDg4RAWOJj+3iIGFmgVSJo38Ogq0WFjCVeLO7iRXEZhFQldg4ZQeYzSvgJPFpzQpWiF3y EjMvfQfbxSngLHFx+ipGiBpBiZMzn7BAzJSXaN46mxnkBgmBLRwSPZ+WM0E0u0j8OfYGyhaW eHV8CzuELSNxenIP1P/lEj/PbmOHaG5hlNgzdTJUkbXEpa0/wR5gFtCUWL9LHyLsKHHg0W9G kLCEAJ/EjbeCEDfwSUzaNp0ZIswr0dEmBFGtI/Ft00w2iLCUxMIbdRBhD4lj166xTGBUnIXk mVlInpmFsHYBI/MqRvHU0uLc9NRio7zUcr3ixNzi0rx0veT83E2MwPRy+t/xLzsYl7/6qHeI kYmD8RCjBAezkghvYF9yihBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFebduTyUIC6YklqdmpqQWp RTBZJg5OqQYmFz3OiZ9zW6+9/J9o5a4XNfOh5NJDZ7fKzzUuVrq1ff9MdfdvKZf0bkxkmXb7 054dX32/drWv//ROODqHi0OndaKD/YHwwOMK0wPtgjpnxdV/P8jemKLMmWG2zPf0fimdE6vS 7i+wlX8SnquxkpFv0SOmazK2IqWPvJNiS68d2HRLhm/ugZv+aWVPjdUN/K9LWekWTOGZ7fFz pn6ljV+Lt6xa8ga+j5+vHTwTlzvPOsmOubO8fKbHobsd09516zxe+vdI3gOxvl0Nrqdm7kza skFG5GfOgaRbb+YV7mLi/G67WURYit2Q4Y1rtfiNPZprC+rzHBbvsF524MO1g3vOv05MuN52 +EWdvaf66tipSizFGYmGWsxFxYkAUaXUOZ4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xe7qdBmkpBss/6lh8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jG+vNrEU 3GateHflIlMD4x6WLkZODgkBE4l3C6+wdzFycQgJLGWUWNa+nh0iISWxr+c/lC0s8edaFxtE USuTxIfNExlBEmwCZhKPvsxj7WLk4BARMJV4tlcSJMwskClx+tU+NhBbGCj8ZncTK4jNIqAq sXHKDjCbV8BJ4tOaFawQ8+UlZl76DraLU8BZ4uL0VWDjhYBq5p57wA5RLyhxcuYTFoj58hLN W2czT2AUmIUkNQtJagEj0ypGkdTS4tz03GJDveLE3OLSvHS95PzcTYzAWNh27OfmHYzzXn3U O8TIxMF4iFGCg1lJhDewLzlFiDclsbIqtSg/vqg0J7X4EKMp0N0TmaVEk/OB0ZhXEm9oZmBq aGJmaWBqaWasJM7rWdCRKCSQnliSmp2aWpBaBNPHxMEp1cA0RWNy0kGZxCPuqV3rrR79FdO4 H2tw7vvT9E1L7pZL7T27TccoZeW7yA+ZZyed3C48sXHTcSNHRme1iyY6ht+mSJlZewW23nrK VPE/iPOiozh/PpNwiUxM8MLXrNnvb3d8657WzHPzxORlrzsWcBpIHrbSMbijuNrbcd/Hv783 ya6a7TK1/tCXNjuv64239vJr7HmQXKE1ddudnxFnd/hHLT3qY31oqVXtGQfHXcLm3k+PT9YN 40swD/Gdl8BUnnvBJXPb9lyjCzK3w2RKmhx+r9HmlXZcsnWy+/03mvOvrVe9e76H4a3M0VUr m/7O641vm67KOcdva/YNNpsfjiJaBnXHqsprHjSt/Nva126vxFKckWioxVxUnAgAEG4e/A4D AAA= X-CMS-MailID: 20230518140457eucas1p21b5db6f35c3f2c77081eeaf1779ce3ab X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230518140457eucas1p21b5db6f35c3f2c77081eeaf1779ce3ab X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230518140457eucas1p21b5db6f35c3f2c77081eeaf1779ce3ab References: <20230518140448.2001-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: 1684418772969100010 TCP ACK detection is no longer present in igb. Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 96b7335b31..012eb1e1b9 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1327,11 +1327,6 @@ igb_build_rx_metadata(IGBCore *core, trace_e1000e_rx_metadata_ip_id(*ip_id); } =20 - if (l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_TCP && net_rx_pkt_is_tcp_ack(p= kt)) { - *status_flags |=3D E1000_RXD_STAT_ACK; - trace_e1000e_rx_metadata_ack(); - } - if (pkt_info) { *pkt_info =3D rss_info->enabled ? rss_info->type : 0; =20 --=20 2.25.1 From nobody Sat May 18 15:49:39 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=1684418808; cv=none; d=zohomail.com; s=zohoarc; b=dmq1NOrW3A8GtaF4+7xb/h5En1qe9UgJqBOsm9WWdkRBpor3FfAkpiieVTKwmQqGA1kKvmpSKCy0lqiW5ubU5OajlL2ADwPpziJW37oMAnVhC+oCFd8MxIQMw6Yyg3EIGyyn3nknnQCByep6yoCV73TzQoGFiRd9jZP6ojLw0Z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684418808; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EWsco+cJ7x7/FUF1IEPdzJA/MQGvkaw07RGP4KOVkTE=; b=juT+xrlTdsmuwsYwmbJuf48fCPWiqR2tXR8fIlLldobE4QcDon7jmVF9wMMb2jy+MF2WikMJk6Evii7Xvo40iy2alUYXToqeUB9Lg9NbhgUQfjfRxN+lLV054uQsy3e1yPaVjw3oWceBO3FtCGs8CdsWC9/oYHnM80qJHGHFjEc= 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 1684418808071269.96702989880475; Thu, 18 May 2023 07:06:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzeFl-0007Sf-7n; Thu, 18 May 2023 10:05:13 -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 1pzeFk-0007SG-4e for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:12 -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 1pzeFa-0003nl-4N for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:11 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230518140458euoutp01d244a0a968138b21c39e48269bd4a3ba~gQeHaluJN2973729737euoutp01H for ; Thu, 18 May 2023 14:04:58 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230518140458eucas1p13cf7f687ceed0e62514d404b7f592fab~gQeHKnovG1220912209eucas1p10; Thu, 18 May 2023 14:04:58 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 99.B9.37758.A8036646; Thu, 18 May 2023 15:04:58 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230518140458eucas1p27f3f11d5b4572148675bfd08b485813f~gQeG01jOl1798117981eucas1p2K; Thu, 18 May 2023 14:04:58 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230518140458eusmtrp15b89a1228ccb06baac83a5095e5ce210~gQeG0Qw_n3006630066eusmtrp1V; Thu, 18 May 2023 14:04:58 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 93.40.10549.A8036646; Thu, 18 May 2023 15:04:58 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230518140457eusmtip265aadf2d471ebddfd2299ce8f07713aa~gQeGWAcOi0473604736eusmtip2s; Thu, 18 May 2023 14:04:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230518140458euoutp01d244a0a968138b21c39e48269bd4a3ba~gQeHaluJN2973729737euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684418698; bh=EWsco+cJ7x7/FUF1IEPdzJA/MQGvkaw07RGP4KOVkTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G9dee718ubxcaLQyMrxXiGzovf5bYvBpkKv1CphDzvPftvWEaM2CvcSavkjA9I6pi mxrzpofrVcSwOVXWxT8ZINZ9IHsI5SMfzQuvnhCvVAPbaU5K7u7/N0BWfZx3YfU2CA trjevOCqh/tSSIl/mpKJJWSQBuHJBFUgj6R3xXBw= X-AuditID: cbfec7f5-7ffff7000002937e-a8-6466308a0afe 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 v8 2/7] igb: rename E1000E_RingInfo_st Date: Thu, 18 May 2023 16:04:43 +0200 Message-Id: <20230518140448.2001-3-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518140448.2001-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42LZduznOd0ug7QUg94WZYvPp9ayWyy79JnJ onH+HFaLrVd/sFsc793BYtG76QWTA5vHibcHWT0uPDrH7PHk2mYmj/f7rrJ59G1ZxRjAGsVl k5Kak1mWWqRvl8CV8eDIJOaCaXEV/2+sY21g/OnVxcjJISFgIrGy7zhzFyMXh5DACkaJx4vm s0E4Xxgl/vXcg8p8ZpQ4t/spI0zL9aPLoKqWM0qcObIBqqqdSeLr4mXsIFVsAmYSj77MY+1i 5OAQETCW+NguDhJmFkiVOPrnIAuILQxUsv1VA1g5i4CqRMesLlYQm1fASeJL60Z2iGXyEjMv fQezOQWcJS5OX8UIUSMocXLmExaImfISzVtng90gIbCWQ6JlxhomiGYXiZZNfWwQtrDEq+Nb oIbKSJye3MMCYZdL/Dy7jR2iuYVRYs/UyVBF1hKXtv4Ee4BZQFNi/S59iLCjROv/ZjaQsIQA n8SNt4IQN/BJTNo2nRkizCvR0SYEUa0j8W3TTKhqKYmFN+ogwh4SLUcvskxgVJyF5JlZSJ6Z hbB2ASPzKkbx1NLi3PTUYuO81HK94sTc4tK8dL3k/NxNjMAEc/rf8a87GFe8+qh3iJGJg/EQ owQHs5IIb2BfcooQb0piZVVqUX58UWlOavEhRmkOFiVxXm3bk8lCAumJJanZqakFqUUwWSYO TqkGph3POUWqjombTW7yWan8duFVh796eTys9qaHPZ5tWfH1YWo8X79t2/xvM79Uh7Qu8LkZ tNGqKvLzG+ONxwTMLZQDOhWld79eLtq/wc7rs/o2qejjnG122t9P9FzdsryHxcTlRF/14a/F SVGhcUqGbJoXz3321ObdsMfskOjhSgv18jVvr9x0nPdY88uXjeUCk5xLb5xfK9C4+dyX+i8f NvNU/lF6d/wwq8CFNWa7GbbWVrUvi/Pr3fyj9YqXh+bhyyETv2Sdmz0jguOkvrPb2/ub8nca p29kn/4p+OpTwyX6ssIrtdyb/ioe+dA/001K+vdP7Sl/Vp/5H7H47+vO1p2WyZ7LT8fk/rGs q55hkqjEUpyRaKjFXFScCADo5kP4nwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xe7pdBmkpBndW81p8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jAdHJjEX TIur+H9jHWsD40+vLkZODgkBE4nrR5exdTFycQgJLGWUON3UxAyRkJLY1/OfHcIWlvhzrQuq qJVJYnrjPbAiNgEziUdf5rF2MXJwiAiYSjzbKwkSZhbIlDj9ah8biC0MVLL9VQPYHBYBVYmO WV2sIDavgJPEl9aNUPPlJWZe+g5mcwo4S1ycvooRxBYCqpl77gE7RL2gxMmZT1gg5stLNG+d zTyBUWAWktQsJKkFjEyrGEVSS4tz03OLDfWKE3OLS/PS9ZLzczcxAmNh27Gfm3cwznv1Ue8Q IxMH4yFGCQ5mJRHewL7kFCHelMTKqtSi/Pii0pzU4kOMpkB3T2SWEk3OB0ZjXkm8oZmBqaGJ maWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QDU8GHeSuFmVkKDsidqp9oslXfvGyT 7fNFKz/mfXA3dhQr7OZ1kD5yTGbF9DcN94q8c478Dro5+5zLvfWsiW8W9X3uCP4aVnfNzUff a+6V6bkqsj4V5kJrHCaKnU13rEjfnuuUWOkU0dUdsPtVhVrpJq/Hs9/rTFGXWLfw541pXt1O a8xED4XXKEikrGMRvXz7a4Oq3wO5zzfOfz7bMSljUsuMqA/T3FcXtKmpJOqVPWNWkXm+g+PP R9mmrpuzfXelumdXc/7WCeK68/thzFG9/Ze/9cV6yF0//WuN1iIRTtM5MRP023yFeCQezvI+ UhRTstw+SYlpppDWVK1NLyMiHTdFfM2eo/9ec6+LBfdrJZbijERDLeai4kQASMz3Zw4DAAA= X-CMS-MailID: 20230518140458eucas1p27f3f11d5b4572148675bfd08b485813f X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230518140458eucas1p27f3f11d5b4572148675bfd08b485813f X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230518140458eucas1p27f3f11d5b4572148675bfd08b485813f References: <20230518140448.2001-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: 1684418809145100007 Rename E1000E_RingInfo_st and E1000E_RingInfo according to qemu typdefs gui= de. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 34 +++++++++++++++++----------------- hw/net/igb_core.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 78373d7db7..b2e54fe802 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -810,24 +810,24 @@ e1000e_txdesc_writeback(E1000ECore *core, dma_addr_t = base, return e1000e_tx_wb_interrupt_cause(core, queue_idx); } =20 -typedef struct E1000E_RingInfo_st { +typedef struct E1000ERingInfo { int dbah; int dbal; int dlen; int dh; int dt; int idx; -} E1000E_RingInfo; +} E1000ERingInfo; =20 static inline bool -e1000e_ring_empty(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_empty(E1000ECore *core, const E1000ERingInfo *r) { return core->mac[r->dh] =3D=3D core->mac[r->dt] || core->mac[r->dt] >=3D core->mac[r->dlen] / E1000_RING_DESC= _LEN; } =20 static inline uint64_t -e1000e_ring_base(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_base(E1000ECore *core, const E1000ERingInfo *r) { uint64_t bah =3D core->mac[r->dbah]; uint64_t bal =3D core->mac[r->dbal]; @@ -836,13 +836,13 @@ e1000e_ring_base(E1000ECore *core, const E1000E_RingI= nfo *r) } =20 static inline uint64_t -e1000e_ring_head_descr(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_head_descr(E1000ECore *core, const E1000ERingInfo *r) { return e1000e_ring_base(core, r) + E1000_RING_DESC_LEN * core->mac[r->= dh]; } =20 static inline void -e1000e_ring_advance(E1000ECore *core, const E1000E_RingInfo *r, uint32_t c= ount) +e1000e_ring_advance(E1000ECore *core, const E1000ERingInfo *r, uint32_t co= unt) { core->mac[r->dh] +=3D count; =20 @@ -852,7 +852,7 @@ e1000e_ring_advance(E1000ECore *core, const E1000E_Ring= Info *r, uint32_t count) } =20 static inline uint32_t -e1000e_ring_free_descr_num(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_free_descr_num(E1000ECore *core, const E1000ERingInfo *r) { trace_e1000e_ring_free_space(r->idx, core->mac[r->dlen], core->mac[r->dh], core->mac[r->dt]); @@ -871,19 +871,19 @@ e1000e_ring_free_descr_num(E1000ECore *core, const E1= 000E_RingInfo *r) } =20 static inline bool -e1000e_ring_enabled(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_enabled(E1000ECore *core, const E1000ERingInfo *r) { return core->mac[r->dlen] > 0; } =20 static inline uint32_t -e1000e_ring_len(E1000ECore *core, const E1000E_RingInfo *r) +e1000e_ring_len(E1000ECore *core, const E1000ERingInfo *r) { return core->mac[r->dlen]; } =20 typedef struct E1000E_TxRing_st { - const E1000E_RingInfo *i; + const E1000ERingInfo *i; struct e1000e_tx *tx; } E1000E_TxRing; =20 @@ -896,7 +896,7 @@ e1000e_mq_queue_idx(int base_reg_idx, int reg_idx) static inline void e1000e_tx_ring_init(E1000ECore *core, E1000E_TxRing *txr, int idx) { - static const E1000E_RingInfo i[E1000E_NUM_QUEUES] =3D { + static const E1000ERingInfo i[E1000E_NUM_QUEUES] =3D { { TDBAH, TDBAL, TDLEN, TDH, TDT, 0 }, { TDBAH1, TDBAL1, TDLEN1, TDH1, TDT1, 1 } }; @@ -908,13 +908,13 @@ e1000e_tx_ring_init(E1000ECore *core, E1000E_TxRing *= txr, int idx) } =20 typedef struct E1000E_RxRing_st { - const E1000E_RingInfo *i; + const E1000ERingInfo *i; } E1000E_RxRing; =20 static inline void e1000e_rx_ring_init(E1000ECore *core, E1000E_RxRing *rxr, int idx) { - static const E1000E_RingInfo i[E1000E_NUM_QUEUES] =3D { + static const E1000ERingInfo i[E1000E_NUM_QUEUES] =3D { { RDBAH0, RDBAL0, RDLEN0, RDH0, RDT0, 0 }, { RDBAH1, RDBAL1, RDLEN1, RDH1, RDT1, 1 } }; @@ -930,7 +930,7 @@ e1000e_start_xmit(E1000ECore *core, const E1000E_TxRing= *txr) dma_addr_t base; struct e1000_tx_desc desc; bool ide =3D false; - const E1000E_RingInfo *txi =3D txr->i; + const E1000ERingInfo *txi =3D txr->i; uint32_t cause =3D E1000_ICS_TXQE; =20 if (!(core->mac[TCTL] & E1000_TCTL_EN)) { @@ -960,7 +960,7 @@ e1000e_start_xmit(E1000ECore *core, const E1000E_TxRing= *txr) } =20 static bool -e1000e_has_rxbufs(E1000ECore *core, const E1000E_RingInfo *r, +e1000e_has_rxbufs(E1000ECore *core, const E1000ERingInfo *r, size_t total_size) { uint32_t bufs =3D e1000e_ring_free_descr_num(core, r); @@ -1460,7 +1460,7 @@ e1000e_update_rx_stats(E1000ECore *core, size_t pkt_s= ize, size_t pkt_fcs_size) } =20 static inline bool -e1000e_rx_descr_threshold_hit(E1000ECore *core, const E1000E_RingInfo *rxi) +e1000e_rx_descr_threshold_hit(E1000ECore *core, const E1000ERingInfo *rxi) { return e1000e_ring_free_descr_num(core, rxi) =3D=3D e1000e_ring_len(core, rxi) >> core->rxbuf_min_shift; @@ -1521,7 +1521,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, struct iovec *iov =3D net_rx_pkt_get_iovec(pkt); size_t size =3D net_rx_pkt_get_total_len(pkt); size_t total_size =3D size + e1000x_fcs_len(core->mac); - const E1000E_RingInfo *rxi; + const E1000ERingInfo *rxi; size_t ps_hdr_len =3D 0; bool do_ps =3D e1000e_do_ps(core, pkt, &ps_hdr_len); bool is_first =3D true; diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 012eb1e1b9..b6031dea24 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -694,24 +694,24 @@ static uint32_t igb_rx_wb_eic(IGBCore *core, int queu= e_idx) return (ent & E1000_IVAR_VALID) ? BIT(ent & 0x1f) : 0; } =20 -typedef struct E1000E_RingInfo_st { +typedef struct E1000ERingInfo { int dbah; int dbal; int dlen; int dh; int dt; int idx; -} E1000E_RingInfo; +} E1000ERingInfo; =20 static inline bool -igb_ring_empty(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_empty(IGBCore *core, const E1000ERingInfo *r) { return core->mac[r->dh] =3D=3D core->mac[r->dt] || core->mac[r->dt] >=3D core->mac[r->dlen] / E1000_RING_DESC= _LEN; } =20 static inline uint64_t -igb_ring_base(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_base(IGBCore *core, const E1000ERingInfo *r) { uint64_t bah =3D core->mac[r->dbah]; uint64_t bal =3D core->mac[r->dbal]; @@ -720,13 +720,13 @@ igb_ring_base(IGBCore *core, const E1000E_RingInfo *r) } =20 static inline uint64_t -igb_ring_head_descr(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_head_descr(IGBCore *core, const E1000ERingInfo *r) { return igb_ring_base(core, r) + E1000_RING_DESC_LEN * core->mac[r->dh]; } =20 static inline void -igb_ring_advance(IGBCore *core, const E1000E_RingInfo *r, uint32_t count) +igb_ring_advance(IGBCore *core, const E1000ERingInfo *r, uint32_t count) { core->mac[r->dh] +=3D count; =20 @@ -736,7 +736,7 @@ igb_ring_advance(IGBCore *core, const E1000E_RingInfo *= r, uint32_t count) } =20 static inline uint32_t -igb_ring_free_descr_num(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_free_descr_num(IGBCore *core, const E1000ERingInfo *r) { trace_e1000e_ring_free_space(r->idx, core->mac[r->dlen], core->mac[r->dh], core->mac[r->dt]); @@ -755,13 +755,13 @@ igb_ring_free_descr_num(IGBCore *core, const E1000E_R= ingInfo *r) } =20 static inline bool -igb_ring_enabled(IGBCore *core, const E1000E_RingInfo *r) +igb_ring_enabled(IGBCore *core, const E1000ERingInfo *r) { return core->mac[r->dlen] > 0; } =20 typedef struct IGB_TxRing_st { - const E1000E_RingInfo *i; + const E1000ERingInfo *i; struct igb_tx *tx; } IGB_TxRing; =20 @@ -774,7 +774,7 @@ igb_mq_queue_idx(int base_reg_idx, int reg_idx) static inline void igb_tx_ring_init(IGBCore *core, IGB_TxRing *txr, int idx) { - static const E1000E_RingInfo i[IGB_NUM_QUEUES] =3D { + static const E1000ERingInfo i[IGB_NUM_QUEUES] =3D { { TDBAH0, TDBAL0, TDLEN0, TDH0, TDT0, 0 }, { TDBAH1, TDBAL1, TDLEN1, TDH1, TDT1, 1 }, { TDBAH2, TDBAL2, TDLEN2, TDH2, TDT2, 2 }, @@ -800,13 +800,13 @@ igb_tx_ring_init(IGBCore *core, IGB_TxRing *txr, int = idx) } =20 typedef struct E1000E_RxRing_st { - const E1000E_RingInfo *i; + const E1000ERingInfo *i; } E1000E_RxRing; =20 static inline void igb_rx_ring_init(IGBCore *core, E1000E_RxRing *rxr, int idx) { - static const E1000E_RingInfo i[IGB_NUM_QUEUES] =3D { + static const E1000ERingInfo i[IGB_NUM_QUEUES] =3D { { RDBAH0, RDBAL0, RDLEN0, RDH0, RDT0, 0 }, { RDBAH1, RDBAL1, RDLEN1, RDH1, RDT1, 1 }, { RDBAH2, RDBAL2, RDLEN2, RDH2, RDT2, 2 }, @@ -833,7 +833,7 @@ igb_rx_ring_init(IGBCore *core, E1000E_RxRing *rxr, int= idx) static uint32_t igb_txdesc_writeback(IGBCore *core, dma_addr_t base, union e1000_adv_tx_desc *tx_desc, - const E1000E_RingInfo *txi) + const E1000ERingInfo *txi) { PCIDevice *d; uint32_t cmd_type_len =3D le32_to_cpu(tx_desc->read.cmd_type_len); @@ -866,7 +866,7 @@ igb_txdesc_writeback(IGBCore *core, dma_addr_t base, } =20 static inline bool -igb_tx_enabled(IGBCore *core, const E1000E_RingInfo *txi) +igb_tx_enabled(IGBCore *core, const E1000ERingInfo *txi) { bool vmdq =3D core->mac[MRQC] & 1; uint16_t qn =3D txi->idx; @@ -883,7 +883,7 @@ igb_start_xmit(IGBCore *core, const IGB_TxRing *txr) PCIDevice *d; dma_addr_t base; union e1000_adv_tx_desc desc; - const E1000E_RingInfo *txi =3D txr->i; + const E1000ERingInfo *txi =3D txr->i; uint32_t eic =3D 0; =20 if (!igb_tx_enabled(core, txi)) { @@ -918,7 +918,7 @@ igb_start_xmit(IGBCore *core, const IGB_TxRing *txr) } =20 static uint32_t -igb_rxbufsize(IGBCore *core, const E1000E_RingInfo *r) +igb_rxbufsize(IGBCore *core, const E1000ERingInfo *r) { uint32_t srrctl =3D core->mac[E1000_SRRCTL(r->idx) >> 2]; uint32_t bsizepkt =3D srrctl & E1000_SRRCTL_BSIZEPKT_MASK; @@ -930,7 +930,7 @@ igb_rxbufsize(IGBCore *core, const E1000E_RingInfo *r) } =20 static bool -igb_has_rxbufs(IGBCore *core, const E1000E_RingInfo *r, size_t total_size) +igb_has_rxbufs(IGBCore *core, const E1000ERingInfo *r, size_t total_size) { uint32_t bufs =3D igb_ring_free_descr_num(core, r); uint32_t bufsize =3D igb_rxbufsize(core, r); @@ -1522,7 +1522,7 @@ igb_write_to_rx_buffers(IGBCore *core, } =20 static void -igb_update_rx_stats(IGBCore *core, const E1000E_RingInfo *rxi, +igb_update_rx_stats(IGBCore *core, const E1000ERingInfo *rxi, size_t pkt_size, size_t pkt_fcs_size) { eth_pkt_types_e pkt_type =3D net_rx_pkt_get_packet_type(core->rx_pkt); @@ -1540,7 +1540,7 @@ igb_update_rx_stats(IGBCore *core, const E1000E_RingI= nfo *rxi, } =20 static inline bool -igb_rx_descr_threshold_hit(IGBCore *core, const E1000E_RingInfo *rxi) +igb_rx_descr_threshold_hit(IGBCore *core, const E1000ERingInfo *rxi) { return igb_ring_free_descr_num(core, rxi) =3D=3D ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; @@ -1562,7 +1562,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, struct iovec *iov =3D net_rx_pkt_get_iovec(pkt); size_t size =3D net_rx_pkt_get_total_len(pkt); size_t total_size =3D size + e1000x_fcs_len(core->mac); - const E1000E_RingInfo *rxi =3D rxr->i; + const E1000ERingInfo *rxi =3D rxr->i; size_t bufsize =3D igb_rxbufsize(core, rxi); =20 d =3D pcie_sriov_get_vf_at_index(core->owner, rxi->idx % 8); @@ -1643,7 +1643,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, } =20 static bool -igb_rx_strip_vlan(IGBCore *core, const E1000E_RingInfo *rxi) +igb_rx_strip_vlan(IGBCore *core, const E1000ERingInfo *rxi) { if (core->mac[MRQC] & 1) { uint16_t pool =3D rxi->idx % IGB_NUM_VM_POOLS; --=20 2.25.1 From nobody Sat May 18 15:49:39 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=1684418756; cv=none; d=zohomail.com; s=zohoarc; b=ZJLimZRD+XB1Tx/n/JXTu1jN1tI4ON9pz43v4swGinI8ETITfUEgvWJDZfpJr7+NERZsJu+F75AQSbZ2Eq9Gxs9Q4yciIO2HrZ9qhqut33EGHZUfmO2JQ4b0JtaJo3fJjCOhuKf2MurHVZQDUHGwuZPP2FbA5OT+3fiSBzI5cgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684418756; 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=iqRWpzYbLSTI+wnPEVZlRrbYMCTVi9/gOevPrwkRwa4=; b=hg4e41KImB6ed+I0gNW8UV1BSJVwWhOl4zcu35zUAQHSL2I6bqd/NvuutjlSLMm6lCWEH+dxKVGaUXqq2B/SubVD1XJ3+9OFQ9q8qduFV5lD1F9zJtEaV8/Aqhj2PMMJi809E2Xs7jELK3AMtAm6jb89hHGfexdULP5+dVpb6Ro= 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 168441875629481.26593704381776; Thu, 18 May 2023 07:05:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzeFh-0007Qx-4Q; Thu, 18 May 2023 10:05:10 -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 1pzeFe-0007Qe-GN for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:06 -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 1pzeFZ-0003no-Ug for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:06 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230518140459euoutp02e259d581e47f1af81709a65790179420~gQeH4UHsf3087930879euoutp02a for ; Thu, 18 May 2023 14:04:59 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230518140459eucas1p16680ac97e3cbb0369e1b0c85529c746d~gQeHtZCKg0591205912eucas1p1E; Thu, 18 May 2023 14:04:59 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 2F.72.42423.B8036646; Thu, 18 May 2023 15:04:59 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230518140458eucas1p200bea061f622857ab8aa5140b9130515~gQeHUcw5Y1801418014eucas1p2P; Thu, 18 May 2023 14:04:58 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230518140458eusmtrp2ea03a58d4a0c5e5407f777a8823a867e~gQeHT7XSe0300203002eusmtrp2J; Thu, 18 May 2023 14:04:58 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 82.61.14344.A8036646; Thu, 18 May 2023 15:04:58 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230518140458eusmtip247af8e8225a0aee3baafd261ce259b58~gQeGy9sIf2700627006eusmtip24; Thu, 18 May 2023 14:04:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230518140459euoutp02e259d581e47f1af81709a65790179420~gQeH4UHsf3087930879euoutp02a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684418699; bh=iqRWpzYbLSTI+wnPEVZlRrbYMCTVi9/gOevPrwkRwa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m6iUh9tng4ioZdwaQyg1h7EKNbB0C/+duCzsvziP1zSlhGmP5V8QRViY+Qymsadbr HubQQ0tmVt/o6qP/+SMcjeOTljBmRCuAxPWmfCn4uN9dHm9yTzgM4n2MZCSASJ0eYz u7aN+IUPLNNxAKLje5P48niPwuEvRV+q3n4nuFec= X-AuditID: cbfec7f2-a51ff7000002a5b7-1b-6466308bf123 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 v8 3/7] igb: RX descriptors guest writting refactoring Date: Thu, 18 May 2023 16:04:44 +0200 Message-Id: <20230518140448.2001-4-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518140448.2001-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42LZduzned1ug7QUgxl7WSw+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXRtfkNewFS4MrJr5ax9jA+NWyi5GTQ0LARKL71izGLkYuDiGBFYwSF190 QzlfGCUm3GiBcj4zSlw6d5O9i5EDrOX2H12I+HJGiS+9m1ggnHYmiW/fl7OBzGUTMJN49GUe K0iDiICxxMd2cZAws0CqxNE/B1lAbGEBN4mHl4+xgtgsAqoSt8+uA5vPK+AksXKRD8R18hIz L31nB7E5BZwlLk5fxQhi8woISpyc+YQFYqS8RPPW2cwgJ0gI7OCQ2Dx/HgtEs4vE7qbvjBC2 sMSr41vYIWwZif875zNB2OUSP89uY4dobmGU2DN1MlSRtcSlrT/B7mcW0JRYv0sf4ndHiS03 6yBMPokbbwUhTuCTmLRtOjNEmFeio00IYoaOxLdNM9kgwlISC2/UQYQ9JLYsecsygVFxFpJf ZiH5ZRbC1gWMzKsYxVNLi3PTU4sN81LL9YoTc4tL89L1kvNzNzECU8vpf8c/7WCc++qj3iFG Jg7GQ4wSHMxKIryBfckpQrwpiZVVqUX58UWlOanFhxilOViUxHm1bU8mCwmkJ5akZqemFqQW wWSZODilGpj8lSy9/H4m/LVckbwhcHvPvf3rHvxZssdG3vrHDF6z+wbOYj/ilZb/2Xqn6v48 NQXPcvlo7c29le3fZXyCzWR6NfvSt8o+m5uZ+3XZ42yf+drsvRxzvH+eCn3f/KjZ6pPCr8/X 6yeGrJA8k/m0YNumWAm5xKjT7Klfn+5mc1IQ1dliu5NharW96ZQLqxUN0zNXlakdaYj5su3h 87cHkhZp/Lt0O3ap6fvV+1i/TZ1eceb3/B7ms5nH7vTbiZ7UrEmeXbHkxBGt358Saz69r9xu 9Nfr6JIkn66e4kX3p+tPDdaZxPpkm4n/x2VPe3c7JovPk9x+LWVGrOFeVdeAThXZ+OCV8vFn Jj3I8bvjtKNNiaU4I9FQi7moOBEAWcZEVZwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsVy+t/xe7pdBmkpBp8nalt8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jK7Ja9gL lgZXTHy1jrGB8atlFyMHh4SAicTtP7pdjJwcQgJLGSU2n84HsSUEpCT29fxnh7CFJf5c62Lr YuQCqmllkph6YSojSIJNwEzi0Zd5rCBzRARMJZ7tlQQJMwtkSpx+tY8NxBYWcJN4ePkYK4jN IqAqcfvsOnaQcl4BJ4mVi3wgxstLzLz0HWwVp4CzxMXpqxghznGSmHvuAVicV0BQ4uTMJywQ 4+UlmrfOZp7AKDALSWoWktQCRqZVjCKppcW56bnFRnrFibnFpXnpesn5uZsYgVGw7djPLTsY V776qHeIkYmD8RCjBAezkghvYF9yihBvSmJlVWpRfnxRaU5q8SFGU6CzJzJLiSbnA+MwryTe 0MzA1NDEzNLA1NLMWEmc17OgI1FIID2xJDU7NbUgtQimj4mDU6qBqfbi+sL2ewbGESf3+zgK WJs+v/bLM8/7f/TBXiV1xn6tu8/OhHOxO7M8cgjfnt2ioxLsepFr+7PIfboXy058kdc8/OlE uEin3NXkWSHPptzYo6J6dk10w/vzS1MvZS06MquKpzFgMwvn99Ad5ZquBcelvKe85fH2WqC0 1u7Gy6Vn1+grqmu4zQqbMqstP2Li/WCffzddvwe83WW0aM3m2DAXVamdq4rnyrpxrGVQibjg 2BG9Udp2+jkZ/sMa3RfmOC3+Wy92iJ/33TS9d/LTFbI+3fnz5ojsNdcIqUkNgkmzt6esv763 yeflzUcrK2acOzGrhbHrtvve49WcYRcWd/Dc4zAuzbsgmrGo4XrEZiWW4oxEQy3mouJEAN19 cfELAwAA X-CMS-MailID: 20230518140458eucas1p200bea061f622857ab8aa5140b9130515 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230518140458eucas1p200bea061f622857ab8aa5140b9130515 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230518140458eucas1p200bea061f622857ab8aa5140b9130515 References: <20230518140448.2001-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: 1684418758614100003 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 | 178 +++++++++++++++++++++++--------------------- hw/net/igb_regs.h | 10 +-- hw/net/trace-events | 6 +- 3 files changed, 101 insertions(+), 93 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index b6031dea24..c987b26d09 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; + + 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; + } + + if (etqf < 8) { + pkt_type |=3D (BIT(11) >> 4) | etqf; + return pkt_type; + } + + switch (l4hdr_proto) { + case ETH_L4_HDR_PROTO_TCP: + pkt_type |=3D E1000_ADVRXD_PKT_TCP; + break; + case ETH_L4_HDR_PROTO_UDP: + pkt_type |=3D E1000_ADVRXD_PKT_UDP; + break; + case ETH_L4_HDR_PROTO_SCTP: + pkt_type |=3D E1000_ADVRXD_PKT_SCTP; + break; + default: + break; + } + + return pkt_type; +} + static inline void -igb_write_adv_rx_descr(IGBCore *core, union e1000_adv_rx_desc *desc, +igb_write_adv_rx_descr(IGBCore *core, + union e1000_adv_rx_desc *d, struct NetRxPkt *pkt, - const E1000E_RSSInfo *rss_info, uint16_t etqf, bool= ts, + const E1000E_RSSInfo *rss_info, + uint16_t etqf, + bool ts, uint16_t length) { - memset(&desc->wb, 0, sizeof(desc->wb)); + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + uint16_t rss_type =3D 0, pkt_type; + bool eop =3D (pkt !=3D NULL); + memset(&d->wb, 0, sizeof(d->wb)); + + d->wb.upper.length =3D cpu_to_le16(length); + igb_build_rx_metadata_common(core, pkt, eop, + &d->wb.upper.status_error, + &d->wb.upper.vlan); + + if (!eop) { + return; + } + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); =20 - desc->wb.upper.length =3D cpu_to_le16(length); + if ((core->mac[RXCSUM] & E1000_RXCSUM_PCSD) !=3D 0) { + if (rss_info->enabled) { + d->wb.lower.hi_dword.rss =3D cpu_to_le32(rss_info->hash); + rss_type =3D rss_info->type; + trace_igb_rx_metadata_rss(d->wb.lower.hi_dword.rss, rss_type); + } + } else if (hasip4) { + d->wb.upper.status_error |=3D E1000_RXD_STAT_IPIDV; + d->wb.lower.hi_dword.csum_ip.ip_id =3D + cpu_to_le16(net_rx_pkt_get_ip_id(pkt)); + trace_e1000e_rx_metadata_ip_id(d->wb.lower.hi_dword.csum_ip.ip= _id); + } + + if (ts) { + d->wb.upper.status_error |=3D BIT(16); + } =20 - igb_build_rx_metadata(core, pkt, pkt !=3D NULL, - rss_info, etqf, ts, - &desc->wb.lower.lo_dword.pkt_info, - &desc->wb.lower.lo_dword.hdr_info, - &desc->wb.lower.hi_dword.rss, - &desc->wb.upper.status_error, - &desc->wb.lower.hi_dword.csum_ip.ip_id, - &desc->wb.upper.vlan); + pkt_type =3D igb_rx_desc_get_packet_type(core, pkt, etqf); + trace_e1000e_rx_metadata_pkt_type(pkt_type); + d->wb.lower.lo_dword.pkt_info =3D cpu_to_le16(rss_type | (pkt_type << = 4)); } =20 static inline void @@ -1468,8 +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..def651c186 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -277,9 +277,9 @@ igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRIT= E: PHY[%u] UNHANDLED" igb_link_set_ext_params(bool asd_check, bool speed_select_bypass, bool pfr= std) "Set extended link params: ASD check: %d, Speed select bypass: %d, PF = reset done: %d" =20 igb_rx_desc_buff_size(uint32_t b) "buffer size: %u" -igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "addr: 0x%"PRIx64", offset: %u, from: %p, length: %u" +igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from: %p, length:= %u" =20 -igb_rx_metadata_rss(uint32_t rss) "RSS data: 0x%X" +igb_rx_metadata_rss(uint32_t rss, uint16_t rss_pkt_type) "RSS data: rss: 0= x%X, rss_pkt_type: 0x%X" =20 igb_irq_icr_clear_gpie_nsicr(void) "Clearing ICR on read due to GPIE.NSICR= enabled" igb_irq_set_iam(uint32_t icr) "Update IAM: 0x%x" @@ -294,6 +294,8 @@ igb_irq_eitr_set(uint32_t eitr_num, uint32_t val) "EITR= [%u] =3D 0x%x" igb_set_pfmailbox(uint32_t vf_num, uint32_t val) "PFMailbox[%d]: 0x%x" igb_set_vfmailbox(uint32_t vf_num, uint32_t val) "VFMailbox[%d]: 0x%x" =20 +igb_wrn_rx_desc_modes_not_supp(int desc_type) "Not supported descriptor ty= pe: %d" + # igbvf.c igbvf_wrn_io_addr_unknown(uint64_t addr) "IO unknown register 0x%"PRIx64 =20 --=20 2.25.1 From nobody Sat May 18 15:49:39 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=1684418807; cv=none; d=zohomail.com; s=zohoarc; b=bAFCnT7JsazpRrCaIuQ+xRAS/kuVbAGDDDaNtAwy6WLQep80YnRGPSZQ4g/qgYDjhgIuMYAiORtqQ9sicUJRpC9o/jTOOTrRyd42P0OweVOyVWCNNGEswiZJUGX8OzCYG3SwYvH9KlEn3ZvwycR7icDCiwXGV9WTMkNhd2V5GS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684418807; 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=f1n7Pd9rzBXIcwezW9JkV7eDoQriHt9K3lF4QaKeNBA=; b=UklGehR3yZ6TP/tOkYNUibVLtdyN8xfXKLKBo83HHNImEm0rsEhp1Jk4Gbgy8x+5OplHaePE6Wc6kpu8UCoG8rZ9aYYd1ThKlrlzKf8QR0A2zo5EhONec12zUnDkzocxVhy6OcjZP9Z/nH9W8NEKIkY/0PHQnIMku/XKdB9bBdc= 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 1684418807162641.3252358911839; Thu, 18 May 2023 07:06:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzeFv-0007Uc-7O; Thu, 18 May 2023 10:05:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzeFr-0007UQ-Ux for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:20 -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 1pzeFa-0003ns-8o for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:19 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230518140459euoutp0241bb8c2905097cc1d79e85f6a8af3892~gQeITZG9W2931929319euoutp02w for ; Thu, 18 May 2023 14:04:59 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230518140459eucas1p10a3ceab69b581ec0fc98b7822a9a7425~gQeIE_GYd0591205912eucas1p1K; Thu, 18 May 2023 14:04:59 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 00.82.42423.B8036646; Thu, 18 May 2023 15:04:59 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230518140459eucas1p2dafa81561d57fe5aad7d39f786e193f7~gQeHyaDyM2737827378eucas1p2v; Thu, 18 May 2023 14:04:59 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230518140459eusmtrp2c943201b276118f2e7b0aec8c9a2d8f7~gQeHx0isr0224402244eusmtrp2c; Thu, 18 May 2023 14:04:59 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id F2.61.14344.B8036646; Thu, 18 May 2023 15:04:59 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230518140458eusmtip2e625d7178155b48a1417662d8bf7ef5a~gQeHPzbHc0477604776eusmtip23; Thu, 18 May 2023 14:04:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230518140459euoutp0241bb8c2905097cc1d79e85f6a8af3892~gQeITZG9W2931929319euoutp02w DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684418699; bh=f1n7Pd9rzBXIcwezW9JkV7eDoQriHt9K3lF4QaKeNBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h48gXI7LaQNezKBi7kI88f4ssP/DblbPJANN5SejXRIIQ8MfB3meyHENUtLreIpE5 nJ+JlwqNahzndBGv7jN3RndC+0XzzfK/n1jigySrluQeDYJXDPYvugZE7olAKsCqqP 5rbqP42XUe9TdEYPqem9HdGsa8crK5JzGLDv3LT4= X-AuditID: cbfec7f2-a51ff7000002a5b7-20-6466308bc4e6 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 v8 4/7] igb: RX payload guest writting refactoring Date: Thu, 18 May 2023 16:04:45 +0200 Message-Id: <20230518140448.2001-5-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518140448.2001-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA01SbUhTYRTuvfduu0qz69X0oIlk9SM1s5qyUiM1bVSUQv4oCl3uNkWdsbms ILV0s5ba+tC5VX5BKtqXNs1CNJXlRzlzqfmnpBFYpslS/CIq1zXq33Oe85znOQcOidNXOR5k siyDkcvEqT5cR6L55eLAlquBpySBtob1wpm+BzxhtWUGE14sv8MRNg0v8ITdhS2EsLDxM7aH K+qZ6uCI3ljNuOjTyBNMNN02zBUVGetQDOeYY6iESU0+w8i37k5wTLryc457WiM9m9epwnOQ PkKDHEigBGC8fo+nQY4kTdUi0MxXILaYRWC9YlkpZhDotaXo74j1oRpjGzUIjLpJgi3yMZhS LfHsKi4VDNbZMo4GkaQrtQNs+e52GqcYMP3oIOzYhYqA1pFarh0T1Cao0VRz7Ji/zFstJRgb 5g16y/wfSwcqEgZ1dYjVOEOv/hPBenpDbtNt3L4DUEYSPj/WYfZcoPbCI5MT6+MCE91GHovX wa9n5Sv+mbDY38xjZ/MQtBbfXBGFgKVp8c/+OLUZHj3fytLhUD/Wt2LvBKNTzuwKTnCjWYez NB8uq2lW7Q9zjXouS3tA5WgWS4vgYV4z0qL1hv9uMfx3i+FfbAXC65A7o1SkSRnFNhmTGaAQ pymUMmlAYnpaI1r+l1c/u7+3oLsTtoBOhJGoEwGJ+7jyY4sSJTRfIj53npGnx8uVqYyiE3mS hI873y+sN5GmpOIMJoVhTjPyv12MdPDIwUSHws9FBZdtObw9TOOqKjcFTbvJhOFDUq9rt6si P5Tff0Fe8s2ojsgcaj9Tsjo0MjZBndqVtV/Z6vKxoH/hoFwjcA6+ZRlV+qmqNo5dP6qa+jIx uSanjKZ6zUF6hkw58tRLO+fSniT12uWkNdKCuKiDwUrXIebrgEly4UT4ydeSrjm39gTKuhRP y2OiTYbsxePR47my7Z7mQOeasQZ63GaKPyX7EeE/f2JViOkbU0ru7O8SrurQCTJXWxyeXI6b fsbZ9x4VeQ9q1ZUf3tEeObNERbYlpri7QG098DboC1qr2mBrQGNegqDoevP7UrPBnNwW35Ly Lt/Q455U5UMoksTbfHG5QvwbAE2w4J4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xe7rdBmkpBku/clt8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jM5/39gK utIrWg61MjcwznTqYuTkkBAwkXi0ro2pi5GLQ0hgKaPEuuYP7BAJKYl9Pf+hbGGJP9e62CCK WpkkHp6YDZZgEzCTePRlHmsXIweHiICpxLO9kiBhZoFMidOv9rGB2MICThJ7rq0As1kEVCWW dy1jBbF5geKPLk1jgpgvLzHz0newkZwCzhIXp69iBLGFgGrmnnvADlEvKHFy5hMWiPnyEs1b ZzNPYBSYhSQ1C0lqASPTKkaR1NLi3PTcYiO94sTc4tK8dL3k/NxNjMBY2Hbs55YdjCtffdQ7 xMjEwXiIUYKDWUmEN7AvOUWINyWxsiq1KD++qDQntfgQoynQ3ROZpUST84HRmFcSb2hmYGpo YmZpYGppZqwkzutZ0JEoJJCeWJKanZpakFoE08fEwSnVwGTcq/jCrvyco5aCvfjLRgGR2hM2 t2Juu3Vt/+LmsOHA0kOTtWz8wnvVpsr9r5+xz3r3ZAbnq83x52+cdPiS0ujywUiNYzEXw7qQ x5k9s3aIfizkKvjZPG+SXk1oz4NVHVMeLnudrnNo7rkXbL6NG46Jb1q2lsF5S2u0TZ197sYD L6MnSqVWhMWw2m1meTrp9ubT/rsmGLy++HLX307lb8buT8TPb7pkGJXhr/IjQebFXYP1ry9J J83yXDVl87xfEnN+FqkfPHVyYfEK6f3JUysEle4d0/j+7p/cw59zbv41KAgy+z5n+Xm5rGMG l9/qrItyPcc8/e9MvVu9y8ti/GJfLy8p+JS9eura0/b5SVMilFiKMxINtZiLihMBXFQJSg4D AAA= X-CMS-MailID: 20230518140459eucas1p2dafa81561d57fe5aad7d39f786e193f7 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230518140459eucas1p2dafa81561d57fe5aad7d39f786e193f7 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230518140459eucas1p2dafa81561d57fe5aad7d39f786e193f7 References: <20230518140448.2001-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: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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: 1684418808681100002 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 18 ++-- hw/net/igb_core.c | 214 +++++++++++++++++++++++++-------------- tests/qtest/libqos/igb.c | 5 + 3 files changed, 151 insertions(+), 86 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index b2e54fe802..f9ff31fd70 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1418,11 +1418,11 @@ e1000e_write_hdr_to_rx_buffers(E1000ECore *core, } =20 static void -e1000e_write_to_rx_buffers(E1000ECore *core, - hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, - const char *data, - dma_addr_t data_len) +e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core, + hwaddr ba[MAX_PS_BUFFERS], + e1000e_ba_state *bastate, + const char *data, + dma_addr_t data_len) { while (data_len > 0) { uint32_t cur_buf_len =3D core->rxbuf_sizes[bastate->cur_idx]; @@ -1594,8 +1594,10 @@ e1000e_write_packet_to_guest(E1000ECore *core, struc= t NetRxPkt *pkt, while (copy_size) { iov_copy =3D MIN(copy_size, iov->iov_len - iov_ofs); =20 - e1000e_write_to_rx_buffers(core, ba, &bastate, - iov->iov_base + iov_ofs, iov_c= opy); + e1000e_write_payload_frag_to_rx_buffers(core, ba, &bas= tate, + iov->iov_base + + iov_ofs, + iov_copy); =20 copy_size -=3D iov_copy; iov_ofs +=3D iov_copy; @@ -1607,7 +1609,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, =20 if (desc_offset + desc_size >=3D total_size) { /* Simulate FCS checksum presence in the last descript= or */ - e1000e_write_to_rx_buffers(core, ba, &bastate, + e1000e_write_payload_frag_to_rx_buffers(core, ba, &bas= tate, (const char *) &fcs_pad, e1000x_fcs_len(core->ma= c)); } } diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index c987b26d09..7a4a01c4a1 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); + pci_dma_write(d, base, &desc, rx_desc_len); + igb_ring_advance(core, rxi, + rx_desc_len / E1000_MIN_RX_DESC_LEN); + } while (pdma_st.desc_offset < pdma_st.total_size); =20 - igb_update_rx_stats(core, rxi, size, total_size); + igb_update_rx_stats(core, rxi, pdma_st.size, pdma_st.total_size); } =20 static bool diff --git a/tests/qtest/libqos/igb.c b/tests/qtest/libqos/igb.c index a603468beb..f40c4ec4cd 100644 --- a/tests/qtest/libqos/igb.c +++ b/tests/qtest/libqos/igb.c @@ -109,6 +109,11 @@ static void igb_pci_start_hw(QOSGraphObject *obj) E1000_RAH_AV | E1000_RAH_POOL_1 | le16_to_cpu(*(uint16_t *)(address + 4))); =20 + /* Set supported receive descriptor mode */ + e1000e_macreg_write(&d->e1000e, + E1000_SRRCTL(0), + E1000_SRRCTL_DESCTYPE_ADV_ONEBUF); + /* Enable receive */ e1000e_macreg_write(&d->e1000e, E1000_RFCTL, E1000_RFCTL_EXTEN); e1000e_macreg_write(&d->e1000e, E1000_RCTL, E1000_RCTL_EN); --=20 2.25.1 From nobody Sat May 18 15:49:39 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=1684418768; cv=none; d=zohomail.com; s=zohoarc; b=dXk1Nwn89pr6IRHYubJ5H5aJu1Oj6i4b75RTmZpp0/vZTL2XpeNBxChI9a1UzOBhtu80k4AIg/MGygesl040lrSv7ugpyCy+GCjeSJO7fUwfU0JEX1yzoSutBWlTAWbervmhc3kHn3hsdA1ybso6oOp7cATznaBALQY3iCtn/jQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684418768; 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=nEevv5Uux5QBhRz93nfyCQoMbsNGmWbJnhieiq0jaOM=; b=lBXSXCyDlXGfQfvq0Pzjf9FaL/lVh4EdoNZl40w9k6wVqJ6eniKAWNffrssN3AHMj50dX6aYXHXGJwp5G4BtyAKHv8n1Vm3ahs5ysw6XcQ/44ubdtkkwUzU/5oQkDV2cyLUTjn0XvLbblItyjcHGRYCIx8x89vI3S7kwYSN1CZw= 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 1684418767851497.3997517946517; Thu, 18 May 2023 07:06:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzeFj-0007S7-LC; Thu, 18 May 2023 10:05:11 -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 1pzeFi-0007Rl-8X for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:10 -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 1pzeFa-0003ny-46 for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:10 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230518140500euoutp01e75005d5884e5e19e4f17ec46f33c36d~gQeI46l6F3129531295euoutp01a for ; Thu, 18 May 2023 14:05:00 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230518140500eucas1p1943da3e4133e85eb6d851bd6e0a9c919~gQeIm-VZt0128201282eucas1p12; Thu, 18 May 2023 14:05:00 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id DB.B9.37758.B8036646; Thu, 18 May 2023 15:05:00 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230518140459eucas1p24761544eb4d24535fa1e8402925817a0~gQeIQJ5vb1801018010eucas1p2L; Thu, 18 May 2023 14:04:59 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230518140459eusmtrp22c6ffee7aac6d634bc23bb5c0c9d1fbb~gQeIPmTkp0300203002eusmtrp2K; Thu, 18 May 2023 14:04:59 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 63.61.14344.B8036646; Thu, 18 May 2023 15:04:59 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230518140459eusmtip229ab9d38b53baeddc1781fdca2beea1a~gQeHtffm02700627006eusmtip25; Thu, 18 May 2023 14:04:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230518140500euoutp01e75005d5884e5e19e4f17ec46f33c36d~gQeI46l6F3129531295euoutp01a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684418700; bh=nEevv5Uux5QBhRz93nfyCQoMbsNGmWbJnhieiq0jaOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hjrZl+t6fuxkAcumz/njYTjHpgXNm4QAgoUXO4SRLxhWJtCwVRzSdkZoyRgVHcVJW XHaoLE+FRL9kb+rXb4F0dkqn4Z41STSfMxrjmgtsedOrCGBzPN8CQbSZAjSqjvbazB wjd655Linijh/eh9AWrct0EHuOJWSYLGqJMEvnNk= X-AuditID: cbfec7f5-7ffff7000002937e-b0-6466308bae9b 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 v8 5/7] igb: add IPv6 extended headers traffic detection Date: Thu, 18 May 2023 16:04:46 +0200 Message-Id: <20230518140448.2001-6-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518140448.2001-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduznOd0eg7QUg3sPGS0+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXxq+5lQW7uSo+rzvI3MC4hqOLkZNDQsBEYvqFnyxdjFwcQgIrGCWetYI4 nEDOF0aJbRNtIBKfGSVm3jvMDNPx4t49ZojEckaJxqZHrBBOO5PE32MXWEGq2ATMJB59mQdk c3CICBhLfGwXBwkzC6RKHP1zEGyDsICHxN+VLWA2i4CqxLqP98EW8Ao4SZw+u4wNYpm8xMxL 39lBbE4BZ4mL01cxQtQISpyc+YQFYqa8RPPW2WAHSQhs4ZB4uH8jK0Szi8Saif+YIGxhiVfH t7BD2DIS/3fOh4qXS/w8u40dormFUWLP1MlQRdYSl7b+BHuAWUBTYv0ufYiwo8TCSX/BwhIC fBI33gpC3MAnMWnbdGaIMK9ER5sQRLWOxLdNM9kgwlISC2/UQYQ9JFZsesw6gVFxFpJnZiF5 ZhbC2gWMzKsYxVNLi3PTU4uN81LL9YoTc4tL89L1kvNzNzECk8vpf8e/7mBc8eqj3iFGJg7G Q4wSHMxKIryBfckpQrwpiZVVqUX58UWlOanFhxilOViUxHm1bU8mCwmkJ5akZqemFqQWwWSZ ODilGphmbzfdqpr5g2mp4rWi9bK932dznvKyV/qW8NDrTGA6j1OmyMb1hiuuNziE1EqGH2cO ChRgT68I26zaLTQjs+L7hOx8llveIvvPzmM9/22/7xoptrmsP+d0CT941Jd04crdw/FR65wK 9ua8Sl/8JnDyV/MD7umRcSdCbzK+mvo/1iB08rvJjrd+LxZYfip25YzVh88vFlzufm5B9ILM BWyfvnY++nly9qolpyM5nrIau97OEtyjnrfKoZ1tShLjhQXTH57QkXmw6438H82mYOH+v79P eBY0FRVq732RGqz1t/7A1GYhJxvlJkWuqwpin98+1OvuZA5rFJ65RvCH1q4LKY8exP7/eWK2 8CsHDlt9JZbijERDLeai4kQAt/cWCJ0DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7rdBmkpBndvaVt8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jF9zKwt2 c1V8XneQuYFxDUcXIyeHhICJxIt795i7GLk4hASWMkp8O76TFSIhJbGv5z87hC0s8edaFxtE USuTxKPpNxlBEmwCZhKPvswDauDgEBEwlXi2VxIkzCyQKXH61T42EFtYwEPi78oWFhCbRUBV Yt3H+8wgNq+Ak8Tps8vYIObLS8y89B1sF6eAs8TF6avAxgsB1cw994Adol5Q4uTMJywQ8+Ul mrfOZp7AKDALSWoWktQCRqZVjCKppcW56bnFRnrFibnFpXnpesn5uZsYgZGw7djPLTsYV776 qHeIkYmD8RCjBAezkghvYF9yihBvSmJlVWpRfnxRaU5q8SFGU6C7JzJLiSbnA2MxryTe0MzA 1NDEzNLA1NLMWEmc17OgI1FIID2xJDU7NbUgtQimj4mDU6qBafFN5l2Re7/6H7rv+vbUTyHN PY1cN//wNNv+Nk3M/ztpg4r8h7Rtl5YkXOJQO9Noz/xVgP+587Q5b0PuLFqtaHjlh+i5+/6Z wR26/3333rNs2z1BLPj1+Z65nPG2bD3Wt9ZtmrBu/lHemK4azytXNROkz9alhy9daOZrfNUr RLCf52fzkYRFpq86lQ8Y+bqt+nfv/W0B9ctZn0WevDj3oy6jPkJGqrZOs+XSJelvRVdaVvom fDPwTRMWYV/DHZh1xnpeE9On6oMa6kZtrDbJpq8EWrNKj0gcOFzHHsdUcDrAa/Ohkjj/p6tz e1mLObvb+WMrQ9OZZiawcby58mvaxfa9ugdlNT29N/vs/s6txFKckWioxVxUnAgAvV7SFw0D AAA= X-CMS-MailID: 20230518140459eucas1p24761544eb4d24535fa1e8402925817a0 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230518140459eucas1p24761544eb4d24535fa1e8402925817a0 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230518140459eucas1p24761544eb4d24535fa1e8402925817a0 References: <20230518140448.2001-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: 1684418768521100001 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 7a4a01c4a1..c9aa3dcfa8 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1415,7 +1415,9 @@ igb_rx_desc_get_packet_type(IGBCore *core, struct Net= RxPkt *pkt, uint16_t etqf) net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); =20 if (hasip6 && !(core->mac[RFCTL] & E1000_RFCTL_IPV6_DIS)) { - pkt_type =3D E1000_ADVRXD_PKT_IP6; + eth_ip6_hdr_info *ip6hdr_info =3D net_rx_pkt_get_ip6_info(pkt); + pkt_type =3D ip6hdr_info->has_ext_hdrs ? E1000_ADVRXD_PKT_IP6E : + E1000_ADVRXD_PKT_IP6; } else if (hasip4) { pkt_type =3D E1000_ADVRXD_PKT_IP4; } else { diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index 71a8833229..36763f2ff7 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -694,6 +694,7 @@ union e1000_adv_rx_desc { =20 #define E1000_ADVRXD_PKT_IP4 BIT(0) #define E1000_ADVRXD_PKT_IP6 BIT(2) +#define E1000_ADVRXD_PKT_IP6E BIT(3) #define E1000_ADVRXD_PKT_TCP BIT(4) #define E1000_ADVRXD_PKT_UDP BIT(5) #define E1000_ADVRXD_PKT_SCTP BIT(6) --=20 2.25.1 From nobody Sat May 18 15:49:39 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=1684418790; cv=none; d=zohomail.com; s=zohoarc; b=cnHMpt86pROEwqExwJW3GD0sV5F6NyR9ylT8C+mHvY7R6LlD3dna699SeUM1Lqclg1rklnqFo7zToW0Bl618gelnY0lEEz1SNa+esZ+W9HTNVxomZt+q6qr99dqFlSbGn5bUuZrLLw5Oh/i8fgn9tbVAUVEBEjjw1HkgoFbufzs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684418790; 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=4DOEGrcm5uiafy1q5Sko4f1Yc5Z7qcSpJZ72H4yeL7s=; b=N8jbec/ruEn21JKa9Dbg3O/VzRchacmjfCHm45kyb0+Rx0YO1qFd/7DW9O+nEQ6cu95gIC5ViXR3e+yk+kTgHKNrs2Y4t13wqG2sR3o20SR9SBfa1WgjaxMnfR3tIuDy3KJdpsqZ25VgD/nLkDcAulX+dnvRNcOWnrACho9lOik= 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 1684418790626276.0860731951037; Thu, 18 May 2023 07:06:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzeFp-0007Tz-Ta; Thu, 18 May 2023 10:05:17 -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 1pzeFo-0007TB-Cm for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:16 -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 1pzeFZ-0003o8-Vu for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:16 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230518140500euoutp01230f0af70bc31a2d676168a7adbf9b97~gQeJP8sA93129831298euoutp01f for ; Thu, 18 May 2023 14:05:00 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230518140500eucas1p10c9d87d85c7f7a61696266eb5cb98942~gQeJFWHA33167231672eucas1p1B; Thu, 18 May 2023 14:05:00 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 1A.AF.35386.C8036646; Thu, 18 May 2023 15:05:00 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230518140500eucas1p247a4d2921b5d5ddabf93b8bd06ac5776~gQeItDOAj1799417994eucas1p2Q; Thu, 18 May 2023 14:05:00 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230518140500eusmtrp1c673a4df90ac0d9cbc12431795421eab~gQeIsi7mB3006630066eusmtrp1b; Thu, 18 May 2023 14:05:00 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id B5.40.10549.C8036646; Thu, 18 May 2023 15:05:00 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230518140459eusmtip20731524b0a69dd838a00ee4b6e8231ca~gQeIMXulr0631606316eusmtip2m; Thu, 18 May 2023 14:04:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230518140500euoutp01230f0af70bc31a2d676168a7adbf9b97~gQeJP8sA93129831298euoutp01f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684418700; bh=4DOEGrcm5uiafy1q5Sko4f1Yc5Z7qcSpJZ72H4yeL7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W+uiiAJJnocVZ3MUUbwf/11v3ffyALrwvpd0PLxTeRem6JO/ixAkjXNWVL34RUbHd iOa5cBcGZtXMIQKDe8q47BuzDiCMmG+jr7tBNDhUwu1V3gj13BgyTzHOdrLVmUsPDO lsoir22eoUVDvcbrqQ1/QR6dfDh3htcFmUW5LXsI= X-AuditID: cbfec7f4-cc9ff70000028a3a-a3-6466308c2359 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 v8 6/7] igb: packet-split descriptors support Date: Thu, 18 May 2023 16:04:47 +0200 Message-Id: <20230518140448.2001-7-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518140448.2001-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplleLIzCtJLcpLzFFi42LZduzned0eg7QUg2OXlSw+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXxpO+rYwFc+YyVrQ8+sPWwPgtu4uRk0NCwETi3KQGli5GLg4hgRWMEp+n vmaGcL4wSvzcs4YVwvnMKDGr/SMLTMvGB8uhEssZJY4dXgXV384ksWHbUkaQKjYBM4lHX+YB VXFwiAgYS3xsFwcJMwukShz9cxBskLCArcSCVy9YQWwWAVWJ+RsWgrXyCjhJHLm8gQlimbzE zEvf2UFsTgFniYvTV0HVCEqcnPmEBWKmvETz1tlgZ0sI7OCQWPfrGNSlLhIbF/axQdjCEq+O b2GHsGUkTk/ugaopl/h5dhs7RHMLo8SeqZOhiqwlLm39CfYAs4CmxPpd+hBhR4nu9kksIGEJ AT6JG28FIW7gk5i0bTozRJhXoqNNCKJaR+LbpplsEGEpiYU36iDCHhIfl25gmsCoOAvJM7OQ PDMLYe0CRuZVjOKppcW56anFRnmp5XrFibnFpXnpesn5uZsYgSnm9L/jX3YwLn/1Ue8QIxMH 4yFGCQ5mJRHewL7kFCHelMTKqtSi/Pii0pzU4kOM0hwsSuK82rYnk4UE0hNLUrNTUwtSi2Cy TBycUg1MKcH7F3b4v7DlZPtayfU/KqQ+dJscz86FEuya65wm5yWd/qO4amXdXJaXLMq7LpYs VLGLbmVeavXsV3W6jHHSurzsFzPu33D6382oacy0Y7K0ygwFTmaF7duyLx+4rPhx4v/DBp5f KuWLtNJVE4ROdb7icHu2jktE49P7X/n5oTrrmDexr25sbrSY7VUfvPZr+ZvaFpG2+Filhj93 u+dKqx7jD5p3VOfW65VipxYaeNUt5y6pNd9xY/Xi8t1fH5Yf81pieOSqQIt7tdqc47VXOF+K Be6pipNmVPz9K8fX1rmnse2qQ8nEgrce4tM1qlNO53cqXHi+ou/Sp3DBUv82k295XKGcygdK 5vySc1JiKc5INNRiLipOBABwQorLoAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRmVeSWpSXmKPExsVy+t/xe7o9BmkpBqfO81t8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jCd9WxkL 5sxlrGh59IetgfFbdhcjJ4eEgInExgfLWbsYuTiEBJYySjydOpEVIiElsa/nPzuELSzx51oX G0RRK5PExy+nWEASbAJmEo++zANq4OAQETCVeLZXEiTMLJApcfrVPjYQW1jAVmLBqxdgM1kE VCXmb1jICGLzCjhJHLm8gQlivrzEzEvfwXZxCjhLXJy+CqxGCKhm7rkH7BD1ghInZz5hgZgv L9G8dTbzBEaBWUhSs5CkFjAyrWIUSS0tzk3PLTbUK07MLS7NS9dLzs/dxAiMhm3Hfm7ewTjv 1Ue9Q4xMHIyHGCU4mJVEeAP7klOEeFMSK6tSi/Lji0pzUosPMZoC3T2RWUo0OR8Yj3kl8YZm BqaGJmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUysW9bMyrvZuLL1t4/izemV 3YGihja71b+tib7tHhjzq+Gmk41PEtfmiJrrqW+9+2+taTKOPl4j+MY0vlPXVuvKyYNn2FO2 esmxpim33Lr9dem2k6+cWbY/Erb10bn7O2GJJZvevd1K7DyWD457XJfe93vtm+kC9YcbBKW5 2vk2G3Uc3XXg4f6zMy8Kzzu1MPj/nX9x6X9vXNrawaK/YqfclptnkrPFNNuuPP04z+j6I6bG udwXVywNfX3D+9mX7IqdV6xWrouIPXT+/JG/el+DT+f7CpsmfZ29uehasm5UeMyamQs0mYJ/ eL8Lu+OkpBtk4HK9cN6p+f3n3nBqzhPUZ3U8euj5jY9vHIXZ7139ocRSnJFoqMVcVJwIABES ziQPAwAA X-CMS-MailID: 20230518140500eucas1p247a4d2921b5d5ddabf93b8bd06ac5776 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230518140500eucas1p247a4d2921b5d5ddabf93b8bd06ac5776 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230518140500eucas1p247a4d2921b5d5ddabf93b8bd06ac5776 References: <20230518140448.2001-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: 1684418790942100001 Packet-split descriptors are used by Linux VF driver for MTU values from 20= 48 Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 355 ++++++++++++++++++++++++++++++++++++++------ hw/net/igb_regs.h | 9 ++ hw/net/trace-events | 2 +- 3 files changed, 323 insertions(+), 43 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index c9aa3dcfa8..edeb9375e8 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,62 @@ igb_write_adv_rx_descr(IGBCore *core, d->wb.lower.lo_dword.pkt_info =3D cpu_to_le16(rss_type | (pkt_type << = 4)); } =20 +typedef struct IGBSplitDescriptorData { + bool sph; + bool hbo; + size_t hdr_len; +} IGBSplitDescriptorData; + static inline void -igb_write_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, - struct NetRxPkt *pkt, const E1000E_RSSInfo *rss_info, - uint16_t etqf, bool ts, uint16_t length) +igb_write_adv_ps_rx_descr(IGBCore *core, + union e1000_adv_rx_desc *d, + struct NetRxPkt *pkt, + const E1000E_RSSInfo *rss_info, + const E1000ERingInfo *r, + uint16_t etqf, + bool ts, + IGBSplitDescriptorData *ps_desc_data, + IGBPacketRxDMAState *pdma_st) +{ + size_t pkt_len; + size_t hdr_len =3D ps_desc_data->hdr_len; + + if (pdma_st->do_ps) { + pkt_len =3D pdma_st->bastate.written[1]; + } else { + pkt_len =3D pdma_st->bastate.written[0] + pdma_st->bastate.written= [1]; + } + + igb_write_adv_rx_descr(core, d, pkt, rss_info, etqf, ts, pkt_len); + + d->wb.lower.lo_dword.hdr_info =3D (hdr_len << E1000_ADVRXD_HDR_LEN_OFF= SET) & + E1000_ADVRXD_ADV_HDR_LEN_MASK; + d->wb.lower.lo_dword.hdr_info |=3D ps_desc_data->sph ? E1000_ADVRXD_HD= R_SPH + : 0; + d->wb.upper.status_error |=3D ps_desc_data->hbo ? + E1000_ADVRXD_ST_ERR_HBO_OFFSET : 0; +} + +static inline void +igb_write_rx_descr(IGBCore *core, + union e1000_rx_desc_union *desc, + struct NetRxPkt *pkt, + const E1000E_RSSInfo *rss_info, + uint16_t etqf, + bool ts, + IGBSplitDescriptorData *ps_desc_data, + IGBPacketRxDMAState *pdma_st, + const E1000ERingInfo *r) { if (igb_rx_use_legacy_descriptor(core)) { - igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, length= ); + igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, + pdma_st->bastate.written[1]); + } else if (igb_rx_use_ps_descriptor(core, r)) { + igb_write_adv_ps_rx_descr(core, &desc->adv, pkt, rss_info, r, etqf= , ts, + ps_desc_data, pdma_st); } else { igb_write_adv_rx_descr(core, &desc->adv, pkt, rss_info, - etqf, ts, length); + etqf, ts, pdma_st->bastate.written[1]); } } =20 @@ -1564,26 +1665,182 @@ igb_rx_descr_threshold_hit(IGBCore *core, const E1= 000ERingInfo *rxi) ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; } =20 +static bool +igb_do_ps(IGBCore *core, + const E1000ERingInfo *r, + struct NetRxPkt *pkt, + size_t *hdr_len, + IGBSplitDescriptorData *ps_desc_data) +{ + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + bool fragment; + bool split_always; + size_t bheader_size; + size_t total_pkt_len; + + if (!igb_rx_use_ps_descriptor(core, r)) { + return false; + } + + memset(ps_desc_data, 0, sizeof(IGBSplitDescriptorData)); + + total_pkt_len =3D net_rx_pkt_get_total_len(pkt); + bheader_size =3D igb_rxhdrbufsize(core, r); + split_always =3D igb_rx_ps_descriptor_split_always(core, r); + if (split_always && total_pkt_len <=3D bheader_size) { + *hdr_len =3D total_pkt_len; + ps_desc_data->hdr_len =3D total_pkt_len; + return true; + } + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); + + if (hasip4) { + fragment =3D net_rx_pkt_get_ip4_info(pkt)->fragment; + } else if (hasip6) { + fragment =3D net_rx_pkt_get_ip6_info(pkt)->fragment; + } else { + ps_desc_data->hdr_len =3D bheader_size; + goto header_not_handled; + } + + if (fragment && (core->mac[RFCTL] & E1000_RFCTL_IPFRSP_DIS)) { + ps_desc_data->hdr_len =3D bheader_size; + goto header_not_handled; + } + + /* no header splitting for SCTP */ + if (!fragment && (l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_UDP || + l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_TCP)) { + *hdr_len =3D net_rx_pkt_get_l5_hdr_offset(pkt); + } else { + *hdr_len =3D net_rx_pkt_get_l4_hdr_offset(pkt); + } + + ps_desc_data->sph =3D true; + ps_desc_data->hdr_len =3D *hdr_len; + + if (*hdr_len > bheader_size) { + ps_desc_data->hbo =3D true; + goto header_not_handled; + } + + return true; + +header_not_handled: + if (split_always) { + *hdr_len =3D bheader_size; + return true; + } + + return false; +} + static void igb_truncate_to_descriptor_size(IGBPacketRxDMAState *pdma_st, size_t *size) { - if (*size > pdma_st->rx_desc_packet_buf_size) { - *size =3D pdma_st->rx_desc_packet_buf_size; + if (pdma_st->do_ps && pdma_st->is_first) { + if (*size > pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_len= ) { + *size =3D pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_l= en; + } + } else { + if (*size > pdma_st->rx_desc_packet_buf_size) { + *size =3D pdma_st->rx_desc_packet_buf_size; + } + } +} + +static inline void +igb_write_hdr_frag_to_rx_buffers(IGBCore *core, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + const char *data, + dma_addr_t data_len) +{ + assert(data_len <=3D pdma_st->rx_desc_header_buf_size - + pdma_st->bastate.written[0]); + pci_dma_write(d, + pdma_st->ba[0] + pdma_st->bastate.written[0], + data, data_len); + pdma_st->bastate.written[0] +=3D data_len; + pdma_st->bastate.cur_idx =3D 1; +} + +static void +igb_write_header_to_rx_buffers(IGBCore *core, + struct NetRxPkt *pkt, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + size_t *copy_size) +{ + size_t iov_copy; + size_t ps_hdr_copied =3D 0; + + if (!pdma_st->is_first) { + /* Leave buffer 0 of each descriptor except first */ + /* empty */ + pdma_st->bastate.cur_idx =3D 1; + return; } + + do { + iov_copy =3D MIN(pdma_st->ps_hdr_len - ps_hdr_copied, + pdma_st->iov->iov_len - pdma_st->iov_ofs); + + igb_write_hdr_frag_to_rx_buffers(core, d, pdma_st, + pdma_st->iov->iov_base, + iov_copy); + + *copy_size -=3D iov_copy; + ps_hdr_copied +=3D iov_copy; + + pdma_st->iov_ofs +=3D iov_copy; + if (pdma_st->iov_ofs =3D=3D pdma_st->iov->iov_len) { + pdma_st->iov++; + pdma_st->iov_ofs =3D 0; + } + } while (ps_hdr_copied < pdma_st->ps_hdr_len); + + pdma_st->is_first =3D false; } =20 static void igb_write_payload_frag_to_rx_buffers(IGBCore *core, PCIDevice *d, - hwaddr ba, - uint16_t *written, - uint32_t cur_buf_len, + IGBPacketRxDMAState *pdma_st, const char *data, dma_addr_t data_len) { - trace_igb_rx_desc_buff_write(ba, *written, data, data_len); - pci_dma_write(d, ba + *written, data, data_len); - *written +=3D data_len; + while (data_len > 0) { + assert(pdma_st->bastate.cur_idx < IGB_MAX_PS_BUFFERS); + + uint32_t cur_buf_bytes_left =3D + pdma_st->rx_desc_packet_buf_size - + pdma_st->bastate.written[pdma_st->bastate.cur_idx]; + uint32_t bytes_to_write =3D MIN(data_len, cur_buf_bytes_left); + + trace_igb_rx_desc_buff_write( + pdma_st->bastate.cur_idx, + pdma_st->ba[pdma_st->bastate.cur_idx], + pdma_st->bastate.written[pdma_st->bastate.cur_idx], + data, + bytes_to_write); + + pci_dma_write(d, + pdma_st->ba[pdma_st->bastate.cur_idx] + + pdma_st->bastate.written[pdma_st->bastate.cur_idx], + data, bytes_to_write); + + pdma_st->bastate.written[pdma_st->bastate.cur_idx] +=3D bytes_to_w= rite; + data +=3D bytes_to_write; + data_len -=3D bytes_to_write; + + if (pdma_st->bastate.written[pdma_st->bastate.cur_idx] =3D=3D + pdma_st->rx_desc_packet_buf_size) { + pdma_st->bastate.cur_idx++; + } + } } =20 static void @@ -1600,9 +1857,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 +1873,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 +1887,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 +1901,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 +1923,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 +1940,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 +1956,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 +1964,13 @@ igb_write_packet_to_guest(IGBCore *core, struct NetR= xPkt *pkt, is_last =3D true; } =20 - igb_write_rx_descr(core, &desc, is_last ? core->rx_pkt : NULL, - rss_info, etqf, ts, pdma_st.written); + igb_write_rx_descr(core, &desc, + is_last ? pkt : NULL, + rss_info, + etqf, ts, + &ps_desc_data, + &pdma_st, + rxi); pci_dma_write(d, base, &desc, rx_desc_len); igb_ring_advance(core, rxi, rx_desc_len / E1000_MIN_RX_DESC_LEN); diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index 36763f2ff7..ed7427b8fe 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -452,6 +452,7 @@ union e1000_adv_rx_desc { #define E1000_SRRCTL_BSIZEHDRSIZE_MASK 0x00000F00 #define E1000_SRRCTL_BSIZEHDRSIZE_SHIFT 2 /* Shift _left_ */ #define E1000_SRRCTL_DESCTYPE_ADV_ONEBUF 0x02000000 +#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT 0x04000000 #define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS 0x0A000000 #define E1000_SRRCTL_DESCTYPE_MASK 0x0E000000 #define E1000_SRRCTL_DROP_EN 0x80000000 @@ -699,6 +700,14 @@ union e1000_adv_rx_desc { #define E1000_ADVRXD_PKT_UDP BIT(5) #define E1000_ADVRXD_PKT_SCTP BIT(6) =20 +#define IGB_MAX_PS_BUFFERS 2 + +#define E1000_ADVRXD_HDR_LEN_OFFSET (21 - 16) +#define E1000_ADVRXD_ADV_HDR_LEN_MASK ((BIT(10) - 1) << \ + E1000_ADVRXD_HDR_LEN_OFFSET) +#define E1000_ADVRXD_HDR_SPH BIT(15) +#define E1000_ADVRXD_ST_ERR_HBO_OFFSET BIT(3 + 20) + static inline uint8_t igb_ivar_entry_rx(uint8_t i) { return i < 8 ? i * 4 : (i - 8) * 4 + 2; diff --git a/hw/net/trace-events b/hw/net/trace-events index def651c186..e97e9dc17b 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -277,7 +277,7 @@ igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRIT= E: PHY[%u] UNHANDLED" igb_link_set_ext_params(bool asd_check, bool speed_select_bypass, bool pfr= std) "Set extended link params: ASD check: %d, Speed select bypass: %d, PF = reset done: %d" =20 igb_rx_desc_buff_size(uint32_t b) "buffer size: %u" -igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from: %p, length:= %u" +igb_rx_desc_buff_write(uint8_t idx, uint64_t addr, uint16_t offset, const = void* source, uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from= : %p, length: %u" =20 igb_rx_metadata_rss(uint32_t rss, uint16_t rss_pkt_type) "RSS data: rss: 0= x%X, rss_pkt_type: 0x%X" =20 --=20 2.25.1 From nobody Sat May 18 15:49:39 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=1684418770; cv=none; d=zohomail.com; s=zohoarc; b=LNe99CHQrOOXC4bG2y71038Zno6ZCyJZ3FZzb9oAfUIn8LNP+sVYKC9xEwragWIPXO9k8nz8ft44Np2Qwck2+y6s4GoSPeB102Eigt6QkXzyqh8wb4DTX/GFH9faZbDJzhFGbdm3G0VJDmUmPnqVvlw4GRkKonCE6t5DWiLH534= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684418770; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+EdCytTyEcIMBTi04ruCKz6tQx+pv46CQ6JPHaJIiNw=; b=Taid7H+g+HWuQ8L5c1+H4Kim0TybW/AQJ1Y+7qJyTUoIfWZkG/CjvmTEl0mOEVCnpLIeCymada/dpdofVFJ7dpCJwxF51NswHQqX/NTbzf13MhBsjo1EoVR3716pXfTuXptubtuib+ut4b4G4a0K9kaMIfMI7uD8u+ugr6De17M= 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 1684418769928720.0519414870463; Thu, 18 May 2023 07:06:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzeFq-0007U2-K9; Thu, 18 May 2023 10:05:18 -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 1pzeFo-0007TX-Sh for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:16 -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 1pzeFa-0003oZ-MX for qemu-devel@nongnu.org; Thu, 18 May 2023 10:05:16 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230518140501euoutp026b169745970b37e7178bebbc3b09a172~gQeJ5bz682928729287euoutp02D for ; Thu, 18 May 2023 14:05:01 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230518140501eucas1p1b5537dc823473ea3e588b66039cbee0b~gQeJpKRKL1421314213eucas1p1b; Thu, 18 May 2023 14:05:01 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 8A.AF.35386.D8036646; Thu, 18 May 2023 15:05:01 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230518140500eucas1p1f92e6605c8a68a68d564ef5ad5de66dd~gQeJKySbu0591205912eucas1p1N; Thu, 18 May 2023 14:05:00 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230518140500eusmtrp1d285209af9287c3ee3092c26d823d359~gQeJKRDKA3006630066eusmtrp1c; Thu, 18 May 2023 14:05:00 +0000 (GMT) Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 46.40.10549.C8036646; Thu, 18 May 2023 15:05:00 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230518140500eusmtip256b469c720fd64bb0ba23700b407c106~gQeIsdfjo2700627006eusmtip26; Thu, 18 May 2023 14:05:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230518140501euoutp026b169745970b37e7178bebbc3b09a172~gQeJ5bz682928729287euoutp02D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1684418701; bh=+EdCytTyEcIMBTi04ruCKz6tQx+pv46CQ6JPHaJIiNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oyl6LZ/M4c9DPLD6+KniV3Fhs9jf7kiidZ7kF8V7TxyqW1w5pkj/Rt12h5Uo5bhoQ 6lkPsViNdstCqyYri2eobKb4+znI4wY+gHCnO/CcrGWOF2cFFGZREN6vWrTx45F8mr 0KScaMTl2eQhFVHSvCuH30PeVBQ5tHWBXt7utSLU= X-AuditID: cbfec7f4-cdfff70000028a3a-a4-6466308d6166 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 v8 7/7] e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_rx_buffers Date: Thu, 18 May 2023 16:04:48 +0200 Message-Id: <20230518140448.2001-8-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518140448.2001-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42LZduzned1eg7QUg0kt/BafT61lt1h26TOT ReP8OawWW6/+YLc43ruDxaJ30wsmBzaPE28PsnpceHSO2ePJtc1MHu/3XWXz6NuyijGANYrL JiU1J7MstUjfLoEr4913noJdMhUnms4xNzB+4+9i5OSQEDCR+L/qIWsXIxeHkMAKRon+F++Y IJwvjBJTfj9jhnA+M0rMv/iHDaZlx55fUInljBI/uj4wQjjtTBJrF81iAqliEzCTePRlHtBg Dg4RAWOJj+3iIGFmgVSJo38OsoDYwgLREo2LFrCD2CwCqhKdr6eA2bwCThLXLp9igVgmLzHz 0newOKeAs8TF6asYIWoEJU7OfMICMVNeonnrbLCDJAS2cEh0PrvHCNHsIvFy8REmCFtY4tXx LewQtozE6ck9UAvKJX6e3cYO0dzCKLFn6mSoImuJS1t/gj3ALKApsX6XPkTYUeLs0QY2kLCE AJ/EjbeCEDfwSUzaNp0ZIswr0dEmBFGtI/Ft00yoaimJhTfqIMIeEhdW32CewKg4C8kzs5A8 Mwth7QJG5lWM4qmlxbnpqcVGeanlesWJucWleel6yfm5mxiB6eX0v+NfdjAuf/VR7xAjEwfj IUYJDmYlEd7AvuQUId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rzatieThQTSE0tSs1NTC1KLYLJM HJxSDUxCp8OP61ySaCnUmii0muuCZflEXfMPhlEf7f7ydF5do3NwcnX3nVVF952PXm5896Iv u1Lj14FTtQ6dc/wWpqTvWcUZkRDyxP9Uy7LpBi3N2tcmes62TJb/3fbBec/CCTfZzkk9fedu MeHXrlAGoXNJXlkqS7PMpxqXcTx2y9jmbbqXu7Cst23t7xuBZ7/88jvpmrpl9gujrbPU3s1p mvbq4IuWOtucosa9t56FvXmreXrWvx/+VaX/2L18kj45fQvuW9p6s35vxKef+kxiMqlnjdjy Vijo6cz9xrX8eQCf+4Vas801mqEbBAInTFIVP3bRVPk8H5eobhCrq/29bg2P+zfu/5r2/1a7 obxi7xIlluKMREMt5qLiRABH/WSTngMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xe7o9BmkpBv+X6Vp8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jHffeQp2 yVScaDrH3MD4jb+LkZNDQsBEYseeX8xdjFwcQgJLGSU+/b3DBJGQktjX858dwhaW+HOtiw2i qJVJ4uSv9WwgCTYBM4lHX+axdjFycIgImEo82ysJEmYWyJQ4/WofWImwQKTE7C6IchYBVYnO 11PAZvIKOElcu3yKBWK+vMTMS9/B4pwCzhIXp69iBLGFgGrmnnsAVS8ocXLmExaI+fISzVtn M09gFJiFJDULSWoBI9MqRpHU0uLc9NxiQ73ixNzi0rx0veT83E2MwEjYduzn5h2M81591DvE yMTBeIhRgoNZSYQ3sC85RYg3JbGyKrUoP76oNCe1+BCjKdDdE5mlRJPzgbGYVxJvaGZgamhi ZmlgamlmrCTO61nQkSgkkJ5YkpqdmlqQWgTTx8TBKdXAdPz8n8rY7Vaz/GbvmHOzsIF72j1p zsX7/nQybuhR2JgjG956P5ffbMG9H1u23P1e3nB/Y3p89f/DUzL37FNYfV3VTFKpwUlX+Z3Z umO+ascqu70OZprlBF/uZfth7ixvfe9WWZ9uVOun3NVTlrYXu+x/Eb5pynUrrU1PjW+sSNzg 8MLgVNm84Ayzb1d9K39+2aO4vpOTu6i4hUlwep596r1nOgbit05v3rrrhhhrTTmPxYFfPAm3 bk16GXxoZVIu+3sHZt5HD7+slZn+/IBO4a+oOf4XPnFMs+/ZEb792Qz76ZO2zKmYxLRoaZ2B cYzNolAx0Rd5gUs3T/y/uqzzuPmL8jcBFp5z533ef+f3uTYlluKMREMt5qLiRACUcGtjDQMA AA== X-CMS-MailID: 20230518140500eucas1p1f92e6605c8a68a68d564ef5ad5de66dd X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230518140500eucas1p1f92e6605c8a68a68d564ef5ad5de66dd X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230518140500eucas1p1f92e6605c8a68a68d564ef5ad5de66dd References: <20230518140448.2001-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: 1684418770986100005 Rename e1000e_ba_state according and e1000e_write_hdr_to_rx_buffers for consistency with IGB. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index f9ff31fd70..62c5dcfda5 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1397,17 +1397,17 @@ e1000e_pci_dma_write_rx_desc(E1000ECore *core, dma_= addr_t addr, } } =20 -typedef struct e1000e_ba_state_st { +typedef struct E1000EBAState { uint16_t written[MAX_PS_BUFFERS]; uint8_t cur_idx; -} e1000e_ba_state; +} E1000EBAState; =20 static inline void -e1000e_write_hdr_to_rx_buffers(E1000ECore *core, - hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, - const char *data, - dma_addr_t data_len) +e1000e_write_hdr_frag_to_rx_buffers(E1000ECore *core, + hwaddr ba[MAX_PS_BUFFERS], + E1000EBAState *bastate, + const char *data, + dma_addr_t data_len) { assert(data_len <=3D core->rxbuf_sizes[0] - bastate->written[0]); =20 @@ -1420,7 +1420,7 @@ e1000e_write_hdr_to_rx_buffers(E1000ECore *core, static void e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core, hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, + E1000EBAState *bastate, const char *data, dma_addr_t data_len) { @@ -1530,7 +1530,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, =20 do { hwaddr ba[MAX_PS_BUFFERS]; - e1000e_ba_state bastate =3D { { 0 } }; + E1000EBAState bastate =3D { { 0 } }; bool is_last =3D false; =20 desc_size =3D total_size - desc_offset; @@ -1568,8 +1568,10 @@ e1000e_write_packet_to_guest(E1000ECore *core, struc= t NetRxPkt *pkt, iov_copy =3D MIN(ps_hdr_len - ps_hdr_copied, iov->iov_len - iov_ofs); =20 - e1000e_write_hdr_to_rx_buffers(core, ba, &bast= ate, - iov->iov_base, iov_c= opy); + e1000e_write_hdr_frag_to_rx_buffers(core, ba, + &bastate, + iov->iov_b= ase, + iov_copy); =20 copy_size -=3D iov_copy; ps_hdr_copied +=3D iov_copy; @@ -1585,8 +1587,8 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, } else { /* Leave buffer 0 of each descriptor except first = */ /* empty as per spec 7.1.5.1 = */ - e1000e_write_hdr_to_rx_buffers(core, ba, &bastate, - NULL, 0); + e1000e_write_hdr_frag_to_rx_buffers(core, ba, &bas= tate, + NULL, 0); } } =20 --=20 2.25.1