From nobody Fri May 17 17:00:10 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=1683707057; cv=none; d=zohomail.com; s=zohoarc; b=bp/oUP6i+PDvTNqrbijlbOyGukk5rDl3E6uBq4Ey4s35UbaUg+kMey/8t6uskNRWZ7cVupdOYBbtgey8ktGI+cCt1AwMu/GZyKFJgcIqBHcf1Um6qks8+gZyv6o20SblTLSTe7rKO4bThbRdG1NjLvFn9hzw5HV+NBcwcZk8m5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683707057; 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=cZEvikfqLrLi68+uMAyQ4maxFd31wPckKezASg4mfhyiK/GdYyQV3Fy6rjSSr/MoJmkrPfwj3XTsoQNVS9vpOxtAkBN8a0igdvW/mPv1fI4cqK+K8jb1AO7geuVS4UtNCYS5tsjFvZ8ps0Ud8KBcR466QHK3iJZChQfv/ZdNMDc= 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 1683707056150452.3830814875787; Wed, 10 May 2023 01:24:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwf6P-0005rJ-2g; Wed, 10 May 2023 04:23: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 1pwf6M-0005qz-QM for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23: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 1pwf6J-0007gI-Ll for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23:10 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230510082301euoutp01bce6543df3469359bd29f16b68a9d81f~dupQ-mukl2212822128euoutp01H for ; Wed, 10 May 2023 08:23:01 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230510082301eucas1p239e59ce8266b620e5f1477651ea7c95b~dupQnH2AE2230922309eucas1p2i; Wed, 10 May 2023 08:23:01 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id AE.F5.37758.5645B546; Wed, 10 May 2023 09:23:01 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230510082300eucas1p2638a9dadc30c51f749fee6edf2377302~dupQMFC921626316263eucas1p2N; Wed, 10 May 2023 08:23:00 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230510082300eusmtrp26224d6aa76923f6c19534a8351d92bed~dupQLKKj61369213692eusmtrp2T; Wed, 10 May 2023 08:23:00 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 57.B3.14344.4645B546; Wed, 10 May 2023 09:23:00 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230510082300eusmtip1d839c289fb50ee3caa6f296cbb6381d3~dupPrqVtG2198721987eusmtip11; Wed, 10 May 2023 08:23:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230510082301euoutp01bce6543df3469359bd29f16b68a9d81f~dupQ-mukl2212822128euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683706981; bh=RAdTRgkb5cVy6FP5ribk2kxIlvYd4xCVAvY0Bobfcq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sGoryFFxJCxRsS5ynLiSS5kPuO5gmzqEfG1o/VAEFrfV8ebO7vuKTpjJA5tyMu3qO QXhv0qDv+NGFbjLGVZaETPyfFILNLlJ9DLmqcjvDSfxwHRiXJRDwoaPVF5baDiWRls ew5uZh1SOacO8HnmybO3IRfW+MpR1ZRB8lwNmJhU= X-AuditID: cbfec7f5-815ff7000002937e-0e-645b5465dda3 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 v5 1/6] igb: remove TCP ACK detection Date: Wed, 10 May 2023 10:22:49 +0200 Message-Id: <20230510082254.1036-2-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230510082254.1036-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduznOd3UkOgUg/YHHBafT61lt1h26TOT ReP8OawWW6/+YLc43ruDxaJ30wsmBzaPE28PsnpceHSO2ePJtc1MHu/3XWXz6NuyijGANYrL JiU1J7MstUjfLoEr49urTSwFt1kr3l25yNTAuIeli5GTQ0LAROLC/J1MXYxcHEICKxglDi3d ygrhfGGUuLd4ARtIlZDAZ0aJq28SYTrWzTrLChFfDlS0zgWioZ1Jon35RHaQBJuAmcSjL/OA ijg4RASMJT62i4OEmQVSJY7+OQi2WVjAVGLSzSNgc1gEVCU2zT3JDGLzCjhJTPi/Ceo6eYmZ l76DjeQUcJbYO6eVFaJGUOLkzCcsEDPlJZq3zmYGuUFCYC2HxKoHb9ggml0k1l1ZDzVIWOLV 8S3sELaMxP+d85kg7HKJn2e3sUM0tzBK7Jk6GarIWuLS1p9gDzALaEqs36UPEXaUmL3tJSNI WEKAT+LGW0GIG/gkJm2bzgwR5pXoaBOCqNaR+LZpJhtEWEpi4Y06iLAHUHg2+wRGxVlInpmF 5JlZCGsXMDKvYhRPLS3OTU8tNs5LLdcrTswtLs1L10vOz93ECEwup/8d/7qDccWrj3qHGJk4 GA8xSnAwK4nweodGpQjxpiRWVqUW5ccXleakFh9ilOZgURLn1bY9mSwkkJ5YkpqdmlqQWgST ZeLglGpgSptuWfPrT+KZmeHtvN+Tn157r+4++faTW7Kcpt+VfZ/ImYQtvL/Z7cFKxtjEb2pa LOKG0Rsm/Fm2e+meK9uMtySKLo3/FyZu+8W9JXb3fmcO/k8n4uVlH+yaN/UoB4/+ec0JxhmP I4sk55zw/j/Rcq6J5NorVyfvZWZfE2X2v2Fm0yvG+v/563YUPtbaqh71WYFl496KO1ef/TcW 4VFx0UrYtP5ewbQXsnOyZ6x1mBbySHTqHycJ5taS91e/ntzRc+LZ6s5NaWebfOWl/Br+XHhs efN51tLp4mxFs4IjlFaaOsebxLLz3Gr667jnzE13nZU5PNefH5QtiN8nu8ns9rYjeYnSd7+u KpkR2rjN84YSS3FGoqEWc1FxIgCiLi1rnQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xu7opIdEpBhMuaVp8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jG+vNrEU 3GateHflIlMD4x6WLkZODgkBE4l1s86ydjFycQgJLGWUuH1jGTNEQkpiX89/dghbWOLPtS42 iKJWJonpW7YxgiTYBMwkHn2ZB9TNwSEiYCrxbK8kSJhZIFPi9Kt9bCC2MFB40s0jrCA2i4Cq xKa5J8Hm8wo4SUz4vwnqCHmJmZe+g+3iFHCW2DunFaxeCKhm1oo1UPWCEidnPmGBmC8v0bx1 NvMERoFZSFKzkKQWMDKtYhRJLS3OTc8tNtIrTswtLs1L10vOz93ECIyFbcd+btnBuPLVR71D jEwcjIcYJTiYlUR4vUOjUoR4UxIrq1KL8uOLSnNSiw8xmgLdPZFZSjQ5HxiNeSXxhmYGpoYm ZpYGppZmxkrivJ4FHYlCAumJJanZqakFqUUwfUwcnFINTA6+hx3fG2jN0xBSCrM7e5Bp6l3h jX+dD/V7v9viEr1z5sZc6+KIvdYnFKYXnTou+sr6Zv6kqqV7tu2bcCuwxe7g6cXs8pr3vHPf p3Xvq9pXF2kVtUGtyErjUYBmyruzmWet10xtVFj57JWzXeXXSbHKyRXhhX0zdXe+9Nf4Ksjw Z+s7zb1tCk45XZXHHh+Q2L9v51fdFS5hbnXcp54UelXzHKj8ECnE1D/LWCMxVe7llRBfTa31 D8VfCN12E33xqe7tnC2rXvye9nWzFr/nj8nqTE+5bfakWqddbHmYE+b7/2nOmmbZTYtLXnle lQkK0XZRX35O6p1y2JUWT9vDHHuZQ+46ClxeZPdOyJQ9UomlOCPRUIu5qDgRAFEAd8oOAwAA X-CMS-MailID: 20230510082300eucas1p2638a9dadc30c51f749fee6edf2377302 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230510082300eucas1p2638a9dadc30c51f749fee6edf2377302 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230510082300eucas1p2638a9dadc30c51f749fee6edf2377302 References: <20230510082254.1036-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: 1683707057638100003 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 Fri May 17 17:00:10 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=1683707060; cv=none; d=zohomail.com; s=zohoarc; b=koxtnW8MKUKT0WqpcT1SeZLVyqzbFSAna0wmgOYuQHSuh5F7kYe4uEdi1n0iXKMENSmEqCthCdLr88vk//ERelH4i9x6WB4TRUad7IigCbt3oPRm0WqlGqPnu9gCGGtVUkA54MAR31iFGutYHBG1pGMoHpHTUHs5E2IzfF1nwVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683707060; 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=OTexzbA8FT40rk8JDotKcH/HBwprnCDQPxlC5Mc7/K1SmbpQwXYsFmtuhMkgAd+G7+/1vbTbXviXX4iIa5FTr5XzJHkz7xgTtl1ih0dw9TPcj7U+atKpoAR+nF7/ihyB+ZcfyA84I4rnNZw1yNFX+IbVlP4P4GNrsOekS9nAOTI= 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 1683707060042580.6890452035404; Wed, 10 May 2023 01:24:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwf6Q-0005sy-PU; Wed, 10 May 2023 04:23:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwf6O-0005rl-Mc for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23: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 1pwf6K-0007gJ-DA for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23:12 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230510082301euoutp0184a21470cf8a08dcb0be929d19ede3d4~dupROzOG81964619646euoutp01j for ; Wed, 10 May 2023 08:23:01 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230510082301eucas1p2778e27fa8d63b38bfde2524c3b9f2345~dupQ-t-Sf2442424424eucas1p2k; Wed, 10 May 2023 08:23:01 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id BF.F5.37758.5645B546; Wed, 10 May 2023 09:23:01 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230510082301eucas1p2f6cbaecfd97264d2a1bbf54bfe8aae1f~dupQsDbXj1189911899eucas1p2w; Wed, 10 May 2023 08:23:01 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230510082301eusmtrp175c8e0f04a11e48a4a90ad83cd3e05c8~dupQrhs9O0702607026eusmtrp1U; Wed, 10 May 2023 08:23:01 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id DA.01.10549.5645B546; Wed, 10 May 2023 09:23:01 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230510082300eusmtip12876bbccb44f93f7e928ea3e613dab2c~dupQLwvxU2198721987eusmtip12; Wed, 10 May 2023 08:23:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230510082301euoutp0184a21470cf8a08dcb0be929d19ede3d4~dupROzOG81964619646euoutp01j DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683706981; bh=EWsco+cJ7x7/FUF1IEPdzJA/MQGvkaw07RGP4KOVkTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KuQvmFuAqruHjWbCcvafzy1ehNy9jtohn37RNV/+VqBF/25UVX9fsQfeAynVGbV1y RLqE18EaBD51soCBL8iwWCEE6h9/kNs09vu7bBI788e95gQxfqMint6X8QxQyy0uBg pvS12jHPwDlZ9Mw+aZcJPmziDhCTXHtUdUrT1VGA= X-AuditID: cbfec7f5-7ffff7000002937e-11-645b5465f480 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 v5 2/6] igb: rename E1000E_RingInfo_st Date: Wed, 10 May 2023 10:22:50 +0200 Message-Id: <20230510082254.1036-3-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230510082254.1036-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42LZduzned3UkOgUgyXTFCw+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXxoMjk5gLpsVV/L+xjrWB8adXFyMnh4SAicSX578Yuxi5OIQEVjBKnJ3Z zAbhfGGU+Nk8mRnC+cwo8XTjH9YuRg6wlle3ZCDiyxkl3l88BdXeziSx681zNpC5bAJmEo++ zANrEBEwlvjYLg4SZhZIlTj65yALSFgYqGTn1GCQMIuAqsSLTbvAwrwCThKnFgdDHCcvMfPS d3YQm1PAWWLvnFZWEJtXQFDi5MwnLBAT5SWat84GO1NCYAeHxKK+vYwQzS4SM1t72CBsYYlX x7ewQ9gyEqcn97BA2OUSP89uY4dobmGU2DN1MlSRtcSlrT/BzmcW0JRYv0sfIuwo0bTxMSMk GPgkbrwVhLiBT2LStunMEGFeiY42IYhqHYlvm2ayQYSlJBbeqIMIe0hMP/aZaQKj4iwkz8xC 8swshLULGJlXMYqnlhbnpqcWG+ellusVJ+YWl+al6yXn525iBKaW0/+Of93BuOLVR71DjEwc jIcYJTiYlUR4vUOjUoR4UxIrq1KL8uOLSnNSiw8xSnOwKInzatueTBYSSE8sSc1OTS1ILYLJ MnFwSjUwGXJt3Kb6QVvOLWgLm2/vxedrF8zfyCK19QdL/t8bL53MJZt+yn1qUX41tXmhrfFX VdYdGtviLxxtYXL70jFFfu4uicAz2pVqC/xLxG0vege2PpJ4LMEv+Of1bGvJOme2PTIHkr9O fuc8284mw+DV2QJ1/fcMFbOmfOmeX3N60uLniz35Clgj6wXb3l16Xst55CKPhlV70Ab2ic9a iheF60hW8B08H9KZdpmXbYLyJ4+HmeHPPcvuen7O/u+d/MXb9pzL/j6jCdP3flt2YgHzBvXV 09zu3TkbeP/F7Br79Qf2pi+xrdXOfdDhXbpwiUKZ+N0a3082n2ZYRH6JK+B9Jxjdt9CWr/f0 ns/Sy3jWKrEUZyQaajEXFScCANn8d3KcAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsVy+t/xu7qpIdEpBhOv81h8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jAdHJjEX TIur+H9jHWsD40+vLkYODgkBE4lXt2S6GLk4hASWMkq03PjO3MXICRSXktjX858dwhaW+HOt iw2iqJVJ4vOpSywgCTYBM4lHX+axggwSETCVeLZXEiTMLJApcfrVPjaQsDBQyc6pwSBhFgFV iRebdrGAhHkFnCROLQ6GmC4vMfPSd7BNnALOEnvntLKC2EJAJbNWrAG7hldAUOLkzCcsENPl JZq3zmaewCgwC0lqFpLUAkamVYwiqaXFuem5xYZ6xYm5xaV56XrJ+bmbGIFRsO3Yz807GOe9 +qh3iJGJg/EQowQHs5IIr3doVIoQb0piZVVqUX58UWlOavEhRlOgsycyS4km5wPjMK8k3tDM wNTQxMzSwNTSzFhJnNezoCNRSCA9sSQ1OzW1ILUIpo+Jg1OqgWl2mkG27rKrf1Ibn+0JbQ2a zrOssYm5eZH9NkYvHvvaMG+zl2dOLFewO6C02PlUpnE594m5yz39UpYd7ePWrblf6f3pe3jn lp+7m+XrSpNWmy7NY1Ls0K6ovM7h/eSsvW7hmUD+b1s+vF34Xaj93707Pd1cGza2S3TKXtuq GFC7xqK246jSpcCZX4+933rt+ufOOJ/qiOY1/6Tdflsc+yFZ6M4zp+f3tCbxST9CV/0wKSl8 vZ+LxWeduOJN7VWxsX/KbrumHO15Zee57eWyF2aSy//M/j1ts+Dlzz9suQRdsqctvG2S6Bf4 PcZboEdH7m/uBZuQyHgPgcPfV9/Y+OJInfir0ysn3mC88Uyu1FSJpTgj0VCLuag4EQB3AF+7 CwMAAA== X-CMS-MailID: 20230510082301eucas1p2f6cbaecfd97264d2a1bbf54bfe8aae1f X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230510082301eucas1p2f6cbaecfd97264d2a1bbf54bfe8aae1f X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230510082301eucas1p2f6cbaecfd97264d2a1bbf54bfe8aae1f References: <20230510082254.1036-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: 1683707061686100006 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 Fri May 17 17:00:10 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=1683707561; cv=none; d=zohomail.com; s=zohoarc; b=AYGCqUhZPmuWTtslIAhZIrHDa+32S6zZrtfb7dGHCoF1v3Q6N7TzKy6eJQK6H2FrMl+RjLA9l0XUelc4JNKUK+gGk/U4PmauAqwckI6no5zQtmR7oxJraEFiW2CHBq4WHWdtgoHwbzXKDQGb2K9llGjF/GW0xZoJV2Yx/NgzB7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683707561; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=84Izyxtoe0ZLd4hkuj/7JIPXuyS7G7dsSIvL3JsJP94=; b=mYcq4Mw+8YlVMFpcbo9rz5vMmha1Cw7fGy/9sPU5CDgku4mys2AKt1t7NJYOYZs/BmrpBSQ2EYgQTNhWjgog3I5K0Q4CFNZ9/4c7GvSMqZr56yJbOz4Rkhu57K7GDsDYJht3yzVb0b7OffohS4sMXf5qmgfFf+M9OiOYVXH9R8o= 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 1683707561534138.43330315536923; Wed, 10 May 2023 01:32:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwfFG-0002qe-IC; Wed, 10 May 2023 04:32: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 1pwfFD-0002qC-6Z for qemu-devel@nongnu.org; Wed, 10 May 2023 04:32:19 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwfF9-0000ps-U1 for qemu-devel@nongnu.org; Wed, 10 May 2023 04:32:18 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230510082302euoutp0242d197e0d1faa82532d69c1ac9236a1a~dupSHzoqw1982619826euoutp02K for ; Wed, 10 May 2023 08:23:02 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230510082302eucas1p125dbe7856900a5eee74b998b90fb35fa~dupRx9vfx0154801548eucas1p1p; Wed, 10 May 2023 08:23:02 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id A0.06.37758.6645B546; Wed, 10 May 2023 09:23:02 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230510082301eucas1p24152d2c12249f6106410784c561576a3~dupRN3ZCt2134421344eucas1p2s; Wed, 10 May 2023 08:23:01 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230510082301eusmtrp1aeaadef92c8b63485de5ba846df7736d~dupRM7wHg0700807008eusmtrp1l; Wed, 10 May 2023 08:23:01 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 6B.01.10549.5645B546; Wed, 10 May 2023 09:23:01 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230510082301eusmtip19a1f8ca2dcef8b06f53f418e80b0eb8e~dupQrDMrE2224722247eusmtip1S; Wed, 10 May 2023 08:23:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230510082302euoutp0242d197e0d1faa82532d69c1ac9236a1a~dupSHzoqw1982619826euoutp02K DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683706982; bh=84Izyxtoe0ZLd4hkuj/7JIPXuyS7G7dsSIvL3JsJP94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FidpPD6AQjgJBjFnToSe8n8D2JPoNjGV+fELA3XWmk0UqdMW2+uCqCApDU4Fyfpd6 hpqUNe1G2w2icSSFEBKrXHMjeyXtRBkXkqJPbrjtQHOZfsruuZGx2XYjWdPjuvHtn7 yJjD7ABARCQ3IwfEyYODu3wH9+cxGemtl+QenzH0= X-AuditID: cbfec7f5-815ff7000002937e-16-645b54665b86 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 v5 3/6] igb: RX descriptors guest writting refactoring Date: Wed, 10 May 2023 10:22:51 +0200 Message-Id: <20230510082254.1036-4-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230510082254.1036-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42LZduznOd20kOgUgw8/RC0+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXRtPEy4wFTcEVz1pWMDUwPrHsYuTkkBAwkTixuJe1i5GLQ0hgBaPEttcX GSGcL4wSz1ZdZYFwPjNKnNzwG6iMA6zl+LcoiPhyoKJl76CK2pkk9px6wwYyl03ATOLRl3lg DSICxhIf28VBwswCqRJH/xxkAbGFBdwkPp24wwpiswioSmyfOIcZxOYVcJJYdfgDG8R58hIz L31nB7E5BZwl9s5pZYWoEZQ4OfMJC8RMeYnmrbOZQW6QENjCIXHo2WdGiGYXiVeH3jFD2MIS r45vYYewZSROT+5hgbDLJX6e3cYO0dzCKLFn6mSoImuJS1t/gj3ALKApsX6XPkTYUaJ1WhM0 IPgkbrwVhLiBT2LStunMEGFeiY42IYhqHYlvm2ayQYSlJBbeqIMIe0jcWb2QaQKj4iwkz8xC 8swshLULGJlXMYqnlhbnpqcWG+ellusVJ+YWl+al6yXn525iBKaX0/+Of93BuOLVR71DjEwc jIcYJTiYlUR4vUOjUoR4UxIrq1KL8uOLSnNSiw8xSnOwKInzatueTBYSSE8sSc1OTS1ILYLJ MnFwSjUwydYpv7nlVSf7U2+pmeB94dX/203mtodLhzpLTgoL8OR4Oqtrz+a6njrXS/oBrCv7 dPOqQhj+boqZb7/EWGCG6qdT8QtOd9SprgrW+P/xMm9hVtK8qR9FXm7UT7O/vnJfz9nI2GTm l0/mHnNbaf1J61zIrVcR6YZPJkbEakcZLmUqmrXtZfv53ao3rGxWPnjqMcEqamZ3l9jk4iMB 0tfumM3eJeg3fbpd5iGpvAqJo6q/xJc4LF+08AoLQ7OyMP+btrd6Ld+vep5Yc9I74TJD1tzv zg3lnzkyWEtX2+hb3dHZxLTzso18t4fMssLsqak7V6W7t01LixP6JxDj+097n2r99eYjvOce +ap0xlUqsRRnJBpqMRcVJwIAW1efhJ4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xu7qpIdEpBn3bdSw+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAa5Se TVF+aUmqQkZ+cYmtUrShhZGeoaWFnpGJpZ6hsXmslZGpkr6dTUpqTmZZapG+XYJeRtPEy4wF TcEVz1pWMDUwPrHsYuTgkBAwkTj+LaqLkYtDSGApo8T0WysZuxg5geJSEvt6/rND2MISf651 sYHYQgKtTBIz/oiD2GwCZhKPvsxjBZkjImAq8WyvJEiYWSBT4vSrfWDlwgJuEp9O3GEFsVkE VCW2T5zDDGLzCjhJrDr8gQ1ivLzEzEvfwVZxCjhL7J3Tygqxykli1oo1UPWCEidnPmGBmC8v 0bx1NvMERoFZSFKzkKQWMDKtYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECIyDbcd+bt7BOO/V R71DjEwcjIcYJTiYlUR4vUOjUoR4UxIrq1KL8uOLSnNSiw8xmgLdPZFZSjQ5HxiJeSXxhmYG poYmZpYGppZmxkrivJ4FHYlCAumJJanZqakFqUUwfUwcnFINTNmNl8zbmz6IHPfdfjzBUVru gXfb1meHVeU3KnyU3CJ5oqw/0+G5o9nhnoLD6zNeWEWq+7hNOdejKPAtxCzhlazXc3F9/n5m 5Xijhb0+J03tFaZa+Sn2NPIZq/vNzH2Td2t694ryZx21l1fGRgcYfTji4cpeF383TiUzsOv1 g5YKjeQJdz2er15/Orij/BKD8gvNTtX5vxc6Tsh1Kdi39eUTE3/1F43c0WmvnOXUvO52vnoR MEklUpGt6eelWN8NMk7++wo7jctXS697XGHGUMb5Ltn94MKos0oHj+xZYXuuqk2tc/OcZ3P8 1oblKCftT6+982+7XU9l6LGVR+58nnyo79Evjhs5r5adMzmgxFKckWioxVxUnAgAvWXPhwwD AAA= X-CMS-MailID: 20230510082301eucas1p24152d2c12249f6106410784c561576a3 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230510082301eucas1p24152d2c12249f6106410784c561576a3 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230510082301eucas1p24152d2c12249f6106410784c561576a3 References: <20230510082254.1036-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: 1683707562595100001 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 176 ++++++++++++++++++++++---------------------- hw/net/igb_regs.h | 10 +-- hw/net/trace-events | 6 +- 3 files changed, 99 insertions(+), 93 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index b6031dea24..774b34fc92 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1281,15 +1281,11 @@ igb_verify_csum_in_sw(IGBCore *core, } =20 static void -igb_build_rx_metadata(IGBCore *core, - struct NetRxPkt *pkt, - bool is_eop, - const E1000E_RSSInfo *rss_info, uint16_t etqf, bool = ts, - uint16_t *pkt_info, uint16_t *hdr_info, - uint32_t *rss, - uint32_t *status_flags, - uint16_t *ip_id, - uint16_t *vlan_tag) +igb_build_rx_metadata_common(IGBCore *core, + struct NetRxPkt *pkt, + bool is_eop, + uint32_t *status_flags, + uint16_t *vlan_tag) { struct virtio_net_hdr *vhdr; bool hasip4, hasip6, csum_valid; @@ -1298,7 +1294,6 @@ igb_build_rx_metadata(IGBCore *core, *status_flags =3D E1000_RXD_STAT_DD; =20 /* No additional metadata needed for non-EOP descriptors */ - /* TODO: EOP apply only to status so don't skip whole function. */ if (!is_eop) { goto func_exit; } @@ -1315,59 +1310,6 @@ igb_build_rx_metadata(IGBCore *core, trace_e1000e_rx_metadata_vlan(*vlan_tag); } =20 - /* Packet parsing results */ - if ((core->mac[RXCSUM] & E1000_RXCSUM_PCSD) !=3D 0) { - if (rss_info->enabled) { - *rss =3D cpu_to_le32(rss_info->hash); - trace_igb_rx_metadata_rss(*rss); - } - } else if (hasip4) { - *status_flags |=3D E1000_RXD_STAT_IPIDV; - *ip_id =3D cpu_to_le16(net_rx_pkt_get_ip_id(pkt)); - trace_e1000e_rx_metadata_ip_id(*ip_id); - } - - if (pkt_info) { - *pkt_info =3D rss_info->enabled ? rss_info->type : 0; - - if (etqf < 8) { - *pkt_info |=3D BIT(11) | (etqf << 4); - } else { - if (hasip4) { - *pkt_info |=3D E1000_ADVRXD_PKT_IP4; - } - - if (hasip6) { - *pkt_info |=3D E1000_ADVRXD_PKT_IP6; - } - - switch (l4hdr_proto) { - case ETH_L4_HDR_PROTO_TCP: - *pkt_info |=3D E1000_ADVRXD_PKT_TCP; - break; - - case ETH_L4_HDR_PROTO_UDP: - *pkt_info |=3D E1000_ADVRXD_PKT_UDP; - break; - - case ETH_L4_HDR_PROTO_SCTP: - *pkt_info |=3D E1000_ADVRXD_PKT_SCTP; - break; - - default: - break; - } - } - } - - if (hdr_info) { - *hdr_info =3D 0; - } - - if (ts) { - *status_flags |=3D BIT(16); - } - /* RX CSO information */ if (hasip6 && (core->mac[RFCTL] & E1000_RFCTL_IPV6_XSUM_DIS)) { trace_e1000e_rx_metadata_ipv6_sum_disabled(); @@ -1423,43 +1365,106 @@ func_exit: static inline void igb_write_lgcy_rx_descr(IGBCore *core, struct e1000_rx_desc *desc, struct NetRxPkt *pkt, - const E1000E_RSSInfo *rss_info, uint16_t etqf, boo= l ts, + const E1000E_RSSInfo *rss_info, uint16_t length) { - uint32_t status_flags, rss; - uint16_t ip_id; + uint32_t status_flags; =20 assert(!rss_info->enabled); + + memset(desc, 0, sizeof(*desc)); desc->length =3D cpu_to_le16(length); - desc->csum =3D 0; + igb_build_rx_metadata_common(core, pkt, pkt !=3D NULL, + &status_flags, + &desc->special); =20 - igb_build_rx_metadata(core, pkt, pkt !=3D NULL, - rss_info, etqf, ts, - NULL, NULL, &rss, - &status_flags, &ip_id, - &desc->special); desc->errors =3D (uint8_t) (le32_to_cpu(status_flags) >> 24); desc->status =3D (uint8_t) le32_to_cpu(status_flags); } =20 +static uint16_t +igb_rx_desc_get_packet_type(IGBCore *core, struct NetRxPkt *pkt, uint16_t = etqf) +{ + uint16_t pkt_type =3D 0; + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); + + if (hasip6 && !(core->mac[RFCTL] & E1000_RFCTL_IPV6_DIS)) { + pkt_type |=3D E1000_ADVRXD_PKT_IP6; + } else if (hasip4) { + pkt_type =3D E1000_ADVRXD_PKT_IP4; + } + + if (etqf < 8) { + pkt_type |=3D (BIT(11) >> 4) | etqf; + return pkt_type; + } + + switch (l4hdr_proto) { + case ETH_L4_HDR_PROTO_TCP: + pkt_type |=3D E1000_ADVRXD_PKT_TCP; + break; + case ETH_L4_HDR_PROTO_UDP: + pkt_type |=3D E1000_ADVRXD_PKT_UDP; + break; + case ETH_L4_HDR_PROTO_SCTP: + pkt_type |=3D E1000_ADVRXD_PKT_SCTP; + break; + default: + break; + } + + return pkt_type; +} + static inline void -igb_write_adv_rx_descr(IGBCore *core, union e1000_adv_rx_desc *desc, +igb_write_adv_rx_descr(IGBCore *core, + union e1000_adv_rx_desc *d, struct NetRxPkt *pkt, - const E1000E_RSSInfo *rss_info, uint16_t etqf, bool= ts, + const E1000E_RSSInfo *rss_info, + uint16_t etqf, + bool ts, uint16_t length) { - memset(&desc->wb, 0, sizeof(desc->wb)); + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + uint16_t rss_type =3D 0, pkt_type; + bool eop =3D (pkt !=3D NULL); + memset(&d->wb, 0, sizeof(d->wb)); + + d->wb.upper.length =3D cpu_to_le16(length); + igb_build_rx_metadata_common(core, pkt, eop, + &d->wb.upper.status_error, + &d->wb.upper.vlan); + + if (!eop) { + return; + } + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); =20 - desc->wb.upper.length =3D cpu_to_le16(length); + if ((core->mac[RXCSUM] & E1000_RXCSUM_PCSD) !=3D 0) { + if (rss_info->enabled) { + d->wb.lower.hi_dword.rss =3D cpu_to_le32(rss_info->hash); + rss_type =3D rss_info->type; + trace_igb_rx_metadata_rss(d->wb.lower.hi_dword.rss, rss_type); + } + } else if (hasip4) { + d->wb.upper.status_error |=3D E1000_RXD_STAT_IPIDV; + d->wb.lower.hi_dword.csum_ip.ip_id =3D + cpu_to_le16(net_rx_pkt_get_ip_id(pkt)); + trace_e1000e_rx_metadata_ip_id(d->wb.lower.hi_dword.csum_ip.ip= _id); + } + + if (ts) { + d->wb.upper.status_error |=3D BIT(16); + } =20 - igb_build_rx_metadata(core, pkt, pkt !=3D NULL, - rss_info, etqf, ts, - &desc->wb.lower.lo_dword.pkt_info, - &desc->wb.lower.lo_dword.hdr_info, - &desc->wb.lower.hi_dword.rss, - &desc->wb.upper.status_error, - &desc->wb.lower.hi_dword.csum_ip.ip_id, - &desc->wb.upper.vlan); + pkt_type =3D igb_rx_desc_get_packet_type(core, pkt, etqf); + trace_e1000e_rx_metadata_pkt_type(pkt_type); + d->wb.lower.lo_dword.pkt_info =3D cpu_to_le16(rss_type | (pkt_type << = 4)); } =20 static inline void @@ -1468,8 +1473,7 @@ igb_write_rx_descr(IGBCore *core, union e1000_rx_desc= _union *desc, uint16_t etqf, bool ts, uint16_t length) { if (igb_rx_use_legacy_descriptor(core)) { - igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, - etqf, ts, length); + igb_write_lgcy_rx_descr(core, &desc->legacy, pkt, rss_info, length= ); } else { igb_write_adv_rx_descr(core, &desc->adv, pkt, rss_info, etqf, ts, length); diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index 82ff195dfc..71a8833229 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -692,11 +692,11 @@ union e1000_adv_rx_desc { =20 #define E1000_STATUS_NUM_VFS_SHIFT 14 =20 -#define E1000_ADVRXD_PKT_IP4 BIT(4) -#define E1000_ADVRXD_PKT_IP6 BIT(6) -#define E1000_ADVRXD_PKT_TCP BIT(8) -#define E1000_ADVRXD_PKT_UDP BIT(9) -#define E1000_ADVRXD_PKT_SCTP BIT(10) +#define E1000_ADVRXD_PKT_IP4 BIT(0) +#define E1000_ADVRXD_PKT_IP6 BIT(2) +#define E1000_ADVRXD_PKT_TCP BIT(4) +#define E1000_ADVRXD_PKT_UDP BIT(5) +#define E1000_ADVRXD_PKT_SCTP BIT(6) =20 static inline uint8_t igb_ivar_entry_rx(uint8_t i) { diff --git a/hw/net/trace-events b/hw/net/trace-events index e4a98b2c7d..def651c186 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -277,9 +277,9 @@ igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRIT= E: PHY[%u] UNHANDLED" igb_link_set_ext_params(bool asd_check, bool speed_select_bypass, bool pfr= std) "Set extended link params: ASD check: %d, Speed select bypass: %d, PF = reset done: %d" =20 igb_rx_desc_buff_size(uint32_t b) "buffer size: %u" -igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "addr: 0x%"PRIx64", offset: %u, from: %p, length: %u" +igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from: %p, length:= %u" =20 -igb_rx_metadata_rss(uint32_t rss) "RSS data: 0x%X" +igb_rx_metadata_rss(uint32_t rss, uint16_t rss_pkt_type) "RSS data: rss: 0= x%X, rss_pkt_type: 0x%X" =20 igb_irq_icr_clear_gpie_nsicr(void) "Clearing ICR on read due to GPIE.NSICR= enabled" igb_irq_set_iam(uint32_t icr) "Update IAM: 0x%x" @@ -294,6 +294,8 @@ igb_irq_eitr_set(uint32_t eitr_num, uint32_t val) "EITR= [%u] =3D 0x%x" igb_set_pfmailbox(uint32_t vf_num, uint32_t val) "PFMailbox[%d]: 0x%x" igb_set_vfmailbox(uint32_t vf_num, uint32_t val) "VFMailbox[%d]: 0x%x" =20 +igb_wrn_rx_desc_modes_not_supp(int desc_type) "Not supported descriptor ty= pe: %d" + # igbvf.c igbvf_wrn_io_addr_unknown(uint64_t addr) "IO unknown register 0x%"PRIx64 =20 --=20 2.25.1 From nobody Fri May 17 17:00:10 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=1683707069; cv=none; d=zohomail.com; s=zohoarc; b=jn7kRYgNZLyJ2e891MdGTJHSup7hvjo7dAuCcdpjpldCdnR93dQjErOa2GbBwC8Ff2IPy9DShpMpnrdRXKIwAudqavhQdtRiFO/j90a55K0EAck5/ajUoHWocBDH8ONFyNpyDCLn8YvyadrCk6+AgkqSfxzTesCM5AD1tEB58Gg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683707069; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+qzP58+yb4joF5Hr6cs0rXbAup14U01FaI9KZTROXvc=; b=AGtaYB6jsgaRic51nqs3SfqQOhdr5Q5QchhNX4yLFX0YRF+y6yoTiFvb/JiWh/I42piUjV+9YiZEAIiRADmBTaI6UP5aiFpjVsul/qQjs04NSmtg9u5wJVoq2H/ko1zOjsE6/GMXb6+E7MBjePggiNg4TeZavvBvo71nA+aWyZY= 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 1683707069115585.1550576816508; Wed, 10 May 2023 01:24:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwf6R-0005tN-Gb; Wed, 10 May 2023 04:23:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwf6O-0005rs-VF for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23:12 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwf6J-0007gg-Ll for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23:12 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230510082303euoutp02d3829940470164a303366e001cbf1d4d~dupSWqqze1982619826euoutp02L for ; Wed, 10 May 2023 08:23:03 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230510082302eucas1p13264f6afae140fa259cc77d70d65c6e5~dupSD3Efu0091000910eucas1p12; Wed, 10 May 2023 08:23:02 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id B9.B3.42423.6645B546; Wed, 10 May 2023 09:23:02 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230510082302eucas1p10d4117c6329d8376d8fc883c6c887083~dupRry18A0603006030eucas1p1c; Wed, 10 May 2023 08:23:02 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230510082302eusmtrp11233b0618fe51d7556cda09a927ed756~dupRq-qZY0700807008eusmtrp1n; Wed, 10 May 2023 08:23:02 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 7C.01.10549.6645B546; Wed, 10 May 2023 09:23:02 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230510082301eusmtip1f4cdd0f41863742ef49575c86f13511c~dupRKKrt72222822228eusmtip1K; Wed, 10 May 2023 08:23:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230510082303euoutp02d3829940470164a303366e001cbf1d4d~dupSWqqze1982619826euoutp02L DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683706983; bh=+qzP58+yb4joF5Hr6cs0rXbAup14U01FaI9KZTROXvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sT57jiYrGB/fx5+n+OyFHu3z5kAVfGzNfs8jKxJyATk7gWEA7RfITH/n6r/wqqA+m uNt2Tns9D3c4tkRkY/Wm/r8kC6zqtpgmXxlf6goItYuWforWbsSDr6g2ILIKeLoyNP eS9WyrwgIJWNhVRFKIaqbOhLRrhaRaWhzlCjyYI4= X-AuditID: cbfec7f2-a51ff7000002a5b7-5e-645b5466c048 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 v5 4/6] igb: RX payload guest writting refactoring Date: Wed, 10 May 2023 10:22:52 +0200 Message-Id: <20230510082254.1036-5-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230510082254.1036-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgleLIzCtJLcpLzFFi42LZduznOd20kOgUgyMH1C0+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXxvI1c1kK9qVXnD/Vz97AuNupi5GTQ0LAROLQt2XsXYxcHEICKxgluqcu YYJwvjBK/DvzmR2kSkjgM6PEglUGMB0/Vx1jhChaziix4tUsFginnUni0eO3bCBVbAJmEo++ zGPtYuTgEBEwlvjYLg4SZhZIlTj65yALiC0s4CTxe1svM0gJi4CqxKxWWxCTFyjc2p8OsUpe Yual72AncAo4S+yd08oKYvMKCEqcnPmEBWKivETz1tnMEPVbOCRONipB2C4Smx/OYoKwhSVe Hd/CDmHLSJye3MMCYZdL/Dy7Dex5CYEWRok9UydDFVlLXNr6E+x6ZgFNifW79CHCjhJHP78C u1hCgE/ixltBiBP4JCZtmw4V5pXoaBOCqNaR+LZpJhtEWEpi4Y06iLCHRNPUVewTGBVnIfll FpJfZiGsXcDIvIpRPLW0ODc9tdgwL7Vcrzgxt7g0L10vOT93EyMwsZz+d/zTDsa5rz7qHWJk 4mA8xCjBwawkwusdGpUixJuSWFmVWpQfX1Sak1p8iFGag0VJnFfb9mSykEB6YklqdmpqQWoR TJaJg1OqgamIq/7WCZWoWxYCJ9jr7laulXCJ3SUUljDR9Up2j1zNpamfMjR/st7o4Z1XLb3/ eOVbmePWDxvufOTua/nOp23us+6clDGPgggn+2nfbunmrelferc8f3N7rVbzWe+0n52bdLy5 frEUKL6Z+ObWA4vpC2LU14taCxr+bHJfeJB9Z+y9drVrG7ZLfFY/wvAn5+XJ8/vaPZqzJt66 /l+r+LFY5erAhIaJ5//+Yt0zSbxAYrr+rGsPnvPOmfBC8rp/5/HQQ5z7tRU5O/uTHUPzGeZu 6b5/9U6ZwOO3qavZ3xaYdq9T/f1l15n4f6JROzddl6k43e2zKL56X6n8FrYnZ5fnJtq4fJx+ oHTtqlqDh+5KLMUZiYZazEXFiQA+KmrUmwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xu7ppIdEpBpeP8Ft8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jOVr5rIU 7EuvOH+qn72BcbdTFyMnh4SAicTPVccYuxi5OIQEljJKbHm+kQkiISWxr+c/O4QtLPHnWhcb RFErk8SfNw9ZQRJsAmYSj77MA7I5OEQETCWe7ZUECTMLZEqcfrWPDcQWFnCS+L2tlxmkhEVA VWJWqy2IyQsUbu1Ph5guLzHz0newTZwCzhJ757SCDRcCKpm1Yg0ziM0rIChxcuYTFojp8hLN W2czT2AUmIUkNQtJagEj0ypGkdTS4tz03GJDveLE3OLSvHS95PzcTYzAONh27OfmHYzzXn3U O8TIxMF4iFGCg1lJhNc7NCpFiDclsbIqtSg/vqg0J7X4EKMp0NUTmaVEk/OBkZhXEm9oZmBq aGJmaWBqaWasJM7rWdCRKCSQnliSmp2aWpBaBNPHxMEp1cA0o1vAqCDqptEmhvq1YiayyR9X lQndjb+nsfjo276Jf4578N7Yy73PIjNwCrvg8ekbrkSsXVn69d9O5hvnVfxDDFLPd7Qv3CzH x+AlXJSTcSxH4N85bjv1IOULKzQtHp30/W/XfbEiqo7t+R3OxB/HtAJ7z+8OlZ+ffbqhUvLX +bytLA+CF7g0S8oGFp+1sXhw2E1vvkbt4pfCLDc6uzieuVvENi76V2+6QfEzu+WlH1q7eUKF FDTyHjWEBGS8DpuQv074/ucn8icTjD81ffGey3xi9+IjHz0fed5wan8XXRnRqR74YNaXF3al 3/sCD2+a8+LuehOrf79tV+gu0zZKjXw3nVXlzMHgb8dyVmcqsRRnJBpqMRcVJwIAbFQ4ugwD AAA= X-CMS-MailID: 20230510082302eucas1p10d4117c6329d8376d8fc883c6c887083 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230510082302eucas1p10d4117c6329d8376d8fc883c6c887083 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230510082302eucas1p10d4117c6329d8376d8fc883c6c887083 References: <20230510082254.1036-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: 1683707070438100002 Refactoring is done in preparation for support of multiple advanced descriptors RX modes, especially packet-split modes. Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 18 ++-- hw/net/igb_core.c | 216 +++++++++++++++++++++++++-------------- tests/qtest/libqos/igb.c | 5 + 3 files changed, 153 insertions(+), 86 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index b2e54fe802..f9ff31fd70 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1418,11 +1418,11 @@ e1000e_write_hdr_to_rx_buffers(E1000ECore *core, } =20 static void -e1000e_write_to_rx_buffers(E1000ECore *core, - hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, - const char *data, - dma_addr_t data_len) +e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core, + hwaddr ba[MAX_PS_BUFFERS], + e1000e_ba_state *bastate, + const char *data, + dma_addr_t data_len) { while (data_len > 0) { uint32_t cur_buf_len =3D core->rxbuf_sizes[bastate->cur_idx]; @@ -1594,8 +1594,10 @@ e1000e_write_packet_to_guest(E1000ECore *core, struc= t NetRxPkt *pkt, while (copy_size) { iov_copy =3D MIN(copy_size, iov->iov_len - iov_ofs); =20 - e1000e_write_to_rx_buffers(core, ba, &bastate, - iov->iov_base + iov_ofs, iov_c= opy); + e1000e_write_payload_frag_to_rx_buffers(core, ba, &bas= tate, + iov->iov_base + + iov_ofs, + iov_copy); =20 copy_size -=3D iov_copy; iov_ofs +=3D iov_copy; @@ -1607,7 +1609,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, =20 if (desc_offset + desc_size >=3D total_size) { /* Simulate FCS checksum presence in the last descript= or */ - e1000e_write_to_rx_buffers(core, ba, &bastate, + e1000e_write_payload_frag_to_rx_buffers(core, ba, &bas= tate, (const char *) &fcs_pad, e1000x_fcs_len(core->ma= c)); } } diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 774b34fc92..0eabe7106e 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -941,6 +941,14 @@ igb_has_rxbufs(IGBCore *core, const E1000ERingInfo *r,= size_t total_size) bufsize; } =20 +static uint32_t +igb_get_queue_rx_header_buf_size(IGBCore *core, const E1000ERingInfo *r) +{ + uint32_t srrctl =3D core->mac[E1000_SRRCTL(r->idx) >> 2]; + return (srrctl & E1000_SRRCTL_BSIZEHDRSIZE_MASK) >> + E1000_SRRCTL_BSIZEHDRSIZE_SHIFT; +} + void igb_start_recv(IGBCore *core) { @@ -1231,6 +1239,21 @@ igb_read_adv_rx_descr(IGBCore *core, union e1000_adv= _rx_desc *desc, *buff_addr =3D le64_to_cpu(desc->read.pkt_addr); } =20 +typedef struct IGBPacketRxDMAState { + size_t size; + size_t total_size; + size_t ps_hdr_len; + size_t desc_size; + size_t desc_offset; + uint32_t rx_desc_packet_buf_size; + uint32_t rx_desc_header_buf_size; + struct iovec *iov; + size_t iov_ofs; + bool is_first; + uint16_t written; + hwaddr ba; +} IGBPacketRxDMAState; + static inline void igb_read_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, hwaddr *buff_addr) @@ -1512,19 +1535,6 @@ igb_pci_dma_write_rx_desc(IGBCore *core, PCIDevice *= dev, dma_addr_t addr, } } =20 -static void -igb_write_to_rx_buffers(IGBCore *core, - PCIDevice *d, - hwaddr ba, - uint16_t *written, - const char *data, - dma_addr_t data_len) -{ - trace_igb_rx_desc_buff_write(ba, *written, data, data_len); - pci_dma_write(d, ba + *written, data, data_len); - *written +=3D data_len; -} - static void igb_update_rx_stats(IGBCore *core, const E1000ERingInfo *rxi, size_t pkt_size, size_t pkt_fcs_size) @@ -1550,6 +1560,93 @@ igb_rx_descr_threshold_hit(IGBCore *core, const E100= 0ERingInfo *rxi) ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; } =20 +static void +igb_truncate_to_descriptor_size(IGBPacketRxDMAState *pdma_st, size_t *size) +{ + if (*size > pdma_st->rx_desc_packet_buf_size) { + *size =3D pdma_st->rx_desc_packet_buf_size; + } +} + +static void +igb_write_payload_frag_to_rx_buffers(IGBCore *core, + PCIDevice *d, + hwaddr ba, + uint16_t *written, + uint32_t cur_buf_len, + const char *data, + dma_addr_t data_len) +{ + trace_igb_rx_desc_buff_write(ba, *written, data, data_len); + pci_dma_write(d, ba + *written, data, data_len); + *written +=3D data_len; +} + +static void +igb_write_payload_to_rx_buffers(IGBCore *core, + struct NetRxPkt *pkt, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + size_t *copy_size) +{ + static const uint32_t fcs_pad; + size_t iov_copy; + + /* Copy packet payload */ + while (*copy_size) { + iov_copy =3D MIN(*copy_size, pdma_st->iov->iov_len - pdma_st->iov_= ofs); + igb_write_payload_frag_to_rx_buffers(core, d, + pdma_st->ba, + &pdma_st->written, + pdma_st->rx_desc_packet_buf_s= ize, + pdma_st->iov->iov_base + + pdma_st->iov_ofs, + iov_copy); + + *copy_size -=3D iov_copy; + pdma_st->iov_ofs +=3D iov_copy; + if (pdma_st->iov_ofs =3D=3D pdma_st->iov->iov_len) { + pdma_st->iov++; + pdma_st->iov_ofs =3D 0; + } + } + + if (pdma_st->desc_offset + pdma_st->desc_size >=3D pdma_st->total_size= ) { + /* Simulate FCS checksum presence in the last descriptor */ + igb_write_payload_frag_to_rx_buffers(core, d, + pdma_st->ba, + &pdma_st->written, + pdma_st->rx_desc_packet_buf_s= ize, + (const char *) &fcs_pad, + e1000x_fcs_len(core->mac)); + } +} + +static void +igb_write_to_rx_buffers(IGBCore *core, + struct NetRxPkt *pkt, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st) +{ + size_t copy_size; + + if (!pdma_st->ba) { + /* as per intel docs; skip descriptors with null buf addr */ + trace_e1000e_rx_null_descriptor(); + return; + } + + if (pdma_st->desc_offset >=3D pdma_st->size) { + return; + } + + pdma_st->desc_size =3D pdma_st->total_size - pdma_st->desc_offset; + igb_truncate_to_descriptor_size(pdma_st, &pdma_st->desc_size); + copy_size =3D pdma_st->size - pdma_st->desc_offset; + igb_truncate_to_descriptor_size(pdma_st, ©_size); + igb_write_payload_to_rx_buffers(core, pkt, d, pdma_st, ©_size); +} + static void igb_write_packet_to_guest(IGBCore *core, struct NetRxPkt *pkt, const E1000E_RxRing *rxr, @@ -1559,91 +1656,54 @@ igb_write_packet_to_guest(IGBCore *core, struct Net= RxPkt *pkt, PCIDevice *d; dma_addr_t base; union e1000_rx_desc_union desc; - size_t desc_size; - size_t desc_offset =3D 0; - size_t iov_ofs =3D 0; - - struct iovec *iov =3D net_rx_pkt_get_iovec(pkt); - size_t size =3D net_rx_pkt_get_total_len(pkt); - size_t total_size =3D size + e1000x_fcs_len(core->mac); - const E1000ERingInfo *rxi =3D rxr->i; - size_t bufsize =3D igb_rxbufsize(core, rxi); - + const E1000ERingInfo *rxi; + size_t rx_desc_len; + + IGBPacketRxDMAState pdma_st =3D {0}; + pdma_st.is_first =3D true; + pdma_st.size =3D net_rx_pkt_get_total_len(pkt); + pdma_st.total_size =3D pdma_st.size + e1000x_fcs_len(core->mac); + + rxi =3D rxr->i; + rx_desc_len =3D core->rx_desc_len; + pdma_st.rx_desc_packet_buf_size =3D + igb_rxbufsize(core, rxi); + pdma_st.rx_desc_header_buf_size =3D + igb_get_queue_rx_header_buf_size(core, rxi); + pdma_st.iov =3D net_rx_pkt_get_iovec(pkt); d =3D pcie_sriov_get_vf_at_index(core->owner, rxi->idx % 8); if (!d) { d =3D core->owner; } =20 do { - hwaddr ba; - uint16_t written =3D 0; + pdma_st.written =3D 0; bool is_last =3D false; =20 - desc_size =3D total_size - desc_offset; - - if (desc_size > bufsize) { - desc_size =3D bufsize; - } - if (igb_ring_empty(core, rxi)) { return; } =20 base =3D igb_ring_head_descr(core, rxi); + pci_dma_read(d, base, &desc, rx_desc_len); + trace_e1000e_rx_descr(rxi->idx, base, rx_desc_len); =20 - pci_dma_read(d, base, &desc, core->rx_desc_len); - - trace_e1000e_rx_descr(rxi->idx, base, core->rx_desc_len); - - igb_read_rx_descr(core, &desc, &ba); - - if (ba) { - if (desc_offset < size) { - static const uint32_t fcs_pad; - size_t iov_copy; - size_t copy_size =3D size - desc_offset; - if (copy_size > bufsize) { - copy_size =3D bufsize; - } - - /* Copy packet payload */ - while (copy_size) { - iov_copy =3D MIN(copy_size, iov->iov_len - iov_ofs); - - igb_write_to_rx_buffers(core, d, ba, &written, - iov->iov_base + iov_ofs, iov_c= opy); + igb_read_rx_descr(core, &desc, &pdma_st.ba); =20 - copy_size -=3D iov_copy; - iov_ofs +=3D iov_copy; - if (iov_ofs =3D=3D iov->iov_len) { - iov++; - iov_ofs =3D 0; - } - } - - if (desc_offset + desc_size >=3D total_size) { - /* Simulate FCS checksum presence in the last descript= or */ - igb_write_to_rx_buffers(core, d, ba, &written, - (const char *) &fcs_pad, e1000x_fcs_len(core->ma= c)); - } - } - } else { /* as per intel docs; skip descriptors with null buf addr= */ - trace_e1000e_rx_null_descriptor(); - } - desc_offset +=3D desc_size; - if (desc_offset >=3D total_size) { + igb_write_to_rx_buffers(core, pkt, d, &pdma_st); + pdma_st.desc_offset +=3D pdma_st.desc_size; + if (pdma_st.desc_offset >=3D pdma_st.total_size) { is_last =3D true; } =20 igb_write_rx_descr(core, &desc, is_last ? core->rx_pkt : NULL, - rss_info, etqf, ts, written); - igb_pci_dma_write_rx_desc(core, d, base, &desc, core->rx_desc_len); - - igb_ring_advance(core, rxi, core->rx_desc_len / E1000_MIN_RX_DESC_= LEN); - - } while (desc_offset < total_size); + rss_info, etqf, ts, pdma_st.written); + pci_dma_write(d, base, &desc, rx_desc_len); + igb_ring_advance(core, rxi, + rx_desc_len / E1000_MIN_RX_DESC_LEN); + } while (pdma_st.desc_offset < pdma_st.total_size); =20 - igb_update_rx_stats(core, rxi, size, total_size); + igb_update_rx_stats(core, rxi, pdma_st.size, pdma_st.total_size); } =20 static bool diff --git a/tests/qtest/libqos/igb.c b/tests/qtest/libqos/igb.c index a603468beb..f40c4ec4cd 100644 --- a/tests/qtest/libqos/igb.c +++ b/tests/qtest/libqos/igb.c @@ -109,6 +109,11 @@ static void igb_pci_start_hw(QOSGraphObject *obj) E1000_RAH_AV | E1000_RAH_POOL_1 | le16_to_cpu(*(uint16_t *)(address + 4))); =20 + /* Set supported receive descriptor mode */ + e1000e_macreg_write(&d->e1000e, + E1000_SRRCTL(0), + E1000_SRRCTL_DESCTYPE_ADV_ONEBUF); + /* Enable receive */ e1000e_macreg_write(&d->e1000e, E1000_RFCTL, E1000_RFCTL_EXTEN); e1000e_macreg_write(&d->e1000e, E1000_RCTL, E1000_RCTL_EN); --=20 2.25.1 From nobody Fri May 17 17:00:11 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=1683707059; cv=none; d=zohomail.com; s=zohoarc; b=M+lt1i+BvLGBDgGaNVf5OvT4DTJH8cTRkXDPt/lf7wrM5M1Pgontxca3TeG0Qivd7DCmXwy/C09xTKbdh+2kIdT7YxZeckrTiVrQQX4GqhrHS1zh97hXsCBF3HfqnoswhWZiCt500TvWYpyAXNTW/4P12yDidHGEr6U9iqZIB/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683707059; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wO5gaesISuEdjaAU2KXBboHbME+HpMIPsPuP7qC625s=; b=VtpD4j+4cx/uOa2mkisFknG6fRVmxcfg1Pha5L9GHR++QTt4+dyc1I4neTpwr/UqdYjaqO9NpdD/gTwUIqUHpMQ8koBZx+au9pYSy7btsGjj8nIt3J7xAQU3ye8SuLoE7eYKKtQhc7xdsMjO1wfznas+MEFoAXVaqOcyHlPUT+s= 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 1683707059906863.7281817551204; Wed, 10 May 2023 01:24:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwf6Q-0005sR-5o; Wed, 10 May 2023 04:23:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwf6N-0005rB-D4 for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23:11 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwf6K-0007gm-DD for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23:11 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230510082303euoutp0140003b7de12141396282aedb2505b138~dupTJpF_02095220952euoutp01p for ; Wed, 10 May 2023 08:23:03 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230510082303eucas1p10e9c31daafa5367a757676cf0f7d26e4~dupSz-9M70155501555eucas1p1s; Wed, 10 May 2023 08:23:03 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 7A.B3.42423.7645B546; Wed, 10 May 2023 09:23:03 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230510082303eucas1p139f531b811cf1547da84f23ce743b1fb~dupSUb7MJ0620406204eucas1p1T; Wed, 10 May 2023 08:23:03 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230510082302eusmtrp14f3f2dd2c238d65edd12a2ab88996a27~dupSOtGFc0702607026eusmtrp1Y; Wed, 10 May 2023 08:23:02 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 2D.01.10549.6645B546; Wed, 10 May 2023 09:23:02 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230510082302eusmtip1907c2c1119392d85b24b6338baec4e37~dupRpt-Km2222822228eusmtip1L; Wed, 10 May 2023 08:23:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230510082303euoutp0140003b7de12141396282aedb2505b138~dupTJpF_02095220952euoutp01p DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683706983; bh=wO5gaesISuEdjaAU2KXBboHbME+HpMIPsPuP7qC625s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GVrkFegl4eXrePCfnbVU4zdZVWYegG/eEsFM33J38azZ7FnprLD8LiCsJ3v+ScYs9 5ECy5E5siHEC3fZYrheLB3urFs8HeFrGYVOdDtddjrwfWw6pqkILHbgItwY/W8DZea NmgZHhZjxh8DRM6DCU04PjOnjtxmT0i0swXOipJ0= X-AuditID: cbfec7f2-a51ff7000002a5b7-60-645b546737b2 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 v5 5/6] igb: add IPv6 extended headers traffic detection Date: Wed, 10 May 2023 10:22:53 +0200 Message-Id: <20230510082254.1036-6-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230510082254.1036-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileLIzCtJLcpLzFFi42LZduzned30kOgUg3VT5Cw+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXRv/G62wFO7gqZp+VbGBcydHFyMkhIWAiMXXeOvYuRi4OIYEVjBKzX7Yw QzhfGCWan/xmhXA+M0p8u7SbCaalbfZmqJbljBIb579jgXDamSQuzzrNDFLFJmAm8ejLPKB2 Dg4RAWOJj+3iIGFmgVSJo38OsoDYwgIeEsvePWIHKWERUJVY1KkGEuYVcJK4e+AnG8QueYmZ l76zg9icAs4Se+e0skLUCEqcnPmEBWKkvETz1tlgV0sIbOGQWLZkPiNEs4vE4RsPoAYJS7w6 voUdwpaROD25hwXCLpf4eXYbO0RzC6PEnqmToYqsJS5t/Ql2P7OApsT6XfoQYUeJ9vZTjCBh CQE+iRtvBSFu4JOYtG06M0SYV6KjTQiiWkfi26aZbBBhKYmFN+ogwh4Si44eYJzAqDgLyTOz kDwzC2HtAkbmVYziqaXFuempxYZ5qeV6xYm5xaV56XrJ+bmbGIHJ5fS/4592MM599VHvECMT B+MhRgkOZiURXu/QqBQh3pTEyqrUovz4otKc1OJDjNIcLErivNq2J5OFBNITS1KzU1MLUotg skwcnFINTAuMzrT9fyitpb8kvVRcdVpQ03PTONkHLPm+Bzc4saV4/bst7uKcy1KYKzWL9+Up tVbRhfybn/ltCVXN0o1TskiaJBK9a9bvLT0LzH7WeXZ/TWtJL+1TKlYqNjbdrLIl++O50ttz H/ze7HTjx84JgafWxfN9+3JVNmU6y8U9Hx9eF3kf8DJhEsu0flPpxQYr+o4Z2B/7IG6u5/ni ZKK76VPBOlUr9uhvz113K1RH8c5KYK1xUZG//epEvu5l0zyun9d+zj3Kc1rhRRxf9kOLa12H oy5fnn7Xcm7Vm+VnfDm/n/kvVRwzzXfVuuo9e3/5mjXsnyygV6X0w+1Xh3XYvpagsNCCXe1P ZAUmyfgzKLEUZyQaajEXFScCAKWCq/OdAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRmVeSWpSXmKPExsVy+t/xu7ppIdEpBrvfGlh8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jP6N19kK dnBVzD4r2cC4kqOLkZNDQsBEom32ZvYuRi4OIYGljBJPbs1lgUhISezr+c8OYQtL/LnWxQZR 1MokMW/hY1aQBJuAmcSjL/OAbA4OEQFTiWd7JUHCzAKZEqdf7WMDsYUFPCSWvXvEDlLCIqAq sahTDSTMK+AkcffATzaI8fISMy99B1vFKeAssXdOK9h0IaCaWSvWMEPUC0qcnPmEBWK8vETz 1tnMExgFZiFJzUKSWsDItIpRJLW0ODc9t9hQrzgxt7g0L10vOT93EyMwDrYd+7l5B+O8Vx/1 DjEycTAeYpTgYFYS4fUOjUoR4k1JrKxKLcqPLyrNSS0+xGgKdPZEZinR5HxgJOaVxBuaGZga mphZGphamhkrifN6FnQkCgmkJ5akZqemFqQWwfQxcXBKNTB5FJzcVnoh/rDzCYk79TvkSoxT Hz3iUHl3YdqXON8n7StuNny/NfuOj1/mGt0ZR1M6DppEv2HM1uqREmcvfzGnX3Or+/GZu45I lLf9fLGDf5WMBZ9R2hypCtV1b8+YFqftMpyTdk3l0jH7/PVcVyujWZm2hLzbsCYg98qjifZ7 70Waf3xuPPPHc0vFD/e4k4O0e0p+bmRsOeo9/W0ZB3tjsL9x09fDWrGa0S0na8pMtF8r9jfH LV/VllDJwKubJrvQ5YDdgWWrP/49Zn38/LTC34t41Z7LK8tZZi8Me6YbJDmzs/xjS9ipHc+N Xcr+pGSEfPd+vuzvm6VWhwO/u711OshpxtjCzRrTGjZdUE6JpTgj0VCLuag4EQA7Gh84DAMA AA== X-CMS-MailID: 20230510082303eucas1p139f531b811cf1547da84f23ce743b1fb X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230510082303eucas1p139f531b811cf1547da84f23ce743b1fb X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230510082303eucas1p139f531b811cf1547da84f23ce743b1fb References: <20230510082254.1036-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: 1683707061672100005 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 0eabe7106e..6d95cccea3 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1415,7 +1415,9 @@ igb_rx_desc_get_packet_type(IGBCore *core, struct Net= RxPkt *pkt, uint16_t etqf) net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); =20 if (hasip6 && !(core->mac[RFCTL] & E1000_RFCTL_IPV6_DIS)) { - pkt_type |=3D E1000_ADVRXD_PKT_IP6; + eth_ip6_hdr_info *ip6hdr_info =3D net_rx_pkt_get_ip6_info(pkt); + pkt_type |=3D ip6hdr_info->has_ext_hdrs ? E1000_ADVRXD_PKT_IP6E : + E1000_ADVRXD_PKT_IP6; } else if (hasip4) { pkt_type =3D E1000_ADVRXD_PKT_IP4; } diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index 71a8833229..36763f2ff7 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -694,6 +694,7 @@ union e1000_adv_rx_desc { =20 #define E1000_ADVRXD_PKT_IP4 BIT(0) #define E1000_ADVRXD_PKT_IP6 BIT(2) +#define E1000_ADVRXD_PKT_IP6E BIT(3) #define E1000_ADVRXD_PKT_TCP BIT(4) #define E1000_ADVRXD_PKT_UDP BIT(5) #define E1000_ADVRXD_PKT_SCTP BIT(6) --=20 2.25.1 From nobody Fri May 17 17:00:11 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=1683707079; cv=none; d=zohomail.com; s=zohoarc; b=btQ4fHy5eI8Crp2XBLosch0u0Gajd0SIjJX+DB/xihhidp3/zxAwbdVJyoNxgfECJxZS6e8lUvHlWdnZ1jmKoQlOXnVmvQN2rA2hYTfmMyX5fCa6V3zT+KecnAe7yYoMzNuQHUMj/7u5Fknhg+gDFD4Z+nEQXLjak5zbx9c5ATI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683707079; 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=S4j+h9sVlIgE+FkldXD6rgkuLxxxlCGoT8NPvMcPwNE=; b=eDDl/KwtxO8zrh1+5dhrIiMxtvM8wCFpQiiZ37DpPmQRimlS1xaMVOtKd/Ntxs2GBHCoXiNothwVv6p3HBJWPFNZQ6DkV1dyi9l/HDkIsZCVaCNHajOBjaq72EQVOYoNaSH+N/vcPmv4CQCK7HVJ7zNmwrn3IjdDj5otVmssD7g= 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 1683707079559106.70591507066126; Wed, 10 May 2023 01:24:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwf6R-0005tE-Fn; Wed, 10 May 2023 04:23:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwf6P-0005sB-A3 for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23:13 -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 1pwf6J-0007gs-Lq for qemu-devel@nongnu.org; Wed, 10 May 2023 04:23:13 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230510082304euoutp02c210073a0c5d4c0bb8fc11d53d1e5527~dupTbXnuy1889218892euoutp02y for ; Wed, 10 May 2023 08:23:04 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230510082303eucas1p24e7351067af1af463f603e8e6e6946d0~dupTFvfzn2230922309eucas1p2o; Wed, 10 May 2023 08:23:03 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 8C.4E.35386.7645B546; Wed, 10 May 2023 09:23:03 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230510082303eucas1p1df93402a1771f308faec7a76d03282cc~dupSuPRsg0603006030eucas1p1d; Wed, 10 May 2023 08:23:03 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230510082303eusmtrp2651e833dbccb9ba0d7b2b1b165538a02~dupStkpMl1369213692eusmtrp2a; Wed, 10 May 2023 08:23:03 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 7B.B3.14344.7645B546; Wed, 10 May 2023 09:23:03 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230510082302eusmtip1f987995cc1be9efcab3587815e33f19a~dupSKdBmA2104721047eusmtip1D; Wed, 10 May 2023 08:23:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230510082304euoutp02c210073a0c5d4c0bb8fc11d53d1e5527~dupTbXnuy1889218892euoutp02y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683706984; bh=S4j+h9sVlIgE+FkldXD6rgkuLxxxlCGoT8NPvMcPwNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D+Pi2O9vxa3SQeduSNe++MpyzpCU1pO9YFDnmvK2Xue7v7enbTAqw2LoAnnHz9HH1 ncSZH+DH4KkieqsC90QlCB/7b6zzZkHyVRb0HHmV9AJfqNfD93Ws4lDplZhxHM2UlY 11UtpQNkhFnEG5av2i+0+Yx1xX+hoFdH6JuDAjoA= X-AuditID: cbfec7f4-cc9ff70000028a3a-53-645b54670390 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 v5 6/6] igb: packet-split descriptors support Date: Wed, 10 May 2023 10:22:54 +0200 Message-Id: <20230510082254.1036-7-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230510082254.1036-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgleLIzCtJLcpLzFFi42LZduzned30kOgUg0M3dS0+n1rLbrHs0mcm i8b5c1gttl79wW5xvHcHi0XvphdMDmweJ94eZPW48Ogcs8eTa5uZPN7vu8rm0bdlFWMAaxSX TUpqTmZZapG+XQJXxoblc9kLru5grHh75ytbA+PV2i5GTg4JAROJE5sOMoLYQgIrGCVWvBbp YuQCsr8wSnzZ1MMK4XxmlDjZ/IWpi5EDrGPexBSIhuWMEh/veEHUtDNJPLvzghkkwSZgJvHo yzxWkHoRAWOJj+3iIGFmgVSJo38OsoDYwgK2Et+XfmMFsVkEVCW+/trABlLOK+Ak8f2RD8Rt 8hIzL31nB7E5BZwl9s5pBSvnFRCUODnzCQvESHmJ5q2zmUFOkBDYwyHxZOMqJohmF4ndfZ0s ELawxKvjW9ghbBmJ/zvnQ9WUS/w8u40dormFUWLP1MlQRdYSl7b+BLufWUBTYv0ufYiwo0Tv jkXskGDgk7jxVhDiBj6JSdumM0OEeSU62oQgqnUkvm2ayQYRlpJYeKMOwvSQ2LwicgKj4iwk v8xC8ssshK0LGJlXMYqnlhbnpqcWG+WllusVJ+YWl+al6yXn525iBCaW0/+Of9nBuPzVR71D jEwcjIcYJTiYlUR4vUOjUoR4UxIrq1KL8uOLSnNSiw8xSnOwKInzatueTBYSSE8sSc1OTS1I LYLJMnFwSjUwme4+3zVHVSXmUG2k6723xyvL683Yqn4ta9JQO3Nh4gPXU3zTZpscn9R56kXG qa4uzt75h4r/+SncPzEpYJqRqvaUpt7GyAcXxQ57nVcwq32udmHBL4msA/mB++O/CXq++JO9 MWnO/5918ws+/D1z5jzjfk4fVs2oKFPN4Ao754QTTz/MPRul9GPLi5m6+QksOsYz688G30k/ r5GhU3bfUjLfdPWfj5/Yl59Ya/m18+S+nMtnkvt3i9zylFzAG5Na9KrEI+NH/1RxiaCEZatu T8pkeiK17J7CjRpx2Qim3ffZPhSfWichZW3lXmcmOi9RegZb5qG9gj9W/pC0Uvse/WE/e7Pk GZE18jmyO+suKLEUZyQaajEXFScCAEZcH3ebAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xu7rpIdEpBj+mill8PrWW3WLZpc9M Fo3z57BabL36g93ieO8OFoveTS+YHNg8Trw9yOpx4dE5Zo8n1zYzebzfd5XNo2/LKsYA1ig9 m6L80pJUhYz84hJbpWhDCyM9Q0sLPSMTSz1DY/NYKyNTJX07m5TUnMyy1CJ9uwS9jA3L57IX XN3BWPH2zle2BsartV2MHBwSAiYS8yamdDFycQgJLGWUuH+4h6mLkRMoLiWxr+c/O4QtLPHn WhcbRFErk8TVjSfAitgEzCQefZnHCjJIRMBU4tleSZAws0CmxOlX+9hAbGEBW4nvS7+xgtgs AqoSX39tYAMp5xVwkvj+yAdivLzEzEvfwVZxCjhL7J3TClYuBFQya8UaZhCbV0BQ4uTMJywQ 4+UlmrfOZp7AKDALSWoWktQCRqZVjCKppcW56bnFRnrFibnFpXnpesn5uZsYgZGw7djPLTsY V776qHeIkYmD8RCjBAezkgivd2hUihBvSmJlVWpRfnxRaU5q8SFGU6CzJzJLiSbnA2MxryTe 0MzA1NDEzNLA1NLMWEmc17OgI1FIID2xJDU7NbUgtQimj4mDU6qBSepToeNEt2/XnustqFh5 U3znd+ucf6tXpBqePbbnzzXD898m89z30GeNZ7FbL7xCbMfG+cvn9ImlGJhFpAc03yh6mVtw cfYMu833ZQR+VmS6aGgdTGtmjWU8+HxDWa3va4VbwZcq7+X8ObRO9qrI2lJR/TMeP/5Oftin I/zVvUVXkFlWZuoNHp2b/6ep+F1ZJS5pE2J4Pf/wl83z3j1ewOTGe+WvQkPE7qSw+Dkr9iSH XNuYxVjjte1Y76vE27a7xG5dmnrM9FS879WGXfvCRM7zH5u4OHPu3bn35lZdz1JLfHxotXHZ nMdzZjee6DGOvX7rRuWzaK7zF7iq7806cufwGQWLn6L5E6pFvHxv3StUYinOSDTUYi4qTgQA 20X0eQ0DAAA= X-CMS-MailID: 20230510082303eucas1p1df93402a1771f308faec7a76d03282cc X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230510082303eucas1p1df93402a1771f308faec7a76d03282cc X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230510082303eucas1p1df93402a1771f308faec7a76d03282cc References: <20230510082254.1036-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: 1683707080329100003 Packet-split descriptors are used by Linux VF driver for MTU values from 20= 48 Signed-off-by: Tomasz Dzieciol --- hw/net/e1000e_core.c | 10 +- hw/net/igb_core.c | 403 ++++++++++++++++++++++++++++++++++++++----- hw/net/igb_regs.h | 7 + hw/net/trace-events | 2 +- 4 files changed, 373 insertions(+), 49 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index f9ff31fd70..be0cf2f941 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -1397,15 +1397,15 @@ e1000e_pci_dma_write_rx_desc(E1000ECore *core, dma_= addr_t addr, } } =20 -typedef struct e1000e_ba_state_st { +typedef struct E1000EBAState { uint16_t written[MAX_PS_BUFFERS]; uint8_t cur_idx; -} e1000e_ba_state; +} E1000EBAState; =20 static inline void e1000e_write_hdr_to_rx_buffers(E1000ECore *core, hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, + E1000EBAState *bastate, const char *data, dma_addr_t data_len) { @@ -1420,7 +1420,7 @@ e1000e_write_hdr_to_rx_buffers(E1000ECore *core, static void e1000e_write_payload_frag_to_rx_buffers(E1000ECore *core, hwaddr ba[MAX_PS_BUFFERS], - e1000e_ba_state *bastate, + E1000EBAState *bastate, const char *data, dma_addr_t data_len) { @@ -1530,7 +1530,7 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct= NetRxPkt *pkt, =20 do { hwaddr ba[MAX_PS_BUFFERS]; - e1000e_ba_state bastate =3D { { 0 } }; + E1000EBAState bastate =3D { { 0 } }; bool is_last =3D false; =20 desc_size =3D total_size - desc_offset; diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 6d95cccea3..9a08f2e7d3 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,54 @@ 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 +typedef struct IGBRxDescBufAddrs { + hwaddr hdr_buf_addr; + hwaddr pkt_buf_addr; +} IGBRxDescBufAddrs; + +typedef enum IGBBastateCurrentBuffer { + IgbHdrBuf =3D 0, + IgbPktBuf =3D 1 +} IGBBastateCurrentBuffer; + +static hwaddr * +igb_buf_addr(IGBRxDescBufAddrs *buf_addrs, IGBBastateCurrentBuffer cur_buf) +{ + return (cur_buf =3D=3D IgbPktBuf) ? &buf_addrs->pkt_buf_addr : + &buf_addrs->hdr_buf_addr; +} + +static inline void +igb_read_adv_rx_split_buf_descr(IGBCore *core, union e1000_adv_rx_desc *de= sc, + IGBRxDescBufAddrs *buf_addr) +{ + buf_addr->hdr_buf_addr =3D le64_to_cpu(desc->read.hdr_addr); + buf_addr->pkt_buf_addr =3D le64_to_cpu(desc->read.pkt_addr); +} + +typedef struct IGBRxDescBuffWritten { + uint16_t hdr_buf_written; + uint16_t pkt_buf_written; +} IGBRxDescBuffWritten; + +static uint16_t * +igb_buf_written(IGBRxDescBuffWritten *written, IGBBastateCurrentBuffer cur= _buf) +{ + return (cur_buf =3D=3D IgbPktBuf) ? &written->pkt_buf_written : + &written->hdr_buf_written; +} + +typedef struct IGBBAState { + IGBRxDescBuffWritten written; + IGBBastateCurrentBuffer cur_buf; +} IGBBAState; + typedef struct IGBPacketRxDMAState { size_t size; size_t total_size; @@ -1249,20 +1305,43 @@ 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; + IGBRxDescBufAddrs ba; } 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.pkt_buf_addr); + pdma_st->ba.hdr_buf_addr =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); + 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.pkt_buf_addr); + pdma_st->ba.hdr_buf_addr =3D 0; } =20 static void @@ -1405,6 +1484,13 @@ igb_write_lgcy_rx_descr(IGBCore *core, struct e1000_= rx_desc *desc, desc->status =3D (uint8_t) le32_to_cpu(status_flags); } =20 +static bool +igb_rx_ps_descriptor_split_always(IGBCore *core, const E1000ERingInfo *r) +{ + uint32_t desctyp =3D igb_rx_queue_desctyp_get(core, r); + return desctyp =3D=3D E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS; +} + static uint16_t igb_rx_desc_get_packet_type(IGBCore *core, struct NetRxPkt *pkt, uint16_t = etqf) { @@ -1492,16 +1578,70 @@ 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_adv_ps_split_rx_descr(IGBCore *core, + union e1000_adv_rx_desc *d, + struct NetRxPkt *pkt, + const E1000E_RSSInfo *rss_info, + const E1000ERingInfo *r, + uint16_t etqf, + bool ts, + IGBSplitDescriptorData *ps_desc_data, + IGBPacketRxDMAState *pdma_st) +{ + size_t pkt_len; + size_t hdr_len =3D ps_desc_data->hdr_len; + + bool split_always =3D igb_rx_ps_descriptor_split_always(core, r); + if (!split_always) { + if ((!ps_desc_data->sph && !ps_desc_data->hbo) || + (ps_desc_data->sph && ps_desc_data->hbo)) { + pkt_len =3D pdma_st->bastate.written.hdr_buf_written + + pdma_st->bastate.written.pkt_buf_written; + } else { + assert(!ps_desc_data->hbo); + pkt_len =3D pdma_st->bastate.written.pkt_buf_written; + } + } else { + pkt_len =3D pdma_st->bastate.written.pkt_buf_written; + } + + 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, uint16_t length) +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.pkt_buf_written); + } else if (igb_rx_use_ps_descriptor(core, r)) { + igb_write_adv_ps_split_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); + igb_write_adv_rx_descr(core, &desc->adv, pkt, rss_info, etqf, ts, + pdma_st->bastate.written.pkt_buf_written); } } =20 @@ -1562,26 +1702,189 @@ igb_rx_descr_threshold_hit(IGBCore *core, const E1= 000ERingInfo *rxi) ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; } =20 +static bool +igb_do_ps(IGBCore *core, + const E1000ERingInfo *r, + struct NetRxPkt *pkt, + size_t *hdr_len, + IGBSplitDescriptorData *ps_desc_data) +{ + bool hasip4, hasip6; + EthL4HdrProto l4hdr_proto; + bool fragment; + bool split_always; + size_t bheader_size; + size_t total_pkt_len; + + if (!igb_rx_use_ps_descriptor(core, r)) { + return false; + } + + memset(ps_desc_data, 0, sizeof(IGBSplitDescriptorData)); + + total_pkt_len =3D net_rx_pkt_get_total_len(pkt); + bheader_size =3D igb_get_queue_rx_header_buf_size(core, r); + split_always =3D igb_rx_ps_descriptor_split_always(core, r); + if (split_always && total_pkt_len <=3D bheader_size) { + *hdr_len =3D total_pkt_len; + ps_desc_data->hdr_len =3D total_pkt_len; + return true; + } + + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); + + if (hasip4) { + fragment =3D net_rx_pkt_get_ip4_info(pkt)->fragment; + } else if (hasip6) { + fragment =3D net_rx_pkt_get_ip6_info(pkt)->fragment; + } else { + ps_desc_data->hdr_len =3D bheader_size; + goto header_not_handled; + } + + if (fragment && (core->mac[RFCTL] & E1000_RFCTL_IPFRSP_DIS)) { + ps_desc_data->hdr_len =3D bheader_size; + goto header_not_handled; + } + + /* no header splitting for SCTP */ + if (!fragment && (l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_UDP || + l4hdr_proto =3D=3D ETH_L4_HDR_PROTO_TCP)) { + *hdr_len =3D net_rx_pkt_get_l5_hdr_offset(pkt); + } else { + *hdr_len =3D net_rx_pkt_get_l4_hdr_offset(pkt); + } + + ps_desc_data->sph =3D true; + ps_desc_data->hdr_len =3D *hdr_len; + + if (*hdr_len > bheader_size) { + ps_desc_data->hbo =3D true; + goto header_not_handled; + } + + return true; + +header_not_handled: + if (split_always) { + *hdr_len =3D bheader_size; + return true; + } + + return false; +} + static void igb_truncate_to_descriptor_size(IGBPacketRxDMAState *pdma_st, size_t *size) { - if (*size > pdma_st->rx_desc_packet_buf_size) { - *size =3D pdma_st->rx_desc_packet_buf_size; + if (pdma_st->do_ps && pdma_st->is_first) { + if (*size > pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_len= ) { + *size =3D pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_l= en; + } + } else { + if (*size > pdma_st->rx_desc_packet_buf_size) { + *size =3D pdma_st->rx_desc_packet_buf_size; + } } } =20 +static inline void +igb_write_hdr_to_rx_buffers(IGBCore *core, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + const char *data, + dma_addr_t data_len) +{ + assert(data_len <=3D pdma_st->rx_desc_header_buf_size - + pdma_st->bastate.written.hdr_buf_written); + pci_dma_write(d, + pdma_st->ba.hdr_buf_addr + + pdma_st->bastate.written.hdr_buf_written, + data, data_len); + pdma_st->bastate.written.hdr_buf_written +=3D data_len; + pdma_st->bastate.cur_buf =3D IgbPktBuf; +} + +static void +igb_write_packet_hdr_to_descr_addr(IGBCore *core, + struct NetRxPkt *pkt, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + size_t *copy_size) +{ + size_t iov_copy; + size_t ps_hdr_copied =3D 0; + + if (!pdma_st->is_first) { + /* Leave buffer 0 of each descriptor except first */ + /* empty */ + pdma_st->bastate.cur_buf =3D IgbPktBuf; + return; + } + + do { + iov_copy =3D MIN(pdma_st->ps_hdr_len - ps_hdr_copied, + pdma_st->iov->iov_len - pdma_st->iov_ofs); + + igb_write_hdr_to_rx_buffers(core, d, pdma_st, + pdma_st->iov->iov_base, + iov_copy); + + *copy_size -=3D iov_copy; + ps_hdr_copied +=3D iov_copy; + + pdma_st->iov_ofs +=3D iov_copy; + if (pdma_st->iov_ofs =3D=3D pdma_st->iov->iov_len) { + pdma_st->iov++; + pdma_st->iov_ofs =3D 0; + } + } while (ps_hdr_copied < pdma_st->ps_hdr_len); + + pdma_st->is_first =3D false; +} + 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_buf =3D=3D IgbHdrBuf || + pdma_st->bastate.cur_buf =3D=3D IgbPktBuf); + + uint32_t cur_buf_bytes_left =3D + pdma_st->rx_desc_packet_buf_size - + *igb_buf_written(&pdma_st->bastate.written, + pdma_st->bastate.cur_buf); + uint32_t bytes_to_write =3D MIN(data_len, cur_buf_bytes_left); + + trace_igb_rx_desc_buff_write( + pdma_st->bastate.cur_buf, + *igb_buf_addr(&pdma_st->ba, pdma_st->bastate.cur_buf), + *igb_buf_written(&pdma_st->bastate.written, + pdma_st->bastate.cur_buf), + data, + bytes_to_write); + + pci_dma_write(d, + *igb_buf_addr(&pdma_st->ba, pdma_st->bastate.cur_buf= ) + + *igb_buf_written(&pdma_st->bastate.written, + pdma_st->bastate.cur_buf), + data, bytes_to_write); + + *igb_buf_written(&pdma_st->bastate.written, + pdma_st->bastate.cur_buf) +=3D bytes_to_write; + data +=3D bytes_to_write; + data_len -=3D bytes_to_write; + + if (*igb_buf_written(&pdma_st->bastate.written, + pdma_st->bastate.cur_buf) =3D=3D + pdma_st->rx_desc_packet_buf_size) { + pdma_st->bastate.cur_buf++; + } + } } =20 static void @@ -1598,9 +1901,7 @@ igb_write_payload_to_rx_buffers(IGBCore *core, while (*copy_size) { iov_copy =3D MIN(*copy_size, pdma_st->iov->iov_len - pdma_st->iov_= ofs); igb_write_payload_frag_to_rx_buffers(core, d, - pdma_st->ba, - &pdma_st->written, - pdma_st->rx_desc_packet_buf_s= ize, + pdma_st, pdma_st->iov->iov_base + pdma_st->iov_ofs, iov_copy); @@ -1616,9 +1917,7 @@ igb_write_payload_to_rx_buffers(IGBCore *core, if (pdma_st->desc_offset + pdma_st->desc_size >=3D pdma_st->total_size= ) { /* Simulate FCS checksum presence in the last descriptor */ igb_write_payload_frag_to_rx_buffers(core, d, - pdma_st->ba, - &pdma_st->written, - pdma_st->rx_desc_packet_buf_s= ize, + pdma_st, (const char *) &fcs_pad, e1000x_fcs_len(core->mac)); } @@ -1632,7 +1931,7 @@ igb_write_to_rx_buffers(IGBCore *core, { size_t copy_size; =20 - if (!pdma_st->ba) { + if (!pdma_st->ba.pkt_buf_addr) { /* as per intel docs; skip descriptors with null buf addr */ trace_e1000e_rx_null_descriptor(); return; @@ -1646,6 +1945,14 @@ igb_write_to_rx_buffers(IGBCore *core, igb_truncate_to_descriptor_size(pdma_st, &pdma_st->desc_size); copy_size =3D pdma_st->size - pdma_st->desc_offset; igb_truncate_to_descriptor_size(pdma_st, ©_size); + + /* For PS mode copy the packet header first */ + if (pdma_st->do_ps) { + igb_write_packet_hdr_to_descr_addr(core, pkt, d, pdma_st, ©_si= ze); + } else { + pdma_st->bastate.cur_buf =3D IgbPktBuf; + } + igb_write_payload_to_rx_buffers(core, pkt, d, pdma_st, ©_size); } =20 @@ -1660,6 +1967,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 +1986,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 +2002,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 +2010,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..080f03fc43 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,12 @@ union e1000_adv_rx_desc { #define E1000_ADVRXD_PKT_UDP BIT(5) #define E1000_ADVRXD_PKT_SCTP BIT(6) =20 +#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