From nobody Wed May 15 11:09:53 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=1683221602; cv=none; d=zohomail.com; s=zohoarc; b=lTog7lIIqtP6Th7o471tOr+vsqogz8RbBK/XYOotyb2d3BCFZ/7lGJ9lmRNmXE2nYQKoBzVNcP2MT+XSrtOmYKCpuyj+vmREXQZBdTzdwrq9yTZ+5KNcyCBSKwNnxqhs+2HanKwBMjJBHe1hoWbMhLpeYwNe5WxgpEzdDxE/FbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683221602; 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=YBMzLnJtKaetJ8okMrf7kqeb0j8MfYj36z8MZbtS+aMSv8H2Rd1aL6vQVgeMVaIzAv0i3qdu1vOIo7m+ooqQcQutsX70noX1rOD87PwP54aoAR612AGUAu9r14na+papKGLnj0+tVtkJdYzO4SID4tCWhyF/7/nNJB4t07zgY3g= 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 1683221602105162.19832809732088; Thu, 4 May 2023 10:33:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pucox-0008JM-8t; Thu, 04 May 2023 13:32:49 -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 1puYjt-0003pV-7J for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:17 -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 1puYjn-0002u4-46 for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:15 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230504131106euoutp01500a0eddf5c6ed1f122320d5cafba519~b8tFIZcQe1983119831euoutp01C for ; Thu, 4 May 2023 13:11:06 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230504131106eucas1p2a58728dc16bbdc677e1c44e8819dc0bc~b8tE6-AwO2682926829eucas1p2z; Thu, 4 May 2023 13:11:06 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id B4.24.42423.AEEA3546; Thu, 4 May 2023 14:11:06 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230504131105eucas1p2610f7bcc7c4fabba29cd198c52ac30f2~b8tElJWeF1553515535eucas1p20; Thu, 4 May 2023 13:11:05 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230504131105eusmtrp29c197aec74226c6da8fb857fd2671fa9~b8tEkdqov1716517165eusmtrp2L; Thu, 4 May 2023 13:11:05 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id D3.7E.10549.9EEA3546; Thu, 4 May 2023 14:11:05 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230504131105eusmtip12f23fce83ee0d59f4720d86f9e3172a5~b8tEEZuPw1970019700eusmtip1w; Thu, 4 May 2023 13:11:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230504131106euoutp01500a0eddf5c6ed1f122320d5cafba519~b8tFIZcQe1983119831euoutp01C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683205866; bh=RAdTRgkb5cVy6FP5ribk2kxIlvYd4xCVAvY0Bobfcq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pkjOgTESPPf2eS4kGaxxfGAoL+ySObXfkh3RI/uX6UPbPWePCzETdlVTifCDVxtkq 5HkMs51+cbBp26XgvXkZXpBsvCtIFEPTj/4LgNqt2ZQoMk005j4K45S+H2+V+04C6s 767fVrpUrOz/WNF3TB91oebkuppMJDLvyFGM8Cak= X-AuditID: cbfec7f2-a3bff7000002a5b7-a8-6453aeea6d7d 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 v4 1/5] igb: remove TCP ACK detection Date: Thu, 4 May 2023 15:10:51 +0200 Message-Id: <20230504131055.11767-2-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230504131055.11767-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmleLIzCtJLcpLzFFi42LZduzned1X64JTDI495bT4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFFc NimpOZllqUX6dglcGd9ebWIpuM1a8e7KRaYGxj0sXYycHBICJhJ3Trazg9hCAisYJRrbK7sY uYDsL4wS/9a9YIVwPjNKtB2bzQzTcXj9DkaIxHJGiekP+5khnHYmiRUHJrOCVLEJmEk8+jIP yObgEBEwlvjYLg4SZhZIlTj65yDYamEBU4mWle+YQGwWAVWJjy2LweK8As4Sx/t3sUEsk5eY eek72HmcAi4SW6ZNYIWoEZQ4OfMJC8RMeYnmrbPBbpAQ2MIh8anzKRNEs4vExrl/GCFsYYlX x7ewQ9gyEv93zoeqKZf4eXYbO0RzC6PEnqmToYqsJS5t/Qn2ALOApsT6XfoQYUeJWZe7wMIS AnwSN94KQtzAJzFp23RmiDCvREebEES1jsS3TTPZIMJSEgtv1EGEPSTmPd/HPoFRcRaSZ2Yh eWYWwtoFjMyrGMVTS4tz01OLDfNSy/WKE3OLS/PS9ZLzczcxAtPL6X/HP+1gnPvqo94hRiYO xkOMEhzMSiK8Hwr9UoR4UxIrq1KL8uOLSnNSiw8xSnOwKInzatueTBYSSE8sSc1OTS1ILYLJ MnFwSjUwud5fzdF9t/npzoptaYv7Pgk43VdTVCq3Cwm85BjyeE7Ux22egZOKWgUyV/d0rTzW 6iGx+uSdwNfVUafjWaI+5cxpsb6kmGC2oEjkyaH8kJsPxDz3igonL5urv1/c6IissdlUtTDl PUf96z38WLrCd/zMT51SFb/w5T/9pF1s33sfmz2rad7xfVK9YNBUuZUNv6WftW9Wdlga8GzL U332G1P2Mf98eKH99r5q0Y6+aRNlmRsuiorJt9tebu/SesQda23M+zBXwJbpWbFLUrqGUVC1 8b4JujflAvJWdj7nSGqV6nzhE/JAperNm4cb5i85n+NUue11TdrU4+0MbP2a6/ee3j1ju939 ao9jG7iVWIozEg21mIuKEwHAsV6rngMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsVy+t/xu7ov1wWnGHQd1bf4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFF6 NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6Gd9ebWIp uM1a8e7KRaYGxj0sXYycHBICJhKH1+9g7GLk4hASWMoose5xLztEQkpiX89/KFtY4s+1LjaI olYmiY+/nrOBJNgEzCQefZnH2sXIwSEiYCrxbK8kSJhZIFPi9Kt9YCXCQOGWle+YQGwWAVWJ jy2LwRbzCjhLHO/fxQYxX15i5qXvYLs4BVwktkybwApiCwHVnDj+gw2iXlDi5MwnLBDz5SWa t85mnsAoMAtJahaS1AJGplWMIqmlxbnpucWGesWJucWleel6yfm5mxiBsbDt2M/NOxjnvfqo d4iRiYPxEKMEB7OSCO+HQr8UId6UxMqq1KL8+KLSnNTiQ4ymQHdPZJYSTc4HRmNeSbyhmYGp oYmZpYGppZmxkjivZ0FHopBAemJJanZqakFqEUwfEwenVAPTgrbCmU8Ozt8mZy75z0Hgfb1H tl2m0bt/tXEem+5kHZs9cbec5bz5dTI8AocexRToXLpw/fyMqw96/ieF/8ma3M+lNXe61Fmh 5vkxP/aruImz5PoLpRwLDnG6zftIcbWHb+DVT7HqqTuO5CW38KuKMxoqPRKYeSq/S1WLvfFx 1jXxzS4rrJgzZ9x7uC3/wJ60BV3Zjf5chxq1DZv/3pI7zFL1TGLeHp6lNb4VnQ3Kf90meQT8 +1hfu9uGedKJ6DO9nw892ffBX5FnxrvPr4/EJOat1XFK7p2boKjT99bi/fUfVQdjPxg+U5vw RH/zfnPjA+11y+en/j5jyXrK6U946hnun8+1jc8Hcj2XydqvxFKckWioxVxUnAgAR1OnuQ4D AAA= X-CMS-MailID: 20230504131105eucas1p2610f7bcc7c4fabba29cd198c52ac30f2 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230504131105eucas1p2610f7bcc7c4fabba29cd198c52ac30f2 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230504131105eucas1p2610f7bcc7c4fabba29cd198c52ac30f2 References: <20230504131055.11767-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.11; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout1.w1.samsung.com X-Spam_score_int: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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: 1683221603374100001 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 Wed May 15 11:09:53 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=1683222449; cv=none; d=zohomail.com; s=zohoarc; b=fne1da//i7lxxapPwUhh6cPzlJj0U/V/2rQYyjqWvORu+3nBkTGQ+Khv+XVZJMKPurrtiW5PW5KwHDnOYrqcDaS59le6s0bmHhdfWkv1bura7ABu4ECxK5DRPnpPRs8e70Sd7X/H0NL6T7/beXMECk9s6kxt7kmeMmbzp05M3qo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683222449; 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=NlbjXQhXA2SqRfqTxBz4d6WC+pasPzHbWpuvFkc6ubI=; b=C2/ighgNHgaR/zIMMxFLslQZF5AzJoHxYI3TIcIun6VxpLZy427x7doXwEhEv51i+ztqpqjDEio/fiGiREak7Fzi891sABcGfmmQEMsCaqiVczCMaCnx4Eh4Yo0EAS3Co2mKAsUYpJZhY5T1Ay6agwraQbk15QDtsYCsZguYsEk= 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 1683222449267660.6838653486277; Thu, 4 May 2023 10:47:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pucpi-0002Qz-5E; Thu, 04 May 2023 13:33:35 -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 1puYjw-0003r2-Ms for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:20 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puYjn-0002u7-46 for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:20 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230504131107euoutp0279f6b631befc40ee1b79913047fd9429~b8tFyMXJJ2011320113euoutp02q for ; Thu, 4 May 2023 13:11:07 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230504131106eucas1p208bc1dacf92ba853ae3e01f2a0d5443b~b8tFbB3l21552015520eucas1p2u; Thu, 4 May 2023 13:11:06 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 46.54.35386.AEEA3546; Thu, 4 May 2023 14:11:06 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230504131106eucas1p1714e019395c941f51155c0e9ae52a66b~b8tFFTwoi0733607336eucas1p1v; Thu, 4 May 2023 13:11:06 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230504131106eusmtrp1ae21abc6840aaef53bc1834aa4ec3df0~b8tFEmUTM2656226562eusmtrp1Y; Thu, 4 May 2023 13:11:06 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 5F.0E.14344.AEEA3546; Thu, 4 May 2023 14:11:06 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230504131105eusmtip139f214decce03ee2f3c11626363ea75c~b8tEkVbDi2036220362eusmtip1V; Thu, 4 May 2023 13:11:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230504131107euoutp0279f6b631befc40ee1b79913047fd9429~b8tFyMXJJ2011320113euoutp02q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683205867; bh=NlbjXQhXA2SqRfqTxBz4d6WC+pasPzHbWpuvFkc6ubI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fpq69HMC3JHd0I760/cUDMaCYBgLdO6MGywJjzZh0ChTopbhhSzPWwOjyyDbvi7NV 12A8ZtMluLYoDeWKmGl2MSl/YhRQ8g1ehsW9DwBKm7KpMJag3wX1ik/Ydd8nozVI1E X5XL9UijXPslJ41pN4wn5VMHmissyk8cJhIaEeo8= X-AuditID: cbfec7f4-cdfff70000028a3a-7e-6453aeea7eae 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 v4 2/5] igb: rename E1000E_RingInfo_st Date: Thu, 4 May 2023 15:10:52 +0200 Message-Id: <20230504131055.11767-3-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230504131055.11767-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgleLIzCtJLcpLzFFi42LZduznOd1X64JTDO69VrP4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFFc NimpOZllqUX6dglcGbenXWEtOG9asabzI2MD40GtLkZODgkBE4l3r38wgthCAisYJR5cd+hi 5AKyvzBKHPu0ggnC+cwoMfFUKxNMx9SrZ6ESyxkl1ty7ywbhtDNJPJz5AKyKTcBM4tGXeaxd jBwcIgLGEh/bxUHCzAKpEkf/HGQBsYWBSm7O+8UIUsIioCpx4agPSJhXwFniwINzzBC75CVm XvrODmJzCrhIbJk2gRWiRlDi5MwnLBAj5SWat85mBjlBQmALh8Sq21fZQGZKADVMecULMUdY 4tXxLewQtozE6ck9LBB2ucTPs9vYIXpbGCX2TJ0MVWQtcWnrT7DzmQU0Jdbv0ocY6Shx/WE6 hMknceOtIMQFfBKTtk1nhgjzSnS0CUHM0JH4tmkm1C1SEgtv1EGEPSTmHdjOOIFRcRaSV2Yh eWUWwtYFjMyrGMVTS4tz01OLjfJSy/WKE3OLS/PS9ZLzczcxAhPL6X/Hv+xgXP7qo94hRiYO xkOMEhzMSiK8Hwr9UoR4UxIrq1KL8uOLSnNSiw8xSnOwKInzatueTBYSSE8sSc1OTS1ILYLJ MnFwSjUw+VvP3Z6sxVhpZnC5YFqXxvZ1z+6/nKW1fNP+S1umKcyY3ZH099SOGzVnJvWGM+wM uzhJa05j6/pGnw0/JbYXOKrw37vxbv/lb0JJbPw7LMMZV9xe2GQkZVq/9VhDVc6+88frj7ts TLb4GTjvYviezlsb9prxaYcEiTgE9lXm6rxfn6QqvraslvlV7+cdycdea/Ju5OWZHHrg4Uun RQKrVRuEE3e+zJ6/oX/X2Un+Gi17/pd0uh7Z76N5wzjAgCPMoXRWq0y6UFPXu7Zc0xOWod0t U79qL1ugxJT4ytmnsNZHepuIWalJn+kykyj2qNcpPEGPp4XuacuXuu7NfZDzxVd59nVad8tZ mgqMOBqUWIozEg21mIuKEwEaZ0wkmwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xu7qv1gWnGFx9LGDx+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mm5Pu8Ja cN60Yk3nR8YGxoNaXYycHBICJhJTr55l6mLk4hASWMooceTNDGaIhJTEvp7/7BC2sMSfa11s EEWtTBJ/LzSxgCTYBMwkHn2Zx9rFyMEhImAq8WyvJEiYWSBT4vSrfWwgtjBQyc15vxhBSlgE VCUuHPUBCfMKOEsceHAOapW8xMxL38FWcQq4SGyZNoEVxBYCqjlx/AcbRL2gxMmZT1ggxstL NG+dzTyBUWAWktQsJKkFjEyrGEVSS4tz03OLjfSKE3OLS/PS9ZLzczcxAiNh27GfW3Ywrnz1 Ue8QIxMH4yFGCQ5mJRHeD4V+KUK8KYmVValF+fFFpTmpxYcYTYHOnsgsJZqcD4zFvJJ4QzMD U0MTM0sDU0szYyVxXs+CjkQhgfTEktTs1NSC1CKYPiYOTqkGpjr3y9rKOYdsZxuK11x6FXzB ZJf0QcuLi7J471bcvPdC67F6KutFtQsZh1Q+ZX39xij40KA262TiVjHlXWnB3300pyg799zi fxc9kWPfkxVLOZUXyehP+Gv94ktt9OFt5zbc6Vt6y2rSgqAonj2Hn+dvep/R/eVNxCRxo22T iouUxXin9V1cfGpN90EulaPLQ3/ar9lfFdd1I9nxb/2Uw18DVvmc3FXA6tbyuSArcdVCftvU Q6JXDGsKbmS0PdyVeUH7curLsz9s82fMSLUpKo6eOUE1l83o9GGJdTeS0puT/3x65ttqIrXQ MMns54/DdR4ak7oqZm5ibM/8He15NDJkRscFy91hBumx7X+l2pVYijMSDbWYi4oTAUnYcOIN AwAA X-CMS-MailID: 20230504131106eucas1p1714e019395c941f51155c0e9ae52a66b X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230504131106eucas1p1714e019395c941f51155c0e9ae52a66b X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230504131106eucas1p1714e019395c941f51155c0e9ae52a66b References: <20230504131055.11767-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.12; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout2.w1.samsung.com X-Spam_score_int: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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: 1683222450967100001 Rename E1000E_RingInfo_st and E1000E_RingInfo according to qemu typdefs gui= de. Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) 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 Wed May 15 11:09:53 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=1683221792; cv=none; d=zohomail.com; s=zohoarc; b=Og8fGRMhQoLT7MGazC+U14zg1VIrEtV/7JYTXyLDLuVFKRkc3HYObbZzRvaAQ6Xg6sRJBSKLFUUEKWBPuk7DENMuJPoX91puY4K5DI7SOHiPxwIBR/tNL/trgPvS0igGfDn/LHhmA2rlYP0Nm3PtIx+ubFCYjgk5VsTJLN4etRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683221792; 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=Zmia5+D2VLZojBeIU8qzUDdE9CJfCFrYjA6EoFkN8JE=; b=kr7FODAqjWYLBHbRnFzLjOx9jNrtrLOWicdG3b4mDO6X0+OvWofp5tvUA9ozwpKwQIKVQ7AQ2/6uVl+vbJZDaj3FjWDzaBek0Ij63unHcYkmzweZf3a1UxSB1fPqiPaGEDePdBvcWGdArxwbze5Z2hfy96oltqtJgkgNSXHEiak= 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 1683221792544418.6827697997504; Thu, 4 May 2023 10:36:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pucoH-0006xX-2j; Thu, 04 May 2023 13:32:05 -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 1puYk3-0003zJ-2Y for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:27 -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 1puYjn-0002uL-Se for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:26 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230504131107euoutp019fd0375f96a3c2da2741678e6b3b1dd0~b8tGhWPH71983119831euoutp01F for ; Thu, 4 May 2023 13:11:07 +0000 (GMT) Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230504131107eucas1p1a7ecaea33eeae06e8a6a82353a0ace44~b8tGEj5yd2006420064eucas1p1H; Thu, 4 May 2023 13:11:07 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 70.27.37758.BEEA3546; Thu, 4 May 2023 14:11:07 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230504131106eucas1p13530e4d1f10ca1086b39b37feddc3e28~b8tFpyvBA1451014510eucas1p1i; Thu, 4 May 2023 13:11:06 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230504131106eusmtrp223c4522cdaaa0272370f749c91ab97e4~b8tFpHGGS1716517165eusmtrp2V; Thu, 4 May 2023 13:11:06 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id F6.7E.10549.AEEA3546; Thu, 4 May 2023 14:11:06 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230504131106eusmtip108fcf46ece5de12867ce3da065ca3784~b8tFB2Gmu1694616946eusmtip1m; Thu, 4 May 2023 13:11:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230504131107euoutp019fd0375f96a3c2da2741678e6b3b1dd0~b8tGhWPH71983119831euoutp01F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683205867; bh=Zmia5+D2VLZojBeIU8qzUDdE9CJfCFrYjA6EoFkN8JE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uJSd11aWFqQCkNtxgKtDgWKpFfCiNM3EfibkKxjVE7oBLWv7bkncXMCD60YZ2PhJl aolCcVgyWqk25uMl4qPOSFbeNIRPTkgkx9VZffORUqEeeaFbVAsAB6GB1hyc/z0g38 lpsNj2hE9Mqvt4zz4ict1KFm+KaertW32wuboyhw= X-AuditID: cbfec7f5-815ff7000002937e-d4-6453aeeb3f89 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 v4 3/5] igb: RX descriptors handling cleanup Date: Thu, 4 May 2023 15:10:53 +0200 Message-Id: <20230504131055.11767-4-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230504131055.11767-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplleLIzCtJLcpLzFFi42LZduznOd3X64JTDKbNErH4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFFc NimpOZllqUX6dglcGZPuv2IvaNjHWLHk5nvmBsZ1dV2MnBwSAiYSy+8cZuxi5OIQEljBKPGt bSYThPOFUeLynutQmc+MErsa7jLBtCyctoEFIrGcUeLIz49QVe1MEhNbboBVsQmYSTz6Mo+1 i5GDQ0TAWOJjuzhImFkgVeLon4MsILawgI3E3YdbwcpZBFQlTj+fDGbzCjhLzH7xnhFimbzE zEvf2UFsTgEXiS3TJrBC1AhKnJz5hAViprxE89bZzCA3SAhs4ZA403CSDaLZRaKraQIzhC0s 8er4FnYIW0bi/875UN+US/w8u40dormFUWLP1MlQRdYSl7b+BHuAWUBTYv0ufYiwo8TXX1MY QcISAnwSN94KQtzAJzFp23RmiDCvREebEES1jsS3TTPZIMJSEgtvQEPdQ+LV3JWMExgVZyF5 ZhaSZ2YhrF3AyLyKUTy1tDg3PbXYOC+1XK84Mbe4NC9dLzk/dxMjMMWc/nf86w7GFa8+6h1i ZOJgPMQowcGsJML7odAvRYg3JbGyKrUoP76oNCe1+BCjNAeLkjivtu3JZCGB9MSS1OzU1ILU IpgsEwenVAMTv0OM+MHl08o0JzP7G9pP+u9teKSZb8+LGT8ezq7UqS/sz/+2m4c1tleVl0n7 wgTx2SqrPywp3aLGtWPeqnmhyd953TtL+Bd3CvLvT7wVVmdx66g5V/gOOX13hljnegX/Z/Py tJzr6kQfz+RjX7YgxIMxRGntlSDD37Mf7jde+XWL2rmaFgXHH59WX2hf2+X/cVtacm586lu3 opvPn595Ilar8Dvsv9OSiplSU9umLCq5tfNLScaGC87h2nmtl+P9RLdcuFrYcnV9FItM6DeR VPVikeq5pmy1js1fGRdeuyBpdCamPOz663u7/8dPDn++PqMgLuqrm9NVpU23uAx3qR7sSFD5 92ihacef2UeUWIozEg21mIuKEwEj9mS2oAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRmVeSWpSXmKPExsVy+t/xu7qv1gWnGJzdZGzx+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mibdf8Ve 0LCPsWLJzffMDYzr6roYOTkkBEwkFk7bwNLFyMUhJLCUUWLx9y52iISUxL6e/1C2sMSfa11s EEWtTBLzvm1lAkmwCZhJPPoyj7WLkYNDRMBU4tleSZAws0CmxOlX+9hAbGEBG4m7DyHKWQRU JU4/nwxm8wo4S8x+8Z4RYr68xMxL38F2cQq4SGyZNoEVxBYCqjlx/AcbRL2gxMmZT1gg5stL NG+dzTyBUWAWktQsJKkFjEyrGEVSS4tz03OLDfWKE3OLS/PS9ZLzczcxAqNh27Gfm3cwznv1 Ue8QIxMH4yFGCQ5mJRHeD4V+KUK8KYmVValF+fFFpTmpxYcYTYHunsgsJZqcD4zHvJJ4QzMD U0MTM0sDU0szYyVxXs+CjkQhgfTEktTs1NSC1CKYPiYOTqkGJp2aFOYX05je9huX5zQfE12x rP2+6Nk1b7XniXvyCDLfvLVp5xSzJ194K9s9Zk28fOvy/XgZ5UU1LUcFrzoqSzzcVM//Sc3E P3BzjfsiHdG/fDZdK1rcFBp1r/VU7GPZbnHNVeZ/mbN2utVxqZAlHyb9s5yV8yUjiy3xca/m Nf5l1tlu3q+fV3JWPVA2nmnUPq9LWKPg8dWfK+/xNExb91Hd+lR52JKtM3Ztbw86kPV1ilSB 9u9wxeN7Qp6GskqFX9nt1nBV/r6hur2mGKPS/qYPRw4G6uac/rZcNpM5w/Oaetm2rfH7jkyd GXLPKfCZcrD/0aOF/ulTfX42HzkoqmKxYp+vjNoPIbceqeVXlFiKMxINtZiLihMBusLIjw8D AAA= X-CMS-MailID: 20230504131106eucas1p13530e4d1f10ca1086b39b37feddc3e28 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230504131106eucas1p13530e4d1f10ca1086b39b37feddc3e28 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230504131106eucas1p13530e4d1f10ca1086b39b37feddc3e28 References: <20230504131055.11767-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, 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: 1683221794191100001 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 | 410 ++++++++++++++++++++++----------------- hw/net/igb_regs.h | 12 +- hw/net/trace-events | 6 +- tests/qtest/libqos/igb.c | 5 + 5 files changed, 263 insertions(+), 188 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 78373d7db7..0085ad53c2 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 b6031dea24..dbd09b9b46 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -267,6 +267,15 @@ 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 inline bool igb_rss_enabled(IGBCore *core) { @@ -694,15 +703,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) { @@ -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) { @@ -1281,15 +1289,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 +1302,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 +1318,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 +1373,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; + } =20 - desc->wb.upper.length =3D cpu_to_le16(length); + net_rx_pkt_get_protocols(pkt, &hasip4, &hasip6, &l4hdr_proto); + + 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 +1481,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); @@ -1508,19 +1520,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) @@ -1546,6 +1545,108 @@ igb_rx_descr_threshold_hit(IGBCore *core, const E10= 00ERingInfo *rxi) ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; } =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 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, @@ -1555,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_read_rx_descr(core, &desc, &pdma_st.ba); =20 - igb_write_to_rx_buffers(core, d, ba, &written, - iov->iov_base + iov_ofs, iov_c= opy); - - 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/hw/net/igb_regs.h b/hw/net/igb_regs.h index 82ff195dfc..c4ede22181 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 @@ -692,11 +693,12 @@ 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_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 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 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 Wed May 15 11:09:53 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=1683222455; cv=none; d=zohomail.com; s=zohoarc; b=hzmm1yUaRmUOSK93TmXKQV5O4rGg7SlpA0G8yOlOn0TjdNpW8OTgZSh3bl7L1fqnKFfw1itqxFlFaFCRSD+/OTk98W4MBSVWsP6O9rJxwh29lVV3cs8loOBqTiDeDnudFpjGL05BMBjlSMjC0Br6hEHAb5o+2S+ZLKiie9gJadw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683222455; 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=mvzc7FgrOPTpbNOFZpnMcMUrx5xvfU2kqBw6hkajnT8=; b=j1WpRdNjROmrF1lRrxDF2gnzuipzL/zO1pRFBcGdam5lUur6rlb1OBX8L77HOYOYAeki2GrlJzjQwTG0HJDgZ6aSh3PDkt7HaiLn9pOQDuNuokTM7urQ7aJae78szEo+8drhbD8+JqbWI38uwDukFibcoCibVn8SZ160ElxODGs= 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 1683222455594771.7622632897497; Thu, 4 May 2023 10:47:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pucq2-000302-CD; Thu, 04 May 2023 13:33:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puYk1-0003yj-Mn for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:25 -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 1puYjn-0002uO-SO for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:25 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230504131108euoutp01f837154ffd754bb3b69d1900663369d7~b8tGz7i201880118801euoutp01f for ; Thu, 4 May 2023 13:11:08 +0000 (GMT) Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230504131107eucas1p2add039c8c025487e046c263e13df592a~b8tGlnZ552682926829eucas1p23; Thu, 4 May 2023 13:11:07 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id B8.24.42423.BEEA3546; Thu, 4 May 2023 14:11:07 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230504131107eucas1p1bb75dd2ba7baf4f269ec2476feba69ac~b8tGFB7V90728907289eucas1p10; Thu, 4 May 2023 13:11:07 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230504131107eusmtrp183e4b97ce97ea6dae19bd5b127bfe3a9~b8tGEaibt2679726797eusmtrp1K; Thu, 4 May 2023 13:11:07 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id B0.1E.14344.BEEA3546; Thu, 4 May 2023 14:11:07 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230504131106eusmtip165a107b8569490db78200a7a8a96d0a5~b8tFjdMG42036220362eusmtip1W; Thu, 4 May 2023 13:11:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230504131108euoutp01f837154ffd754bb3b69d1900663369d7~b8tGz7i201880118801euoutp01f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683205868; bh=mvzc7FgrOPTpbNOFZpnMcMUrx5xvfU2kqBw6hkajnT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W1CWh4sDhpi5cD35ii/B5RIK033V+gEuM0AFpuo96ByDQTWWVxoCk10L1PF8ch2iF /GfXweFe1J24ZDoExn845nYQBbrShkzi+tWWm3Syf11vJff7LkKujYPoubukxoP6eM ngIkeuZHbMDfCj1MRKF5axXzeEzUosJDCQ0UQKkw= X-AuditID: cbfec7f2-a3bff7000002a5b7-b2-6453aeeb47cd 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 v4 4/5] igb: add IPv6 extended headers traffic detection Date: Thu, 4 May 2023 15:10:54 +0200 Message-Id: <20230504131055.11767-5-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230504131055.11767-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkleLIzCtJLcpLzFFi42LZduzned3X64JTDG6/N7f4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFFc NimpOZllqUX6dglcGS2/3rAXfGOrmPz1OlsD4wrWLkYODgkBE4lptxO6GLk4hARWMErs3LSM FcL5wijxcu4M5i5GTiDnM6PE8wP1IDZIw/VHy1ggipYzSnw8fRbKaWeSmDWnnxWkik3ATOLR l3lgK0QEjCU+touDhJkFUiWO/jnIAhIWFvCQePpWFCTMIqAqsW91L1gnr4CzxLemBmaIXfIS My99ZwexOQVcJLZMmwBVIyhxcuYTFoiR8hLNW2czg5wgIbCWQ+LWws1MEM0uEisuX4OyhSVe Hd/CDmHLSJye3MMCYZdL/Dy7jR2iuYVRYs/UyVBF1hKXtv4Eu59ZQFNi/S59iLCjxPYfM9gg IccnceOtIMQNfBKTtk1nhgjzSnS0CUFU60h82zQTqlpKYuGNOoiwh8TMDz8YJzAqzkLyzCwk z8xCWLuAkXkVo3hqaXFuemqxYV5quV5xYm5xaV66XnJ+7iZGYGo5/e/4px2Mc1991DvEyMTB eIhRgoNZSYT3Q6FfihBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFebduTyUIC6YklqdmpqQWpRTBZ Jg5OqQamvJhY9wvzl333vVj3VfeXqFSJwd9cDfdvBQwrxe8X+iv+jNftUY+7oXT2VVON9h5O 4ad3ktfk5TTtOSegcVct5iDrkfrPfmqfLAVX6i3plbDf9ZD3qdMmH+tZ8k7hp6V4FSSNur+Y r5rme7S9fP2zI7zXu1SNAvXLrsfP/f3t6DGzFSf6pq9aL1oisaIjIefnmZvXOBMs07dP+BUi V/pFdnKY6Jz6PQlP3tRxMB3WZTJd8PTdY4voCRt2CDp/8HvQlPVq1bufU+dnHjEWqKpMbTp+ KWiynNXmrhUJS6cHnwvfcUd6p9Piwh1r7B1mzDR5Yxjwu7Fz8rpXL6R3yxlnndc+9/qtlUL5 kSPNMae7lFiKMxINtZiLihMBQV5kS5wDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t/xu7qv1wWnGNxbI27x+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mlp+vWEv +MZWMfnrdbYGxhWsXYycHBICJhLXHy1j6WLk4hASWMoocWXRf2aIhJTEvp7/7BC2sMSfa11s EEWtTBLf+p6BdbMJmEk8+jIPyObgEBEwlXi2VxIkzCyQKXH61T42kLCwgIfE07eiIGEWAVWJ fat7wTp5BZwlvjU1QK2Sl5h56TvYKk4BF4kt0yaA1QgB1Zw4/oMNol5Q4uTMJywQ4+UlmrfO Zp7AKDALSWoWktQCRqZVjCKppcW56bnFRnrFibnFpXnpesn5uZsYgZGw7djPLTsYV776qHeI kYmD8RCjBAezkgjvh0K/FCHelMTKqtSi/Pii0pzU4kOMpkB3T2SWEk3OB8ZiXkm8oZmBqaGJ maWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QDk01t2nQtZ50HzBffntgn/Xdut51S 3t/CKumr6eyL3r3MfzKzwjbRw3Yjo/Q25pkO8Q/6C2bw81yX3JXoWlAxSWu1sfLPe5eMdFY2 Gr+JSvV6+yz1a1+sXWz/v0my4XVBZpmh75/t2RL3is3Gx97kzuXOnZeuZTSJSM++91o933n9 DntnO0cpC6MnIZYMz2rl4pzm7CxdYWW5SnhWh2LJxvSOhp6MyFnu4n2iD51NHOJEz27bpvK6 1HKrQ0nK0yuV7VY8ZU89rnn+nvSwSf3q/tezjgTvOuN4V3Pm3faLbMnVAprnmK0uvA4Lt+UI mPKuvnCF0vZmtoLyvF/aP1Tyds05X8f+W/VjnJGUU6ASS3FGoqEWc1FxIgBF49jqDQMAAA== X-CMS-MailID: 20230504131107eucas1p1bb75dd2ba7baf4f269ec2476feba69ac X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230504131107eucas1p1bb75dd2ba7baf4f269ec2476feba69ac X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230504131107eucas1p1bb75dd2ba7baf4f269ec2476feba69ac References: <20230504131055.11767-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, 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: 1683222457879100003 Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index dbd09b9b46..8c0291665f 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1400,7 +1400,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; } --=20 2.25.1 From nobody Wed May 15 11:09:53 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=1683221950; cv=none; d=zohomail.com; s=zohoarc; b=I89G41tvLBEy8gZ+qZcu4QP5oyyHRZwpbsYz+08trd//TbORtbFTLLZF/dmi/zlHRuSv5wnTC02gnH9mxfmDwO197HDe9rWZSMO7T6/1ET7LwfEcJMnw/HqBU1TywiXL/3wIsrY/FuNCvP0qig0RFdSRqOuUjcMzdoi9lnFMYQQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683221950; 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=sybZt9Xy44E568CY1cJdWtoGivwKWXwW5gD3HVZi6VM=; b=GO2ELosSQMMRBBdEszgaNp3kr65o3mLSkt1ui8ROGAs/usn6VQDzHswh0E4AqkprdoEvndUaF1EmBYEA+iHtPozy6qtgsC+2HPZcB4SjQPwrtwUgiQfeXk6An9TVtu4zSrzQmpAxM6xnyC46KyQBikjUwYk9uEckSpry9iBQN+k= 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 168322195040127.743450156491804; Thu, 4 May 2023 10:39:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pucoG-0006tY-4Z; Thu, 04 May 2023 13:32:04 -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 1puYjt-0003pU-6y for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:17 -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 1puYjn-0002uQ-46 for qemu-devel@nongnu.org; Thu, 04 May 2023 09:11:15 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230504131108euoutp01063a7b728b522378b7d5a0737ae5dbb8~b8tHEJacz1946719467euoutp01W for ; Thu, 4 May 2023 13:11:08 +0000 (GMT) Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230504131108eucas1p268a851ef0c36a93db34335487f0d404e~b8tG6jwXs1340013400eucas1p2I; Thu, 4 May 2023 13:11:08 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id B7.54.35386.CEEA3546; Thu, 4 May 2023 14:11:08 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230504131107eucas1p2aae525d7b23725b4efd8713e14943fb6~b8tGkgC3U1350913509eucas1p2-; Thu, 4 May 2023 13:11:07 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230504131107eusmtrp2b721e263c20ef3e9f10cdc8f64530753~b8tGirHtJ1716517165eusmtrp2X; Thu, 4 May 2023 13:11:07 +0000 (GMT) Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 77.7E.10549.BEEA3546; Thu, 4 May 2023 14:11:07 +0100 (BST) Received: from AMDN5139.EU.corp.samsungelectronics.net (unknown [106.210.135.112]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230504131107eusmtip135033ed432eaf650de6ea81ceec7d57c~b8tGEEjvi1907819078eusmtip1G; Thu, 4 May 2023 13:11:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230504131108euoutp01063a7b728b522378b7d5a0737ae5dbb8~b8tHEJacz1946719467euoutp01W DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1683205868; bh=sybZt9Xy44E568CY1cJdWtoGivwKWXwW5gD3HVZi6VM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gQVmmcrDgAvZBap+zwMfLFzfY8flGNC+LBcYJaPSo3F26A4+mqwyDXZjBeyWKj69C jgEkU6kVYFA0SWsZ9Zgj+j2/kPAJgJbvAcGxCYUgGGrwRijY3zi3c9saSZmjFi4vhU DoNrtAurq7zWdTkYVDT5CvycEt9myCgm1moIaqEA= X-AuditID: cbfec7f4-cdfff70000028a3a-84-6453aeec1fe0 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 v4 5/5] igb: packet-split descriptors support Date: Thu, 4 May 2023 15:10:55 +0200 Message-Id: <20230504131055.11767-6-t.dzieciol@partner.samsung.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230504131055.11767-1-t.dzieciol@partner.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42LZduznOd0364JTDL7uErD4fGotu8WyS5+Z LBrnz2G12Hr1B7vF8d4dLBa9m14wObB5nHh7kNXjwqNzzB5Prm1m8ni/7yqbR9+WVYwBrFFc NimpOZllqUX6dglcGU/XXmUuaJ7NWHHiy3e2BsbfmV2MnBwSAiYSn5bsYeli5OIQEljBKLF6 +xpmkISQwBdGiYal/hCJz4wSZ361scB0rOrZyAaRWM4o8fPZE1YIp51JYtnjI+wgVWwCZhKP vswDSnBwiAgYS3xsFwcJMwukShz9cxBskLCArcTP15tZQWwWAVWJQ1NuMoHYvALOEo8XzWOC WCYvMfPSd7CRnAIuElumTWCFqBGUODnzCQvETHmJ5q2zmUFukBDYwiHRMecXG0Szi0Tvzk4o W1ji1fEt7BC2jMT/nfOhFpRL/Dy7jR2iuYVRYs/UyVBF1hKXtv4Ee4BZQFNi/S59iLCjxM3D 75hBwhICfBI33gpC3MAnMWnbdKgwr0RHmxBEtY7Et00z2SDCUhILb9RBhD0kHvTuY5rAqDgL yTOzkDwzC2HtAkbmVYziqaXFuempxUZ5qeV6xYm5xaV56XrJ+bmbGIEJ5vS/4192MC5/9VHv ECMTB+MhRgkOZiUR3g+FfilCvCmJlVWpRfnxRaU5qcWHGKU5WJTEebVtTyYLCaQnlqRmp6YW pBbBZJk4OKUamFg0ah8kfZTYbF49N0XZrehnWTrndqvVlp7/Ln79M6P3ikjEcaPH+1Q2Lv6T fEF+rvjPQqHgUx6srx8pTb7Ufusp25YIZvkjUVeuzFrXd2kN35fpTnze+18+so9TiN+0s0Aj Uu1ztPkZG57KUMF5IYYv/2UsYrgiuN349TJbdqnP7a8cA+cy7P47TaGMJ8A0iJ/1JvOEQxvD V8RUWc1QYf/0q+MEq/biaLVLfW2Kj+8UJHR3SWiYH78sFipX+WzbfAaHg3/YD4fwTa++cnyG 1rKKufpSC//XnHvJcEhG4HKy0f2P82pvpfcKBEVmTQ5WvDeBTX//yjYZ92OW8/puqh9QF1m+ TvfnvWWMORv6ziqxFGckGmoxFxUnAgDy3ixJnwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRmVeSWpSXmKPExsVy+t/xu7qv1wWnGOz9amrx+dRadotllz4z WTTOn8NqsfXqD3aL4707WCx6N71gcmDzOPH2IKvHhUfnmD2eXNvM5PF+31U2j74tqxgDWKP0 bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0Mp6uvcpc 0DybseLEl+9sDYy/M7sYOTkkBEwkVvVsZOti5OIQEljKKPFqTzcrREJKYl/Pf3YIW1jiz7Uu qKJWJonvS46ygSTYBMwkHn2ZB9TAwSEiYCrxbK8kSJhZIFPi9Kt9YCXCArYSP19vBpvJIqAq cWjKTSYQm1fAWeLxonlMEPPlJWZe+g62i1PARWLLtAlg9UJANSeO/2CDqBeUODnzCQvEfHmJ 5q2zmScwCsxCkpqFJLWAkWkVo0hqaXFuem6xoV5xYm5xaV66XnJ+7iZGYDRsO/Zz8w7Gea8+ 6h1iZOJgPMQowcGsJML7odAvRYg3JbGyKrUoP76oNCe1+BCjKdDdE5mlRJPzgfGYVxJvaGZg amhiZmlgamlmrCTO61nQkSgkkJ5YkpqdmlqQWgTTx8TBKdXAdLQ19pOaQvSq3/mJk+sf5ojH fzlnZsR1Y4do1fw7ry8ckOF5V2PF3riEpW3KHveoR3wtSS8XeFvNLvnjdOrZsmQxVjmHaRl7 LjJ5Mqb5ca87vceTzz1sitfm5LPimk8fXdJb2BtkpJBxe3pKwrYzIWobTfluHuzpO5H5vSY8 V0FqSonPbYWMBf02u/8k/ylbc0Sltep+yPuwSxcafqVHxgZa25+IZz1nnWZx2KhAj2el6eF9 ubWPqu4t8eXe8m7PZcvssL2am9Znvq/WmFy96rb0Up576jMeTFxUMKOg6foy68eOfu+W8866 btu0qr86Mskjsei7qIOPtt/9Vn/uI7tdz9zUNu4IYK+uvXdEiaU4I9FQi7moOBEA1MgBCw8D AAA= X-CMS-MailID: 20230504131107eucas1p2aae525d7b23725b4efd8713e14943fb6 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20230504131107eucas1p2aae525d7b23725b4efd8713e14943fb6 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230504131107eucas1p2aae525d7b23725b4efd8713e14943fb6 References: <20230504131055.11767-1-t.dzieciol@partner.samsung.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=210.118.77.11; envelope-from=t.dzieciol@partner.samsung.com; helo=mailout1.w1.samsung.com X-Spam_score_int: -71 X-Spam_score: -7.2 X-Spam_bar: ------- X-Spam_report: (-7.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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: 1683221952290100001 Packet-split descriptors are used by Linux VF driver for MTU values from 20= 48 Signed-off-by: Tomasz Dzieciol --- hw/net/igb_core.c | 368 ++++++++++++++++++++++++++++++++++++++------ hw/net/igb_regs.h | 8 + hw/net/trace-events | 2 +- 3 files changed, 332 insertions(+), 46 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 8c0291665f..9c1a2fa136 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -276,6 +276,20 @@ typedef struct E1000ERingInfo { int idx; } E1000ERingInfo; =20 +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) { @@ -1233,21 +1247,70 @@ igb_read_lgcy_rx_descr(IGBCore *core, struct e1000_= rx_desc *desc, } =20 static inline void -igb_read_adv_rx_descr(IGBCore *core, union e1000_adv_rx_desc *desc, - hwaddr *buff_addr) +igb_read_adv_rx_single_buf_descr(IGBCore *core, union e1000_adv_rx_desc *d= esc, + hwaddr *buff_addr) { *buff_addr =3D le64_to_cpu(desc->read.pkt_addr); } =20 static inline void -igb_read_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, - hwaddr *buff_addr) +igb_read_adv_rx_split_buf_descr(IGBCore *core, union e1000_adv_rx_desc *de= sc, + hwaddr *buff_addr) { + buff_addr[0] =3D le64_to_cpu(desc->read.hdr_addr); + buff_addr[1] =3D le64_to_cpu(desc->read.pkt_addr); +} + +typedef struct IGBBaState { + uint16_t written[IGB_MAX_PS_BUFFERS]; + uint8_t cur_idx; +} IGBBaState; + +typedef struct IGBPacketRxDMAState { + size_t size; + size_t total_size; + 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 do_ps; + bool is_first; + IGBBaState bastate; + hwaddr ba[IGB_MAX_PS_BUFFERS]; +} IGBPacketRxDMAState; + +static inline void +igb_read_rx_descr(IGBCore *core, + union e1000_rx_desc_union *desc, + IGBPacketRxDMAState *pdma_st, + const E1000ERingInfo *r) +{ + uint32_t desc_type; + if (igb_rx_use_legacy_descriptor(core)) { - igb_read_lgcy_rx_descr(core, &desc->legacy, buff_addr); - } else { - igb_read_adv_rx_descr(core, &desc->adv, buff_addr); + igb_read_lgcy_rx_descr(core, &desc->legacy, &pdma_st->ba[1]); + pdma_st->ba[0] =3D 0; + return; } + + /* advanced header split descriptor */ + if (igb_rx_use_ps_descriptor(core, r)) { + igb_read_adv_rx_split_buf_descr(core, &desc->adv, &pdma_st->ba[0]); + return; + } + + /* descriptor replication modes not supported */ + desc_type =3D igb_rx_queue_desctyp_get(core, r); + if (desc_type !=3D E1000_SRRCTL_DESCTYPE_ADV_ONEBUF) { + trace_igb_wrn_rx_desc_modes_not_supp(desc_type); + } + + /* advanced single buffer descriptor */ + igb_read_adv_rx_single_buf_descr(core, &desc->adv, &pdma_st->ba[1]); + pdma_st->ba[0] =3D 0; } =20 static void @@ -1390,6 +1453,13 @@ igb_write_lgcy_rx_descr(IGBCore *core, struct e1000_= rx_desc *desc, desc->status =3D (uint8_t) le32_to_cpu(status_flags); } =20 +static bool +igb_rx_ps_descriptor_split_always(IGBCore *core, const E1000ERingInfo *r) +{ + uint32_t desctyp =3D igb_rx_queue_desctyp_get(core, r); + return desctyp =3D=3D E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS; +} + static uint16_t igb_rx_desc_get_packet_type(IGBCore *core, struct NetRxPkt *pkt, uint16_t = etqf) { @@ -1477,16 +1547,69 @@ 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[0] + pdma_st->bastate.wri= tten[1]; + } else { + assert(!ps_desc_data->hbo); + pkt_len =3D pdma_st->bastate.written[1]; + } + } else { + pkt_len =3D pdma_st->bastate.written[1]; + } + + igb_write_adv_rx_descr(core, d, pkt, rss_info, etqf, ts, pkt_len); + + d->wb.lower.lo_dword.hdr_info =3D (hdr_len << E1000_ADVRXD_HDR_LEN_OFF= SET) & + E1000_ADVRXD_ADV_HDR_LEN_MASK; + d->wb.lower.lo_dword.hdr_info |=3D ps_desc_data->sph ? E1000_ADVRXD_HD= R_SPH + : 0; + d->wb.upper.status_error |=3D ps_desc_data->hbo ? + E1000_ADVRXD_ST_ERR_HBO_OFFSET : 0; +} + static inline void -igb_write_rx_descr(IGBCore *core, union e1000_rx_desc_union *desc, - struct NetRxPkt *pkt, const E1000E_RSSInfo *rss_info, - uint16_t etqf, bool ts, 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[1]); + } 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); + etqf, ts, pdma_st->bastate.written[1]); } } =20 @@ -1547,41 +1670,182 @@ igb_rx_descr_threshold_hit(IGBCore *core, const E1= 000ERingInfo *rxi) ((core->mac[E1000_SRRCTL(rxi->idx) >> 2] >> 20) & 31) * 16; } =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 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; +} =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; + if (pdma_st->do_ps && pdma_st->is_first) { + if (*size > pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_len= ) { + *size =3D pdma_st->rx_desc_packet_buf_size + pdma_st->ps_hdr_l= en; + } + } else { + if (*size > pdma_st->rx_desc_packet_buf_size) { + *size =3D pdma_st->rx_desc_packet_buf_size; + } + } +} + +static inline void +igb_write_hdr_to_rx_buffers(IGBCore *core, + PCIDevice *d, + IGBPacketRxDMAState *pdma_st, + const char *data, + dma_addr_t data_len) +{ + assert(data_len <=3D pdma_st->rx_desc_header_buf_size - + pdma_st->bastate.written[0]); + pci_dma_write(d, + pdma_st->ba[0] + pdma_st->bastate.written[0], + data, data_len); + pdma_st->bastate.written[0] +=3D data_len; + pdma_st->bastate.cur_idx =3D 1; +} + +static void +igb_write_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_idx =3D 1; + return; } + + do { + iov_copy =3D MIN(pdma_st->ps_hdr_len - ps_hdr_copied, + pdma_st->iov->iov_len - pdma_st->iov_ofs); + + igb_write_hdr_to_rx_buffers(core, d, pdma_st, + pdma_st->iov->iov_base, + iov_copy); + + *copy_size -=3D iov_copy; + ps_hdr_copied +=3D iov_copy; + + pdma_st->iov_ofs +=3D iov_copy; + if (pdma_st->iov_ofs =3D=3D pdma_st->iov->iov_len) { + pdma_st->iov++; + pdma_st->iov_ofs =3D 0; + } + } while (ps_hdr_copied < pdma_st->ps_hdr_len); + + pdma_st->is_first =3D false; } =20 static void igb_write_payload_frag_to_rx_buffers(IGBCore *core, PCIDevice *d, - hwaddr ba, - uint16_t *written, - uint32_t cur_buf_len, + IGBPacketRxDMAState *pdma_st, const char *data, dma_addr_t data_len) { - trace_igb_rx_desc_buff_write(ba, *written, data, data_len); - pci_dma_write(d, ba + *written, data, data_len); - *written +=3D data_len; + while (data_len > 0) { + assert(pdma_st->bastate.cur_idx < IGB_MAX_PS_BUFFERS); + + uint32_t cur_buf_bytes_left =3D + pdma_st->rx_desc_packet_buf_size - + pdma_st->bastate.written[pdma_st->bastate.cur_idx]; + uint32_t bytes_to_write =3D MIN(data_len, cur_buf_bytes_left); + + trace_igb_rx_desc_buff_write( + pdma_st->bastate.cur_idx, + pdma_st->ba[pdma_st->bastate.cur_idx], + pdma_st->bastate.written[pdma_st->bastate.cur_idx], + data, + bytes_to_write); + + pci_dma_write(d, + pdma_st->ba[pdma_st->bastate.cur_idx] + + pdma_st->bastate.written[pdma_st->bastate.cur_idx], + data, bytes_to_write); + + pdma_st->bastate.written[pdma_st->bastate.cur_idx] +=3D bytes_to_w= rite; + data +=3D bytes_to_write; + data_len -=3D bytes_to_write; + + if (pdma_st->bastate.written[pdma_st->bastate.cur_idx] =3D=3D + pdma_st->rx_desc_packet_buf_size) { + pdma_st->bastate.cur_idx++; + } + } } =20 static void @@ -1598,9 +1862,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 +1878,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 +1892,7 @@ igb_write_to_rx_buffers(IGBCore *core, { size_t copy_size; =20 - if (!pdma_st->ba) { + if (!(pdma_st->ba)[1]) { /* as per intel docs; skip descriptors with null buf addr */ trace_e1000e_rx_null_descriptor(); return; @@ -1646,6 +1906,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_idx =3D 1; + } + igb_write_payload_to_rx_buffers(core, pkt, d, pdma_st, ©_size); } =20 @@ -1660,6 +1928,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 +1947,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 +1963,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 +1971,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 c4ede22181..ed7427b8fe 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -700,6 +700,14 @@ union e1000_adv_rx_desc { #define E1000_ADVRXD_PKT_UDP BIT(5) #define E1000_ADVRXD_PKT_SCTP BIT(6) =20 +#define IGB_MAX_PS_BUFFERS 2 + +#define E1000_ADVRXD_HDR_LEN_OFFSET (21 - 16) +#define E1000_ADVRXD_ADV_HDR_LEN_MASK ((BIT(10) - 1) << \ + E1000_ADVRXD_HDR_LEN_OFFSET) +#define E1000_ADVRXD_HDR_SPH BIT(15) +#define E1000_ADVRXD_ST_ERR_HBO_OFFSET BIT(3 + 20) + static inline uint8_t igb_ivar_entry_rx(uint8_t i) { return i < 8 ? i * 4 : (i - 8) * 4 + 2; diff --git a/hw/net/trace-events b/hw/net/trace-events index def651c186..e97e9dc17b 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -277,7 +277,7 @@ igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRIT= E: PHY[%u] UNHANDLED" igb_link_set_ext_params(bool asd_check, bool speed_select_bypass, bool pfr= std) "Set extended link params: ASD check: %d, Speed select bypass: %d, PF = reset done: %d" =20 igb_rx_desc_buff_size(uint32_t b) "buffer size: %u" -igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from: %p, length:= %u" +igb_rx_desc_buff_write(uint8_t idx, uint64_t addr, uint16_t offset, const = void* source, uint32_t len) "buffer %u, addr: 0x%"PRIx64", offset: %u, from= : %p, length: %u" =20 igb_rx_metadata_rss(uint32_t rss, uint16_t rss_pkt_type) "RSS data: rss: 0= x%X, rss_pkt_type: 0x%X" =20 --=20 2.25.1