From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939124; cv=pass; d=zohomail.com; s=zohoarc; b=ew6at3vIFFTwXqM7iYGZyoxgbFNrVFpay2BJwkXZB1EdwIQELlP5USveQOVCKcv2jUwIV3EH9mRsVtplwdCcWlQfPklZkO5nH8qvfPDhs5i8d4TMMnfQoXba7msTKgMTufcrZeCIPHgd3zmDevOhQL5n6mDV+i2mCQ6Pyt36cq0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939124; 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; bh=j9Abq45938CGnKEaQArxmSlaen8sO/agH+n/BVwCof0=; b=HP4FsPImau6xpt8xJ4Sg+KYt6izGMsw+y/Uf2VCmWQpInvgVzYH5NUIz0qGhHPsY77XWZV25TNXuCrhAig1agRgq2ALjGMmjWgYrxrIFeIf1YSYWJI8Q5+oLZtP1SLJ7hNetDjukYggCV7nWRyRoE7iJze46+rcH5VFaENhVeg4= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674939124703568.05239413294; Sat, 28 Jan 2023 12:52:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9t-0006Yv-Bk; Sat, 28 Jan 2023 15:50:45 -0500 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 1pLs9g-0006Wz-Ac for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:37 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9e-0005Ml-Hx for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:31 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:19 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AqFSWjzBbBZ7y+Od8IQorVssHGnuGPb6WTVEdBlu3HpfDAwof79fqwO7HWhaaTg6lygOHIQQufne3T3lsyBUbi6C5SgENHK/kiT8BojuF0r//SIZ3LTHZ33BX5+I6j8dL89U+4vdxONhGXBiwSmkKbYjC4PcgNez+29LRn8nxyPe13L/Z4WlOnvw1YAcSPZOXKoGQY7xPJEEUFYnXVCjyTyKCHgpF5dfrDxq6WNdz+IoQeYRzJ+AFKmnTtT7tPMQn4MDyCw2yDjBc/EtRI0/XSJJej+j+S/hfQqqieIFeJ6riVIknCL7ZHK2zmxPctst2J7PwoupEQGaudH5jXurfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j9Abq45938CGnKEaQArxmSlaen8sO/agH+n/BVwCof0=; b=nA5MthJzoLGRvGAueucyQ6Puphu6fTvAMFux0kP0W+9PJhzk6F5USgv0auBN4ALga7BCLW03cMwpoG9hUuu42ujaEpAZ3p0KDVmlaIIHSw9ozD4wy5y2k0ndIv5mqKRVELuZl7W9IEniEEgoCLfuAkBZHadwQdnGh68ZasxOvQ+CDMgVh7h2+N3zEvzH6DMG7KCidraRvuh4XkDK0d3lLFgHdQBp/qLjTkSJ3s70e6OdyJ6i0KbNNChjxPpsLPwPS8qd2TPs2UtOA4atosTgvCCMN3ZHkPC+fMrgbMvsCL22deLMY9dx+FrKRUsAx4QBN+te11XXblTVzWtz9jKXUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j9Abq45938CGnKEaQArxmSlaen8sO/agH+n/BVwCof0=; b=Rw6itjUx+H+PuDmMbhRRauhk/j6k9cqk4mXBLRbk6gBX33kILl5AcL+9QIIFzBeEA5n6mVLuerte5Orqf6Re65a7G8uBV/8zno98WLsbOWkhZlQmNT0XHi18wXgQc9dqxZHLdVJp0uw5j5jZm6XaDnDwh/Tzz+5S6TQd8td/SMc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 1/9] MAINTAINERS: Add Sriram Yagnaraman as a igb reviewer Date: Sat, 28 Jan 2023 14:46:25 +0100 Message-Id: <20230128134633.22730-2-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0044.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::27) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: 270da0c3-0597-4758-99f5-08db017143e1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: poraBOOCd894y+K862XAEdjq7oKUEOGjp+ka92RbVrdKie1nlOC8l1RrffHllu4w3RKHOBQzEH20E2cwiyn84gakx+6iC/pha5UiJW43fw5Ob1loHHuRO2J2WKh4BdDR3EG3xAIqZkINYLuJ3yeCOCCi9Mphnos8avB5uDcF966tx1iztDVojE34AS8HVNbR9IKL4roFxZo6HMZ3+1YXnB6KXbgxDNwzlhPAIoAY1/kaJh1uNA5AdzC3ywVRsVgtJRQc4Il2s5266zAAUqNDLWQG0QZaP1EjRScyckWzW+kaoGCITMmTC0gbILMMjHE3DNA5xTWdqnrq1HxdoA7RhqgXkYxHBkONtG+0cUB8L6Auz0w+odmn7tRXrXcbwuZQ4Fqyr5q8sXEULJUZYBVzmEfyYzVoZ1/GWq0rFF66Qb2eWzXNRcVnCUr67xPoJEkMxo+xMMitTj0neg7gLldEbuwVSNpKJaT7eMt5b1JM8tmCDVZRb1Y3UUBL/c0wy/kKhiXDCWtplupTNIbWt6/5yUKHsm2Dhod1+7oyuDvNGYvpimFd+KlAn25lN3iKFVKgCL7TTsX5TwzlldVp/ye/LB8+xjN6L/KTBiDxm3Cd/zzT47igFvw3JC+3yYb3On5Yrf1AzJOXZMoqeeZTG98QTP6f7OitvDKIim5nptEHvQ//1ot/DaWjJ/xae3uPdcqpTNUevv6Tia28cB7geB/XjqtVRy1RdfjmxE25WaY3hPU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6666004)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(4744005)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3Dg94qrt6hB8DFrwve9Wh71DoPI800MbFuzhfH9KENAPoWtMGiblPUrOtaI3?= =?us-ascii?Q?Tc1PJkNhIuroj4iUBu0AGTbH6Ffq65aX+76Yo6NiWZ3rjv425XzQb+jOayJf?= =?us-ascii?Q?bQ447LxY36aWWPeOy2i34/Nl/bC7vxt0B1BtFZponfSNNHtLWvK5tHson0TX?= =?us-ascii?Q?HjDekC/pcUUT1HkNszHlttxYFEJrOTPm9tZWZRFHnMzbelmKRTLGcFWVHLAx?= =?us-ascii?Q?jNMjj0aqHLfh7qVSBBeAR0FAM9QjnZZYuRYYpEnbE3HfZrdm711dO/A8qFYA?= =?us-ascii?Q?K06wemGVxO/Ap7FYxUCRCgK8vkFGts1xLBVh8oSKPhUqGZn/S85wmeRFT4TW?= =?us-ascii?Q?sy9yD7G1eMGVmLN+QpcqX4tTSH/KG5GYte5O/9EHIxNxlYj7M6645Lwhd5ST?= =?us-ascii?Q?A3Nc24qBcqY6mRVbyvH/oTUtxF/yLRKF/eQfZdoKatUKGsXegT0T86y1/zkK?= =?us-ascii?Q?o/bUY5DDAPvUp1f6zlWlazqwG+JpGGlEZLk2BXEyKIsUQRLM7V+FY0AnbQsE?= =?us-ascii?Q?CQl6Q2u7LqC/Nbe/4TYwETv5n3VZH2jH/LzpLQ2wYq4FKzU9t1iFWB3Ss/Wh?= =?us-ascii?Q?jIoF0KC8QkHkN6TPx+tb6Asjz1LLLnWhQKIcXbZCySeJPRZOjiCVab7kfOJi?= =?us-ascii?Q?xLloiyaviXOh/aY+o1NXrLZ5aUmRW+DEi1CsnTWLPuTNXaMGItRGQWXUc2LF?= =?us-ascii?Q?JgtgoHNA2CUVwrN+dXVL8MxCsxRIsA1EsBsvC6TlIhiu+Wcvv2ATreRzLB6+?= =?us-ascii?Q?vebHtDECV3h0TVaCKQLfA+yphcT+hImrs3j5Xqgk0D0lAGhWUPKcmMj9LyIu?= =?us-ascii?Q?9lMGtjXZ0bd1r7MTf9WFQG3h2cBP0NlruMS3cOFGyxK3FUjuL+N5riE5TxSa?= =?us-ascii?Q?A08ok8v+uQG1vJyknOYyP1uLnojoqJ47D0cYPXzTKHsuZQZrovIuoPopJSpJ?= =?us-ascii?Q?GZvofiO1f4A8eZzNCNW/w2kLCl3cVzzhtcs0AsX8lCUFqWOrFM+uu2G9ZKMt?= =?us-ascii?Q?rsxYs0sYNEtBFBDum2NlYMmw2KY9jmnCY75THsTdMHAKB/YGTmQwLKjo6LAA?= =?us-ascii?Q?2uZZWKOMeHfE57cfTeDtp+lZsU2hRTYXmM6iF9iDU88PeNHJfB6ft1AtNaNI?= =?us-ascii?Q?H4eFIbtE4tT1hT6beOHPFuekpdea/Ya7RUE8fNDWSMwO5ZiRncnb+Nj6upfd?= =?us-ascii?Q?5OPYlKyhUdwSEVOeYj85wzCWudp73qf+CmEhItIkFfAIZv3xEHeGuv6Ipbxd?= =?us-ascii?Q?hefNdZQ4Vycam1+9SatQKguAPqASGfMaC+vSsxj//fdRswL6/5vvzFgbAdMQ?= =?us-ascii?Q?bwQNUK8BoNhXS1O5YS4RDFPvPMOAttZRcvre1p4ik/+F2I3Py0kPFNnyJwOC?= =?us-ascii?Q?ZzijXvRHqeLo0wSUhYAkNEUTktJC+DRrTvuKdhE4e+JlYepYi/vVZ6hjnRB4?= =?us-ascii?Q?Gohj1FvZnkSubP+0VKC+sFvQFV0I4xabQlOdCSZ3pWdtlnoIO/iXCSRvNDPo?= =?us-ascii?Q?ewepN7+efYmGt03sAJRfmXsZiAi3r6X5oQ3erEHpTozEMXXnwj+JrNWecLJN?= =?us-ascii?Q?2ONhfVwvtWJRqi8mXD7gol6/UMPhWb7OjOphZhS9Hu9msuqFylfUBPZ18i5/?= =?us-ascii?Q?6A=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 270da0c3-0597-4758-99f5-08db017143e1 X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:18.7815 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0mE3TGPYnHO3OhB8MAWCzeMIE3he+IItHMSlmOohfSJgXK1S4dN2KqBPIeXJ5z7B9cMuBqSD9T3ViTaGY6Thlta/DzKjsTh7M2SKtIOsw2o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939126499100007 Content-Type: text/plain; charset="utf-8" I would like to review and be informed on changes to igb device Signed-off-by: Sriram Yagnaraman --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ece23b2b15..7d0e84ce37 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2224,6 +2224,7 @@ F: tests/qtest/libqos/e1000e.* =20 igb M: Akihiko Odaki +R: Sriram Yagnaraman S: Maintained F: docs/system/devices/igb.rst F: hw/net/igb* --=20 2.34.1 From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939126; cv=pass; d=zohomail.com; s=zohoarc; b=YYFyInCoIyGQeU/rlS8rP4sWiBvPs0Hu3LgZJP23gPOBIeL2ACaNO8cZOwEBdwcb0yoDzO6N1bJrwS09XIiV9MLn/eSVBmCp9qaFiKzp5mBFdipZwe+tRgkoa8O8drViO74HpzC37VF41raKQQfYyVlcv6v4p8Ynaww4FwDWmr0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939126; 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; bh=jeWKult8WzJtM7wgoqAXrvuQvyDgQIHF9hYS6iFxe3k=; b=Wn7igy+PPvDYWmNSEv3tfuuNYpljcLrMLk2kwB3Dy7G+YaVgEtamYOG27KsvQDIeo/nHmXiTIE4nQuRDltTQXWAmHfgN60xRGhYjohqls914A2D8AzdRsxgnyDF0cYwI0b162gvt9fpME2/PifxWVEW7S79t6fxjDAMcKwTaGjw= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674939126724330.31259260207094; Sat, 28 Jan 2023 12:52:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9t-0006Yu-81; Sat, 28 Jan 2023 15:50:45 -0500 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 1pLs9i-0006X2-Hr for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:37 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9g-0005Ml-Jk for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:34 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:20 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U5cChxRXtyZbxmHkTCSe9epeDLTpwsOjPtOpTyXg+oDfIjw0n/nD53WCjNX7FWqvBrVCou2Sh/6gmUpqtIwL5zs1884KWpmUIvRsPZCvT8QjSQmqJkLyFHl1RbfaVZyFd8f6vpm1nj7NnZs2MvEMreUtkCbqF9uH8sPgtyaZPsnR3R2vKRs/i7Xnx/Hy/ffF4tVJtl9T/ymviow7TnH61dbtfj5l9zXiQAXRHiVpONsBz6RxCeOk+Kq0gsK7RUDUtTpbSCOFmhFZX+D2pXavYc/d11zAio/ZeH1OaT8BNHQEg10t+8pVpMuSb1fmfzRcp9b4mD7SuKjrz3penJcoQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jeWKult8WzJtM7wgoqAXrvuQvyDgQIHF9hYS6iFxe3k=; b=X84WMCQUPfvhp/ml9lUAXWQ4Wmfzh5CKtpuzpXxO2zPsxnFuVsW9lJCHGjUp4xSdho39T0yyyN1XGdFK4mrS7v295YjTcPWNxk6N57A5biN/rmwV8MxFGvbgOy9I2QG3KolPSIB5rwgJQQwcooG6AnEB01usyxaVYGCdGds6NaZtEBzKq37YFKeaUQ3an/rrjir8AAbnRjBxXut2A1ukytx5Jehm5tPFY/njhGTHazDefKZ9ikOW0ML/dFKYhCzb7zXY7jejDqNp+ssx8Vw/vm7LDAgGDCL0kStTh2uwB1H5Vqd38KGeEEOl1rD4+cbPqPfwm/6XOWogwulpxGZubQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jeWKult8WzJtM7wgoqAXrvuQvyDgQIHF9hYS6iFxe3k=; b=TfDcibpWAH00UhkEP5WJNhyEPqqqaH0TylmZIreLMSvNdsGTMT4lvCZr6b3W/TzwETPq3rw2s6L74Nx1GD33RFwTHJvBvYKq8GoJmIihUACiwK9J8eWGwXE4ETddXQGx/0LIz9Dbqt0uqkAeXPEc1KMoPZAfBcdM5aoYxpo8dgw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 2/9] igb: handle PF/VF reset properly Date: Sat, 28 Jan 2023 14:46:26 +0100 Message-Id: <20230128134633.22730-3-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0036.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::13) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: 812b4edf-b327-48cf-9368-08db0171441f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iByd2Ukmkn0UGX9rbAzCRWA++2D8XCb9EFU+3O8vaD7cOTy2gOMjQdGdKI42zZQwHuZubzhjkyj60vI4d9SqupfG4E1aM/Me6A2V9PO/b4EPYL1Rj696ZZBdLeqrUMdFyG7rVVj0mSH2KnsvJjufXPCJs45E0+2voesYAZquMMVAARhWbSkXLzmrKEjH/EKoJisjLcDFvP3bqYRrLK82VpDPjbCy7iSusTufXSWnK4FGxHBNlRbtZBWCdEmUDNzbkAv0zw5FZl3gpWwe1SSgl3E4mcwAEUKAXbN/cmM0tXd/sT1ZUeT2j2Lt22PTdL4XXL9hKpaH3qPJtPJUryL/U2ZwkC9Z5DJAtanH3uViiZ4fxDnq6s5PdN4jJTIpUvTIH0k8EUrwwinx4rXQFCACRb0OtJRNUz7NVPMt/3JCPYqEsYRhbOhOZc9Cu0ynse7QtGyBfHSlZWTw/h99cIJy6d6UxZe2AdEUeoie8ta2utNqiu4cyW73kbOip794Q3UJ7AJmhY7Ee1wCf6LDMVvM0OlzOCZNAkeUG1yGJnTneZGXzfCqWgZlQV2CHQBPGft+ILTtIcu9+khW26f3dCS3cVhW3aistcvoR2TbR3GKqefDRtVEz4T3HFeycaV2OryunUbWMWgDfvaz9Gv8B/63LCk2BAIMZxhyo6xTszkA+B7u/odyTx7kK4g6io6OzXQ/tGzEMxyYEZabYBEY3D3jiu+MZ3SKqmNhn3GwaltLGkE= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(83380400001)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ajd/DtZc37hAN9u8I6zh6cOzLNtO5TIeIzcbJ8CmWNG6ZhJ0YYhlxylW8hqG?= =?us-ascii?Q?qqNdRkasoIQEwxCf4GCTLrKqmyBh4FFySv7cbYkd/DizQdsTS9r/b7slMfVN?= =?us-ascii?Q?BDu+SShTQRNmuQ2aKTYF2BZWGZw4PmwrdKnXioe6mawyXaXG2NQHveAkGqq/?= =?us-ascii?Q?WiRISXJ4mycDCPpXW3NL7dSkLtgCgmNoATtzaPIJNkCPl0/cN7amnddvZ0sW?= =?us-ascii?Q?6Q+ihFnNcZ2xLkEQ6QoVKaeqaiBnuC9U3YykB73VK+rPIknM6bUZbFj8GmT0?= =?us-ascii?Q?MhpTNVgeqkmizgSaZ1KaYJiGEbxWkNbcg05O/WI4hjaPyjoqtCYVk2Su7jHT?= =?us-ascii?Q?mooZvJc8fZWmgFZa/Av21mjgOtPsYyorfWoWgrdHt9TYfff369Tlq5rU8gsM?= =?us-ascii?Q?2mS9VBP5zCHT2d2fUPnsvC3Kbwh+p8KKf41ZFCtC4Nuzv8wE330QeHhpC9IP?= =?us-ascii?Q?udVsaTqrNGOQstZNoIBKgtDA30lO53Q70mTZhQkl/b2t4Uc8HvZ8piJvb8jg?= =?us-ascii?Q?JcAPM+jqEG2HGS7y2sr8aGpbvJ5lka7NqZ/KouKKVgRe0kLUsUKgQhOx61gq?= =?us-ascii?Q?aB/SIX2QQMl+PtOpdd4JNS1c8IqVCPkHUQFioUSG5G1s+zJiF1sUC9p5tNOx?= =?us-ascii?Q?8XDZS0oZ4nYy5JFca6JQ3d29eWs3rxxUUUJ1VdIwh0OeXRMTOG7roDD51QIO?= =?us-ascii?Q?PcfE9HSnrhRumgYKY/o/kogb5XkG3A3xP5HNPAw13yID2ZR8rQzeD0D8m+kV?= =?us-ascii?Q?x92kJfgr+iFEsxekeFS6Jzmr1Ol2sbd+RuEAayxBpVUYjJEMgMNRBdrxMB93?= =?us-ascii?Q?t23edBFZ5NSdWZMlw0uP18Jnv5VCoVCBKGaYMLczvmbJAKUCicEFn/NOrE2m?= =?us-ascii?Q?mlpIfvcTR0Fh2jxseDz4aUKb9ZdG8tC0VdZ/yu+ktNBg5/IjesgXpx+pY/+H?= =?us-ascii?Q?bzM/lMeTaFRYpb3wtrg+PuAmbd1bVRISQzqP5hlEh0/7a8VB3X3bYn2ynBjb?= =?us-ascii?Q?oescbEW9eX6916KqVCV7lDEt/hUyqsdclDT+G0jVtWFNhJ973ZDzNNpHnOXr?= =?us-ascii?Q?Pb0MaStaP9GPtU8lSORvz8xO/K4t45znne+H7oQMkSBQhoWQDmmU+fW7n3E8?= =?us-ascii?Q?BUxTs7MOMCZSoEkxn0XMv8hsUnWDeex1KIXcUqblyAKZpJogmDj9tzLS9Du6?= =?us-ascii?Q?EYsqWxQbBTIGUf9AN4s2iKtKNpWuIgGugBogJOcm4ZukpguzYJPfT4a8RPip?= =?us-ascii?Q?TfZEYPcKs+XkT3JMwun3WEhKb/AO40uiYkAIhknHpsmR3TnJS6SdoT0OlzyL?= =?us-ascii?Q?kRiLHMTTiVQM+/HU8T99neGpsLZT0IFA1FLq6hSCFTSWhsq5VbnaO2LuYKpu?= =?us-ascii?Q?0Tu4SRA+jTr6v1poaazUrI2JPj92vutkBl0wnAS7R/LjeIrjq8AW78ReadMC?= =?us-ascii?Q?g3JyGptVoafpTtRaBtABay3bUDOC7nYxkUgp2EEm45aYu/WFyr0pbxGmk2il?= =?us-ascii?Q?4F+5r8DP2R9Fd8/dLBtPy477t5cdVmCeMBJnbrjJ0dv9ldZ6uIVm9hTOUTvd?= =?us-ascii?Q?Us+3Yr0uPcQQqLjUzXzcjU5YDcYbKJntTc2ZUUTCqLHGMZd5W/46ltrH2zb3?= =?us-ascii?Q?IA=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 812b4edf-b327-48cf-9368-08db0171441f X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:19.0471 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8pG6nWCf6RjHE0aABLYLbqCNZoJubnWcrmH9XCn+jCeoXZFiwIJ1AeTeVjM8gyC3ac4LGrDOyJraAPbB0yqjsnJE/kecMR/PU0t+lgc8A5M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939128525100015 Content-Type: text/plain; charset="utf-8" Use PFRSTD to reset RSTI bit for VFs, and raise VFLRE interrupt when VF is reset. Signed-off-by: Sriram Yagnaraman Reviewed-by: Akihiko Odaki --- hw/net/e1000x_regs.h | 1 + hw/net/igb_core.c | 33 +++++++++++++++++++++------------ hw/net/trace-events | 2 ++ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/hw/net/e1000x_regs.h b/hw/net/e1000x_regs.h index fb5b861135..bb3fb36b8d 100644 --- a/hw/net/e1000x_regs.h +++ b/hw/net/e1000x_regs.h @@ -548,6 +548,7 @@ =20 #define E1000_CTRL_EXT_ASDCHK 0x00001000 /* auto speed detection check */ #define E1000_CTRL_EXT_EE_RST 0x00002000 /* EEPROM reset */ +#define E1000_CTRL_EXT_PFRSTD 0x00004000 /* PF reset done indication */ #define E1000_CTRL_EXT_LINK_EN 0x00010000 /* enable link status from exter= nal LINK_0 and LINK_1 pins */ #define E1000_CTRL_EXT_DRV_LOAD 0x10000000 /* Driver loaded bit for FW */ #define E1000_CTRL_EXT_EIAME 0x01000000 diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index abeb9c7889..9bd53cc25f 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1902,14 +1902,6 @@ static void igb_set_eims(IGBCore *core, int index, u= int32_t val) igb_update_interrupt_state(core); } =20 -static void igb_vf_reset(IGBCore *core, uint16_t vfn) -{ - /* TODO: Reset of the queue enable and the interrupt registers of the = VF. */ - - core->mac[V2PMAILBOX0 + vfn] &=3D ~E1000_V2PMAILBOX_RSTI; - core->mac[V2PMAILBOX0 + vfn] =3D E1000_V2PMAILBOX_RSTD; -} - static void mailbox_interrupt_to_vf(IGBCore *core, uint16_t vfn) { uint32_t ent =3D core->mac[VTIVAR_MISC + vfn]; @@ -1987,6 +1979,17 @@ static void igb_set_vfmailbox(IGBCore *core, int ind= ex, uint32_t val) } } =20 +static void igb_vf_reset(IGBCore *core, uint16_t vfn) +{ + /* disable Rx and Tx for the VF*/ + core->mac[VFTE] &=3D ~BIT(vfn); + core->mac[VFRE] &=3D ~BIT(vfn); + /* indicate VF reset to PF */ + core->mac[VFLRE] |=3D BIT(vfn); + /* VFLRE and mailbox use the same interrupt cause */ + mailbox_interrupt_to_pf(core); +} + static void igb_w1c(IGBCore *core, int index, uint32_t val) { core->mac[index] &=3D ~val; @@ -2241,14 +2244,20 @@ igb_set_status(IGBCore *core, int index, uint32_t v= al) static void igb_set_ctrlext(IGBCore *core, int index, uint32_t val) { - trace_e1000e_link_set_ext_params(!!(val & E1000_CTRL_EXT_ASDCHK), - !!(val & E1000_CTRL_EXT_SPD_BYPS)); - - /* TODO: PFRSTD */ + trace_igb_link_set_ext_params(!!(val & E1000_CTRL_EXT_ASDCHK), + !!(val & E1000_CTRL_EXT_SPD_BYPS), + !!(val & E1000_CTRL_EXT_PFRSTD)); =20 /* Zero self-clearing bits */ val &=3D ~(E1000_CTRL_EXT_ASDCHK | E1000_CTRL_EXT_EE_RST); core->mac[CTRL_EXT] =3D val; + + if (core->mac[CTRL_EXT] & E1000_CTRL_EXT_PFRSTD) { + for (int vfn =3D 0; vfn < IGB_MAX_VF_FUNCTIONS; vfn++) { + core->mac[V2PMAILBOX0 + vfn] &=3D ~E1000_V2PMAILBOX_RSTI; + core->mac[V2PMAILBOX0 + vfn] |=3D E1000_V2PMAILBOX_RSTD; + } + } } =20 static void diff --git a/hw/net/trace-events b/hw/net/trace-events index 2f791b9b57..e94172e748 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -281,6 +281,8 @@ igb_core_mdic_read_unhandled(uint32_t addr) "MDIC READ:= PHY[%u] UNHANDLED" igb_core_mdic_write(uint32_t addr, uint32_t data) "MDIC WRITE: PHY[%u] =3D= 0x%x" igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRITE: PHY[%u] UNHANDLE= D" =20 +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" + igb_rx_desc_buff_size(uint32_t b) "buffer size: %u" igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, const void* source,= uint32_t len) "addr: 0x%"PRIx64", offset: %u, from: %p, length: %u" =20 --=20 2.34.1 From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939137; cv=pass; d=zohomail.com; s=zohoarc; b=TzQbXLA/on6BUjnfORciLZ7YTdKDc5kc6mURtkCqExLeRWhHDEUA2hod9DUNiQLCZltx+syRfaddWhA91sDIAZnnndvfcSij5W2EHZECvajdjROob0FQ3ce/Qpmhpt37d27UP+9XLAqOUycrwjEwidoUIsQxwWzJwzanzqqGRuo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939137; 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; bh=z4NtwebJjmDxYRN+/Qti38Rz25CD4QDP/bcVm6J9YVE=; b=hhBG03qCDHX8ggp/QfSxkxUQQuj97cJ7Ne4+zNUw3DOkyhrFS2CaDsXwLP+Wu8RfIMv19UI7FYh7Wk0mMsIPF/EuTNAlcEwE8L/7zTFnWqPLbu0I/SczXxSZLFr2Gy51jEZ5qNCIDsx682ambeoVa2VjCKqtL/K8jbT25HxFf2Y= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674939137432758.9646039273332; Sat, 28 Jan 2023 12:52:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9u-0006Z5-P9; Sat, 28 Jan 2023 15:50:46 -0500 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 1pLs9m-0006Xg-Ef for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:39 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9k-0005Ml-P2 for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:38 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:20 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oIrrhHsPl1R8sq26sAyPki0IBpUNGes/TrycDtDIsDQJKWY5oq6rMzY0zydoGvVry6S58oROxeEnIhe0/vJQp6dyArowFOBYjheXnzaQ8uK9c4Pj0ijXEwK3IgnustrHmbq4ol4y9WLAwpLcBYBvC620uolYkvzFnvpLBOOFK8tGjOAe5vhGnOFCcAMyj0c4sFOwcsM9OnNyii1GWki2duCMBSFrYSbZnYnUIT5RxWV6xI1ZYOyXWTg38hq8+qg6vVmuWof/69qatUE+ikgbKx55NdTdTt6nZlkqXd1PgFOggdoJNripZReUM7thr0DfNwMGk5v+k0yf3ueXEqz8Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=z4NtwebJjmDxYRN+/Qti38Rz25CD4QDP/bcVm6J9YVE=; b=lFs7jLCPb3P39DJnODAOj2tCpof71EEfgn/08jXHTv4lRtVhUMVbISYJbSININ8LzqsYy56nfoDl+oDtoI3HJwzKVVcx/nVzwIepe4sg+5zhD5rNdOlAchgkucl4Lb6Qeojsjexp4bRzH7tCYC875FmpylyleGuAwgna0BOAqUN9xlgFgUrjZuqNILGIdVxPZJWSSY2I3C6lYtcEVFjstX1FGO13fNya7RHg97RgV5ZQPOiV4uOCBLNYsL7C9L7wHIi01sbpJceuvIyklV7r2e/pH2k/34q79FwUOBa4hOwha1Sdwi/qmCEoer2oJr/D9Bniybbg+4SDR3YqmV3dJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z4NtwebJjmDxYRN+/Qti38Rz25CD4QDP/bcVm6J9YVE=; b=N6yzKNAOisUVsn+Gioi2/djCVQBi99szYyEhrojb5FMdqs2RZBHCbTppPUWmEELEa9vT2fxSmPY+2NmYjSrZUA3ejxQfLnq04PGqTzK0vLqrzNnfba3OIUjofMxqGyL4LIScQmWVLMtGSZFvi8NKoEiZctG25OTCnouqXt+x4pA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 3/9] igb: implement VFRE and VFTE registers Date: Sat, 28 Jan 2023 14:46:27 +0100 Message-Id: <20230128134633.22730-4-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0027.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::26) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: fe135395-a761-4edc-2b15-08db0171445b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4ZFi71Wnk4ccaBD2vOMGlXJtK7Q4tkjVEy7VfjRGdG8jEgcrjd2CAuTk0WfX624EqnVyHW6Qq6DtqUwWpYNBjLM2WtyOmGjyzmYny5Mug1OEjgizwinNC5pHiefSO+SvMWkCXsJvOV27eYpu5vp6wI6bO4di8zLgL37EqfAxJDErmzbQARke9Vqmg5BzZGFuAhR76qhRhwmWVZn84nv37c4EDvvVuIHjIpaocRlg8XdT7bFG1+Vs7WDhTfyLGNwNCQC/KDXq0QjIqayLpQsPU4JhoObyqX6VhZh24kxludZow+dKW3H99BqfVVZCJWyF323QeAykTjgjxr7YzljTxwEXGKDuyfmVSKHOmj7YDnnRgN2e4AiZX+HvjsND/UYtYFy9V7QZsSDGGW9gATEW+ZQDJ6woDJ5HoTB5Iv98oXBBS33HBWqqiY/i8X6mvhHV/5uZwSr3MawUV0L4/MJ+D/QwtU5NT5GVYj/Md1C3oGdX70dV39NWbnLiBIX7YImx1Zk715GigzaSK9wY1EP1h8yWLgh/cb+iVvvxJ8CF9Gp1CNqWEhuFyvL6o7YiZB9CYuw37IAF5LBsH+MmnpG0zturjaMTfP0tFhrk1qjvbNLKN5T4ke9gJV+ah3BC6zQlbQ00NYu/okXH7vjiSUcX53uDwO3MROCbbzsAlqgoDDvSATeeGLo8zl8TF2AIBc+qKoNCkaqQ3q/S0A2zMOQXj2iWToUtWvchKRhx0uBiE6A= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(83380400001)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nO4gk/EH9m8yA+dLRiITLFpGU6p5BS+fYj4dF6ps7EkVBdLAsBcI6PspXZLE?= =?us-ascii?Q?hJem3AGmx1TlWnhW+VOQgrSgCDob8OK9J7Z0F8Uly5BZHihJIE4t1EcBfktn?= =?us-ascii?Q?ehQQl8EpQ88bcs4DcRdjDR1WwaugAHlcNjfT9HmLeLcZ1S6nZpuHdOFA0Sx/?= =?us-ascii?Q?xc4CoDhPR0zS0YADovyLvz7PI/MCFRTn/0FkusnMV37CUPD1ZUtEF7KHtJ00?= =?us-ascii?Q?JFoy8K9s5RPzv2IkTEw7tbXDrvgBuaB8Zp4jpJeJXd/2mkhxSJ2fd/D5RIFF?= =?us-ascii?Q?eihJSV13rAGimkL6GByDtoYSb9X0vWIqSbMikE/O6cVdrLGPsU3HJUbrGg3a?= =?us-ascii?Q?E1dpXkrNFjxPA9kS5QGKejsR3kTLcrLrD1RdT+6nx4T9zS3bluoYiXeBHnEb?= =?us-ascii?Q?Q8UtiWy8jxYJK+Ru7p60yK6NJ3kIJUHi+a+Vf7T3i2WDYv25XlwjRr8wjM5r?= =?us-ascii?Q?8ChD6myYt2V9WzUhRJp1r9xIlTwIOINu19FHopqMbzDQARNJX94qjS6Q8fxZ?= =?us-ascii?Q?osSIfJwRHwwVoWuci3a0oiSUU+bFT/QA9Aschp91oiLu06dWxOj098MYMZ4N?= =?us-ascii?Q?MfBwGG6w55lPtxLsGK6LblXmnd8vQgsPPjPiTyIA0d1KP6xglFbt772o7/D9?= =?us-ascii?Q?LZXDLbl7MQ9nm7BK9XVCN8mC9ev3HkNTAH0RzxYZMZkdVE2pt1V7eOi06zJ3?= =?us-ascii?Q?Y8dlnuyJW48/W0W5LHCwaZ66Xd14O8MtN+Z7fkibME1n5YFyDNgHhBR8McL4?= =?us-ascii?Q?x2MjgusDooK/Mkap43E9XX5Oq9GCCkbxqb0WgcCCwuHvi+tzv3qS8EBtz05F?= =?us-ascii?Q?tKJb9iZfYCnTg4VUWA96aGY+rRpbp2ZcviEiX4yPER4Yw+Ss7D93k0c0cs5G?= =?us-ascii?Q?GL1dFOLxn7ABTHtTh+rEtNBnFD1xYNk8VJiXzkb02Jn1TWD/7n1Wdwn+VwvN?= =?us-ascii?Q?Upk97c1IlOP2GqnMJQNIXT+KjhrK40pD4PxYzpShuAPGNp0ZZ4fWzq4eMyk+?= =?us-ascii?Q?ttMHnwsEswpKi2VV+X5EoAkX20hQ1dM3ugpF8Pt/+Wg+xR02TkIZqxzwVCOQ?= =?us-ascii?Q?tGwi9Up4bZYdB2bHBXhLG0rJHQoXXb1AkqCqOuNNFBGCSrRq/y+w2ySUWQ4u?= =?us-ascii?Q?BbezSGbIryqJjcJGL6jQM3nbwzwix7TsUvqSD847ICTpuk4BEcQAzqfMHp54?= =?us-ascii?Q?U1EQL6M7yOi6YNy2rA8OmtKOD/EzANmqWy72dgi+ZPhii8fInfpVPPksC4jF?= =?us-ascii?Q?Ds07gLI7j8Rt1KBrMv1TPBWtKH5ZRgWCXI4aKdoGIsgYIWVwFpzusLTAydW3?= =?us-ascii?Q?S9ELjMKfHHNwf5QMPEnNf0KSr3wq1apogmUqtScLJj8G1Etw4wGuHCWwsPt8?= =?us-ascii?Q?fnZy4hcoWEMToPvPJJ+qMEGdEN5gVft9GV5X5kxMhOBXnSrFMiKjxisnEzjx?= =?us-ascii?Q?hxiEr446FvQAojs0dhMVkVCsDh7kfa1bxlq2OTu4DCDqQJfQXL6ThgJOF7R7?= =?us-ascii?Q?5xiqA43QE/OSV6yqDrtWWDalMhlx55IqsM9bwB9h8yYmDJqoetkliF2ErmI9?= =?us-ascii?Q?uNAv5LkDEwmXDLfhYLNZxszQ5RfEbiAwAfLhQEs2VBSEE977g+KRf9ykVvMx?= =?us-ascii?Q?iA=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: fe135395-a761-4edc-2b15-08db0171445b X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:19.5001 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 67Wo+V3BSYWV/lXc4J3/3BNTu2ClMGMijrpcPGtxheHPlM1u2dx+G0iKYRj0BXkXp7sdO/0TcVMPwXe1knKe1lXd/oSpcbGcUVUrWQQiDCw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939138593100003 Content-Type: text/plain; charset="utf-8" Also add checks for RXDCTL/TXDCTL queue enable bits Signed-off-by: Sriram Yagnaraman --- hw/net/igb_core.c | 42 +++++++++++++++++++++++++++++++----------- hw/net/igb_regs.h | 3 ++- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 9bd53cc25f..6bca5459b9 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -778,6 +778,19 @@ igb_txdesc_writeback(IGBCore *core, dma_addr_t base, return igb_tx_wb_eic(core, txi->idx); } =20 +static inline bool +igb_tx_enabled(IGBCore *core, const E1000E_RingInfo *txi) +{ + bool vmdq =3D core->mac[MRQC] & 1; + uint16_t qn =3D txi->idx; + uint16_t vfn =3D (qn > IGB_MAX_VF_FUNCTIONS) ? + (qn - IGB_MAX_VF_FUNCTIONS) : qn; + + return (core->mac[TCTL] & E1000_TCTL_EN) && + (vmdq ? (core->mac[VFTE] & BIT(vfn)) : true) && + (core->mac[TXDCTL0 + (qn * 16)] & E1000_TXDCTL_QUEUE_ENABLE); +} + static void igb_start_xmit(IGBCore *core, const IGB_TxRing *txr) { @@ -787,8 +800,7 @@ igb_start_xmit(IGBCore *core, const IGB_TxRing *txr) const E1000E_RingInfo *txi =3D txr->i; uint32_t eic =3D 0; =20 - /* TODO: check if the queue itself is enabled too. */ - if (!(core->mac[TCTL] & E1000_TCTL_EN)) { + if (!igb_tx_enabled(core, txi)) { trace_e1000e_tx_disabled(); return; } @@ -1003,6 +1015,7 @@ static uint16_t igb_receive_assign(IGBCore *core, con= st struct eth_header *ehdr, queues =3D BIT(def_pl >> E1000_VT_CTL_DEFAULT_POOL_SHIFT); } =20 + queues &=3D core->mac[VFRE]; igb_rss_parse_packet(core, core->rx_pkt, external_tx !=3D NULL, rs= s_info); if (rss_info->queue & 1) { queues <<=3D 8; @@ -1486,7 +1499,7 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, static const int maximum_ethernet_hdr_len =3D (ETH_HLEN + 4); =20 uint16_t queues =3D 0; - uint32_t n; + uint32_t n =3D 0; uint8_t min_buf[ETH_ZLEN]; struct iovec min_iov; struct eth_header *ehdr; @@ -1566,26 +1579,22 @@ igb_receive_internal(IGBCore *core, const struct io= vec *iov, int iovcnt, } =20 igb_rx_ring_init(core, &rxr, i); - - trace_e1000e_rx_rss_dispatched_to_queue(rxr.i->idx); - if (!igb_has_rxbufs(core, rxr.i, total_size)) { retval =3D 0; } } =20 if (retval) { - n =3D E1000_ICR_RXT0; - igb_rx_fix_l4_csum(core, core->rx_pkt); =20 for (i =3D 0; i < IGB_NUM_QUEUES; i++) { - if (!(queues & BIT(i))) { + if (!(queues & BIT(i)) || + !(core->mac[E1000_RXDCTL(i) >> 2] & E1000_RXDCTL_QUEUE_ENA= BLE)) { continue; } =20 igb_rx_ring_init(core, &rxr, i); - + trace_e1000e_rx_rss_dispatched_to_queue(rxr.i->idx); igb_write_packet_to_guest(core, core->rx_pkt, &rxr, &rss_info); =20 /* Check if receive descriptor minimum threshold hit */ @@ -1594,6 +1603,9 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, } =20 core->mac[EICR] |=3D igb_rx_wb_eic(core, rxr.i->idx); + + /* same as RXDW (rx descriptor written back)*/ + n =3D E1000_ICR_RXT0; } =20 trace_e1000e_rx_written_to_guest(n); @@ -1981,9 +1993,16 @@ static void igb_set_vfmailbox(IGBCore *core, int ind= ex, uint32_t val) =20 static void igb_vf_reset(IGBCore *core, uint16_t vfn) { + uint16_t qn0 =3D vfn; + uint16_t qn1 =3D vfn + IGB_MAX_VF_FUNCTIONS; + /* disable Rx and Tx for the VF*/ - core->mac[VFTE] &=3D ~BIT(vfn); + core->mac[RXDCTL0 + (qn0 * 16)] &=3D ~E1000_RXDCTL_QUEUE_ENABLE; + core->mac[RXDCTL0 + (qn1 * 16)] &=3D ~E1000_RXDCTL_QUEUE_ENABLE; + core->mac[TXDCTL0 + (qn0 * 16)] &=3D ~E1000_TXDCTL_QUEUE_ENABLE; + core->mac[TXDCTL0 + (qn1 * 16)] &=3D ~E1000_TXDCTL_QUEUE_ENABLE; core->mac[VFRE] &=3D ~BIT(vfn); + core->mac[VFTE] &=3D ~BIT(vfn); /* indicate VF reset to PF */ core->mac[VFLRE] |=3D BIT(vfn); /* VFLRE and mailbox use the same interrupt cause */ @@ -3889,6 +3908,7 @@ igb_phy_reg_init[] =3D { static const uint32_t igb_mac_reg_init[] =3D { [LEDCTL] =3D 2 | (3 << 8) | BIT(15) | (6 << 16) | (7 << 24), [EEMNGCTL] =3D BIT(31), + [TXDCTL0] =3D E1000_TXDCTL_QUEUE_ENABLE, [RXDCTL0] =3D E1000_RXDCTL_QUEUE_ENABLE | (1 << 16), [RXDCTL1] =3D 1 << 16, [RXDCTL2] =3D 1 << 16, diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index ebf3e95023..084e751378 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -160,7 +160,8 @@ union e1000_adv_rx_desc { #define E1000_MRQC_RSS_FIELD_IPV6_UDP 0x00800000 #define E1000_MRQC_RSS_FIELD_IPV6_UDP_EX 0x01000000 =20 -/* Additional Receive Descriptor Control definitions */ +/* Additional RX/TX Descriptor Control definitions */ +#define E1000_TXDCTL_QUEUE_ENABLE 0x02000000 /* Enable specific Tx Queue = */ #define E1000_RXDCTL_QUEUE_ENABLE 0x02000000 /* Enable specific Rx Queue = */ =20 /* Direct Cache Access (DCA) definitions */ --=20 2.34.1 From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939125; cv=pass; d=zohomail.com; s=zohoarc; b=OVw//5fuMd0qnhwgL6c4JDbq23jaY9o49heT7yiv90+PI7986ivpx2SFudASUEXqihjkh193dPg0KhHBbXZ8CJVgGJMBMoANj5FhIJnlb7b+nASUkfT+tMpqwnMWDHRahTSDsgi/UH2Na/Mj8q7DAb7lk95uYk0kNeJ34U0JG/E= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939125; 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; bh=33pRoHqSngurcZVJ/nxVVZybiroCXA6ts8cAfAJVK2k=; b=b2FGfvNChJDZX+95vIaZAKlFTp3Zn209NThD8csrHdY4iiwLU15e60x7nUeWuGGFontUu+AuJo9tWi6gJskAxKJs3bjiPWHaszjsnU0SIEgIdHAPqy8EiQAdx7JD57YiJ+0hRQbwt7FTj7yT2/s5xjO2p7O+0mRKcO94fsRDJJo= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674939125232907.007344211053; Sat, 28 Jan 2023 12:52:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9s-0006YR-OH; Sat, 28 Jan 2023 15:50:44 -0500 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 1pLs9k-0006X8-Gc for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:37 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9i-0005Ml-U2 for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:36 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:20 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JR5gLT+drx17FKV7ra6u1Ru9QMQYgxyG4WDcxzUdJ88zt3rvcJAgMHA/vgbAN7hpfBEzJHz9sYQpYnRxC6lQdH9xlXWLRTHhBuYgYQ8FRhNKId8IaPF8l6FjmI5nSeyEzbUR2R91vP+C0Xg/a91u4HrU7m/+gtcBzbQXek7eJNp9TXCe0QX0AKi9JETnKjcGdz6HNb0I0ys77lA1Q9B34v57lZAHXnFJ9mAJxPu2+9LDdaY9iq5sEWOxYO8kHtaWKEzjkYJFqmOg+ybEpp1Pzg3P+dyvZ3MjBB75Vmdw0Y/syPZEsOhkAcGv+i0RODf0Iy6m7owZBqF104gAiu1fzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=33pRoHqSngurcZVJ/nxVVZybiroCXA6ts8cAfAJVK2k=; b=ZCMV3ZS/ce3szzqb6XA0rMWSDvgWUMxiKaNTNlJrdtdPdFU+1Ireq4IHvGbluLkTbHjj8Z4YfqHfPX1WIN2gD/ss14mSiYZqQYkfrBPkr4tXLAQFeYRdOvVAhdUjGhPojvGdzcXwM83jVtcAd71aLbAVAKz3P0JGIFp7aLgx5OhZz2L39/EvReGQ1vZE6VZS97MrKli5a+xoV+8d/87EK2WBXSb5j5l1ZzD6+9/LuRGuM6PGVM/ScfE4glyMkb59GvAUgfFfXDZuMeJsQ00L3JI4PkwrhA0tdF/8u2SQiBXs3UW0ZY/4JQ3NNiwUHwa1LxukiVTRPnpMKms/NsKsRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=33pRoHqSngurcZVJ/nxVVZybiroCXA6ts8cAfAJVK2k=; b=TpQ37cMbq3Nam59lUbhycQXthHJXSNVRnI4FBQ/7lt3q2SmA6gzjmRj6VOmeDXScuA9XOBZdkA0crZV3N59t3IdCPzCh4Xr1Su9SuARprjdGbpNOEIzeUlageZVIN6/9+rXXGCJ5/1+X9c1Cm96dXDVlcxM6TfYEJH604HomtJ8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 4/9] igb: check oversized packets for VMDq Date: Sat, 28 Jan 2023 14:46:28 +0100 Message-Id: <20230128134633.22730-5-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0044.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::27) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: fb242fa5-0d14-4347-7b81-08db0171444a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PMpSDuDLfwPItPtQLoe2/yKy7zVzoDnozhLdRFUsml4EUD9iCw9R7xUrjU06C7JmZNnPcZT+GfBALgC2tf8ETZZTYfw8DiGdm7jUvhPelHtbhDZXANUVqTJjEoTCRR0lN8wtRQF9yBEHtG1tt30HlPxsknG/LnPTe9+juB0DC4Tzv/dM+ccu0sFfVbHjmhI0MSNDU344DwpYzqmsPUTkLDhz4NZJ5YoExmyLKN84pg6aBO7PmlJPUHH4S3rRV/GvAxHhhjIWEou+Qv7ZGeQFvj61yUfS5kt609x053J/r8M6b8RBGrR2ouZmfewd4Y+I8uq/CRyTNx6DbdWSWUIgSyRGaT13SLh7n96CIpjxJkyjuNy/wLxcG9TbnEvzMNaVAeK+c5FyrHDDHZIZJhf7mDkTLDzbZ4434dI31e+pAzTTUjqEkXEhbwYwOGj6EQktzk5d+kfwuZy0hwdWBFNyo5RChpq6rugAeE+2DBu0vQhuLybc61AGauupXsygJmGgs7ZmnzHP2iOACv4EtO1HGVY+aeB6fStsWAWZREnoIyTLCc0N4x40LqvtrpRFinQQwJCzrpAWQx3gMaEEvuyQXvU88mJXH8BG4iD1EXKcIi812phT7zJ0Mg2df6FLM68pYFW0+tcPhU/pRjV5BAntiZhkEphH7x61Bn1h0gdiSPQ7UaEHbklxrOoRKVMd/XVDPeMTLu3OdHbl0mCQohSoSXBAlgrxcOft+FyB1wTu2nI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(83380400001)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2LFD3I1m1GVlBR2txkQgMMMbLDztXkrlPMB/yllPRlUrgvn5UPuR7A9bGk0A?= =?us-ascii?Q?dqdiwH/gfVvX/QPNp5Zw9VakuH3JTN4Ydb6QcE96esDb8/1ngjjsZZT6hHGB?= =?us-ascii?Q?AG8Gtq3W3osDr/+ZXEywUnvtPOD5KqNSZ/ppak109bKe9hyaUrZnT1LL30zo?= =?us-ascii?Q?QT3hDVHD6gbuYO/hqVNdBBd7tycUZROmf3s4aL5XU5D/FaYsygDCzJKwVheJ?= =?us-ascii?Q?GHIpTUktqUuyVukjkAhpw59YQlzj23KdXpb/6dd5bsgPG+rmsvyeea5BCu/x?= =?us-ascii?Q?DIV/CWjVtcdyA1xx6mRIypi93e7dhQ53G+pSQVfzDyJalXHGJ2W9MBoTG9Jw?= =?us-ascii?Q?N37oGvpTzwMYlRHiRrYQRYZpCqaVZsgBzf/1bXjMivVFXI9kqsIfLJ2F9y3G?= =?us-ascii?Q?FHu0/+msSOm+fyuqIbRK/SmsjMW+lh3qsZ/j58rEKoWGkyC1iKQh015XJeh3?= =?us-ascii?Q?5v3H30u6/dXkf3mfZr7PGJwWlU2RuaNIFvC4/boUDW2e50PYhanXQBCRUjt5?= =?us-ascii?Q?q+bJeh+3QKr9B2/FBhGu9JYZ6gwbK36QrAXZxM9gGDX7HDR+9DBetQZzz9r4?= =?us-ascii?Q?sGF0QLRslLVJaZMFp6pROneFSdFbiag2NZ2lWWxcqlaU0NX52B3MQ8XME1ey?= =?us-ascii?Q?iWVToycMYW1itkN0XQCUs9GhFhrMjJXmpMoQ079evJFIuiYRIkve/Mo3JUlD?= =?us-ascii?Q?48YCiWhcxYdewe4ijWO1Cie7dMqeGFmIczimZuqkbk/VQYY8W2jccxKp0VrG?= =?us-ascii?Q?k4KdFYuUUbiPVHEciqNgGU0WIefohQSEDzu0qpUp+T9lvGvHpoem8cPU7twz?= =?us-ascii?Q?V6IalaNQSrzodW7VvrKIcZfwB1nzQveW+tctkZa+r8akAHC4cBM3SRgghTH7?= =?us-ascii?Q?76lmB82bB/X3VppWFhDEE31ePuRV7mLXj1YaBZC6xcWfvkHe5UVEWv9eWP1p?= =?us-ascii?Q?jjmnn+pAcH1cMu6XfkIgdNmgwfNr6mAqwfNY8MzbJhK6dshV1OidihBmu7KN?= =?us-ascii?Q?phd35zO3WVgo0WJ1vNfiV7o9EMrtGYk3lvUU6O0cOgMBSwVe9+u4n66r06I1?= =?us-ascii?Q?+zT+YDOTqHm9UVR1qmZLFDUx/aLtV9RF2iPvhpjv131aREJ5T0YJMpB294N4?= =?us-ascii?Q?XoGW6fCsgR57mLP0FXTqScLWIpQJFKe32TzvEBRnPMzdRU3YLVKxixnWC7Xs?= =?us-ascii?Q?IzlZww8iLhtU5WmbsUXSEiWvS88iNDGrbnxcVvaY5IoCww/FKTB7guZeMdO5?= =?us-ascii?Q?1Mu+Fthl+l/+HKT8FfXV0qbQ+VWA0EIPGNp8Vrpk/aCNcXT6jy214Vi4NSAq?= =?us-ascii?Q?qaBWYz+dkIm7v9sY+IgVUmqNMc3ScDFcRR2ExUYhFYi/FCj4CcS4TY6u+4vi?= =?us-ascii?Q?Tjgb4hfM+SlbGjMiTF5gu7pWmqagUM98PP6D5p0v3nsx6KbDnlWfJ4Hjkzzd?= =?us-ascii?Q?JYPzTVZnEdXwfCpk9ceL8+68yfNw+EBgzVKquWop2hZdveO8BZKAO++9C5dw?= =?us-ascii?Q?ryhEnGq4YMDLb6+b7bxkjMy2N2tnDzQf9VxiANzvyEM3+g4/qCPFuZZZg6u7?= =?us-ascii?Q?5H0D/DJkDicj23bAeJLcWq4XXlpIWK9FbMJDOtFBmXZHCGC100oumq5/XyM/?= =?us-ascii?Q?ww=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: fb242fa5-0d14-4347-7b81-08db0171444a X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:19.2502 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: G+pXvAL3r3jNZSUfsybH+aK03YRcDfluzQBrV1l14F+mON1ulwAisjssfuEoQp4iF6KluG9h2x0UJU4EHfOLB8H73yl8XcISYM/i4GKAFwA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939126516100008 Content-Type: text/plain; charset="utf-8" Signed-off-by: Sriram Yagnaraman --- hw/net/igb_core.c | 74 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 20 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 6bca5459b9..1eb7ba168f 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1476,6 +1476,30 @@ igb_write_packet_to_guest(IGBCore *core, struct NetR= xPkt *pkt, igb_update_rx_stats(core, size, total_size); } =20 +static inline bool +igb_is_oversized(IGBCore *core, const E1000E_RingInfo *rxi, size_t size) +{ + bool vmdq =3D core->mac[MRQC] & 1; + uint16_t qn =3D rxi->idx; + uint16_t pool =3D (qn > IGB_MAX_VF_FUNCTIONS) ? + (qn - IGB_MAX_VF_FUNCTIONS) : qn; + + bool lpe =3D (vmdq ? core->mac[VMOLR0 + pool] & E1000_VMOLR_LPE : + core->mac[RCTL] & E1000_RCTL_LPE); + bool sbp =3D core->mac[RCTL] & E1000_RCTL_SBP; + int maximum_ethernet_vlan_size =3D 1522; + int maximum_ethernet_lpe_size =3D + (vmdq ? core->mac[VMOLR0 + pool] & E1000_VMOLR_RLPML_MASK : + core->mac[RLPML] & E1000_VMOLR_RLPML_MASK); + + if (size > maximum_ethernet_lpe_size || + (size > maximum_ethernet_vlan_size && !lpe && !sbp)) { + return true; + } + + return false; +} + static inline void igb_rx_fix_l4_csum(IGBCore *core, struct NetRxPkt *pkt) { @@ -1499,7 +1523,8 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, static const int maximum_ethernet_hdr_len =3D (ETH_HLEN + 4); =20 uint16_t queues =3D 0; - uint32_t n =3D 0; + uint16_t oversized =3D 0; + uint32_t icr_bits =3D 0; uint8_t min_buf[ETH_ZLEN]; struct iovec min_iov; struct eth_header *ehdr; @@ -1509,7 +1534,7 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, E1000E_RxRing rxr; E1000E_RSSInfo rss_info; size_t total_size; - ssize_t retval; + ssize_t retval =3D 0; int i; =20 trace_e1000e_rx_receive_iov(iovcnt); @@ -1550,11 +1575,6 @@ igb_receive_internal(IGBCore *core, const struct iov= ec *iov, int iovcnt, filter_buf =3D min_buf; } =20 - /* Discard oversized packets if !LPE and !SBP. */ - if (e1000x_is_oversized(core->mac, size)) { - return orig_size; - } - ehdr =3D PKT_GET_ETH_HDR(filter_buf); net_rx_pkt_set_packet_type(core->rx_pkt, get_eth_packet_type(ehdr)); =20 @@ -1571,8 +1591,6 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, total_size =3D net_rx_pkt_get_total_len(core->rx_pkt) + e1000x_fcs_len(core->mac); =20 - retval =3D orig_size; - for (i =3D 0; i < IGB_NUM_QUEUES; i++) { if (!(queues & BIT(i))) { continue; @@ -1580,42 +1598,58 @@ igb_receive_internal(IGBCore *core, const struct io= vec *iov, int iovcnt, =20 igb_rx_ring_init(core, &rxr, i); if (!igb_has_rxbufs(core, rxr.i, total_size)) { - retval =3D 0; + icr_bits |=3D E1000_ICS_RXO; } } =20 - if (retval) { + if (!icr_bits) { + retval =3D orig_size; igb_rx_fix_l4_csum(core, core->rx_pkt); =20 for (i =3D 0; i < IGB_NUM_QUEUES; i++) { - if (!(queues & BIT(i)) || - !(core->mac[E1000_RXDCTL(i) >> 2] & E1000_RXDCTL_QUEUE_ENA= BLE)) { + if (!(queues & BIT(i))) { continue; } =20 igb_rx_ring_init(core, &rxr, i); + if (igb_is_oversized(core, rxr.i, size)) { + oversized |=3D BIT(i); + continue; + } + + if (!(core->mac[RXDCTL0 + (i * 16)] & E1000_RXDCTL_QUEUE_ENABL= E)) { + continue; + } + trace_e1000e_rx_rss_dispatched_to_queue(rxr.i->idx); igb_write_packet_to_guest(core, core->rx_pkt, &rxr, &rss_info); =20 /* Check if receive descriptor minimum threshold hit */ if (igb_rx_descr_threshold_hit(core, rxr.i)) { - n |=3D E1000_ICS_RXDMT0; + icr_bits |=3D E1000_ICS_RXDMT0; } =20 core->mac[EICR] |=3D igb_rx_wb_eic(core, rxr.i->idx); =20 /* same as RXDW (rx descriptor written back)*/ - n =3D E1000_ICR_RXT0; + icr_bits |=3D E1000_ICR_RXT0; } + } + + /* 8.19.37 increment ROC only if packet is oversized for all queues */ + if (oversized =3D=3D queues) { + trace_e1000x_rx_oversized(size); + e1000x_inc_reg_if_not_full(core->mac, ROC); + } =20 - trace_e1000e_rx_written_to_guest(n); + if (icr_bits & E1000_ICR_RXT0) { + trace_e1000e_rx_written_to_guest(icr_bits); } else { - n =3D E1000_ICS_RXO; - trace_e1000e_rx_not_written_to_guest(n); + trace_e1000e_rx_not_written_to_guest(icr_bits); } =20 - trace_e1000e_rx_interrupt_set(n); - igb_set_interrupt_cause(core, n); + trace_e1000e_rx_interrupt_set(icr_bits); + igb_set_interrupt_cause(core, icr_bits); =20 return retval; } --=20 2.34.1 From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939109; cv=pass; d=zohomail.com; s=zohoarc; b=Mm6W4lPEXvfPPp76ZGy34a4imDfzL0Ku6AvLSx+qJsmPmWeb5KutFJ2Nv2EB4wVN2bKTMCSv7bmodazEGBFYcJ02Sxhiqb+6TqWafeCXorvBEnRD+7nymjh/17hoUmDfivV3cv0NbhMOQRugYNJUNM5SR2VYPyM5Jqo1w++BS4M= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939109; 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; bh=ESIGRVOx2xbyiwxBP5061/0BbZ0qeXBbbA4XuvG19aE=; b=eByMCXK3hXothM95o/fYFtWB1+ptLqAA0gNxhnOlcQFemQvWLO9tnzPoBnL5MvtVoeGoC1sSfo80l9kfuPxn6hxEb/Cw7mYCmsXFQffbnbHVFEQQJESFIG326tVtKKMW8g2Q35hmpwXKeOYHjFBIfjHOr0V0KWliDE7BruQ1h/Y= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674939109700939.6043435895208; Sat, 28 Jan 2023 12:51:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9w-0006aT-Jl; Sat, 28 Jan 2023 15:50:48 -0500 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 1pLs9o-0006Y1-IS for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:43 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9m-0005Ml-MS for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:39 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:21 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QHXrkEEk3CIG3QJlGiTcRgx89QTcCcDslnJi1HnsvErFtic7fUDD+aWu5eny/sy+7FbELlkOuI8ijuMCb8Nml3dqzIfvSeBS9onpF2QuydHnMHiB8SuTJ4kQVaI58NRiWp+uIimDwJY9GtJhDkskB7aLUsP/KTXWZ/oEeVRe7J4nIjcZikRJwd4xMU4z9GGeyED3g7RKUOBB9rdcXDwDDEBiGXonNwSXG/bwfjPGK9yn1D2t5nrphbYLlRwNO8q6akewDpVCMBfvmS0cI3mGxc32mO6rx6WMlKjPnkbB1lf/yvfWllvXSSazW6WE/MzgVR+/fO6dMMpFXsp3bfdq6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ESIGRVOx2xbyiwxBP5061/0BbZ0qeXBbbA4XuvG19aE=; b=RLCZiLYMsINEuP7kV/hfRnXx017XXLlzG88q2JV/Sm6tOvMINPY/c69yO2IuQ6LJ/ec0xZA35UAVQWMhusrvaalWSpdF7NrSDDFRr7F1GnmYmnO3TZmmuGeeCcjwB/N+7oQXjd77YDHvPXeDF+v5vXseAIhmtqJJluh72RYpjXs4ignIA27lx/Up5jB/eyD5iGwYVPIJhwd3/i7FERj0WekrB5pGZ43EfrulOnq6bIyB50yoREeS70MmPiHSihLNm6fLB0WFwwMbiLJtvZYJXneJL1PkKCLf6CVNOPi9cbfqINP15BQ0xi3ztRqz57QJxON9psWgiB6rshck3Vt+8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ESIGRVOx2xbyiwxBP5061/0BbZ0qeXBbbA4XuvG19aE=; b=D1j51byRx2RGemMXUQYKe/lGmwfRraYCpN+SCfXI4HPY4JWtZkcN5NZLuEB9fzyD3Pxi2cVlQDMDz1Xr+RcsUcwPfJ4xLao5YBJlKjZvOeIeSYhazi0HP3Pczq5GXFyWoJaoc4PXedYjjFztY+6nfIl7vCWab62rplIQ0NOVajE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 5/9] igb: respect E1000_VMOLR_RSSE Date: Sat, 28 Jan 2023 14:46:29 +0100 Message-Id: <20230128134633.22730-6-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0038.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::15) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: 28e981d7-46fa-4735-4bb5-08db017144a0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lb9k2chu/wj/NcH9bzdjhb3zehv5VmanhaTgSCjHw/OiG8snWRQH/AYMSGyYV6ILl6vPiXNnQg5iT4uEa3px+sRWgJKmYzqYIvUq0IlThWona/fAzoCcBxGvCCjJx//1X3xdMElYFxjZhhDDbfHMFo/dOXvnsWYOXwdQ8jyGeAsYrJPEqaM4TmmdsoQwifuxp+xJJEZ35TppZePxNiR8gHgRL5VZ/1JZ6jUR6SjbDN8gm3fsamyJ+XCpiPVJlMoSPEILWjxFqMQtB8zteORElzJdX8wpgLsRjna2vxHdKDvy4ICjsesoCqQ+9ZaqGuaMJo0n/BS56vZU+xYdWW36G4OFzqMRTN3K9GNYRGGJeXrPer61NPIYNbniTCZPqp1tL6K/EZ3w1a6oOOqek7rMIOLkWZIqdI6mq3SC6qmp7J67JbjjZ3+3IO7DUdU7eTirlvsyNSo5zBXAcL1a67rn8MQCmC6uF+EXx1+KOBUPg4F6NHYZB4zqIoZANcHzF1+BJKt54bvuvirRpfJZSj6PMAUU3r258SJxidyKKJ+DCsOuJ6L8WANg6SNIvxnwhswMSRbUE1yJ4s5rJiNu8nw/oTVcfhvn/vwbotlEo8iDM0JTzIyhO7r8/nE+riwdFlQvbfV6aIY6Z9zzjZHkuU4a0qT9uDllxd13wLV73RlWktb9dy2YmzJWte7aLXCG33gATdVAndT/rIBVdSwnauJHcG5fFc7UfUKqrHjWaN2Ec8g= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(83380400001)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JF2TfVVv5B3aP5iKdi9gxHnNcq55izpb5M2ijCEY+wdUuND+sjEEvMOuUxe2?= =?us-ascii?Q?Rfm/LWrpBvgLdxrmzTFNVzKm2GNfdrgMGfJzk5Eh5WQPKPeqs6/VKOqgnEGT?= =?us-ascii?Q?Nd+H1GadoCf2iY/xMJeG4/RX4JtHpl3Sl1lHKwhKMV0+6v3VSg/ua85iEL8J?= =?us-ascii?Q?+SMhnj+GY8kGLl6RTauqSVeIfBCzy2u5VEMKkhdPBSgXocV+JQVJmLpr+hh+?= =?us-ascii?Q?4+U8e/TfFSDvci2oxSpul7ojYOHi9xX3NX1O1z2iTUIPrHXc2FBX70yz9QUK?= =?us-ascii?Q?Hi+1ipdKNwfxsEd70d8k+xYxtlHhil+1XwTcQltvVrNGhDKjp9LG3GQoNHXE?= =?us-ascii?Q?0wmyMPbL4pMB2uOUpljR7RfABIGYkO3+nGCrOR9vPRMd7HI9UWAERTeaNwWG?= =?us-ascii?Q?OK85MgcO5HkMbyppr/BXLC/uSdKlgos0uluksl+758y7jj/YMBnXYgd3bj3F?= =?us-ascii?Q?YbquUQSYlUQj9bTD6t0CZQ6a5ZTMDaGUzLTT3GKKWAnZg+oEurzm5xu7r6u+?= =?us-ascii?Q?k4CK0koeudQPvReKYFIKub/+1lXCtMg8tRMkcCiw2auu5xb4zWPqEvT+E2M4?= =?us-ascii?Q?ISlzhn8y6+iitc2gTPIQ3WcSPkhe2if3UqE0xjruXF8c2j0q2N4+Z9Lzsgb+?= =?us-ascii?Q?0n/CHVoFtjy6T/8opxb+pnRmQMFZ4is4YJFwP5gJv8rahBzeS7dUBeMZ5yLx?= =?us-ascii?Q?ebxnkCFl0p/YRbUyCh+/wQpSlgD2ukvXgTBSqESvqV2o+xV6lUIVeUduaU25?= =?us-ascii?Q?kn4mVw6xCXblSjkeoZMgIlJpViifEYqpWvhU2OXWqs/tnZMOoRawcKB2+wjq?= =?us-ascii?Q?lFELTqXhYmQdq/CKnWxm82cGVOz9nYlUnx0z8qLPYfjiYpY2ye+J65JLYtUB?= =?us-ascii?Q?ZEmp4Y6pVojvWcSu0L5x927Q4fE7psUDDBQ15qkKtBhpx1yhbY8vo0Sw3OEO?= =?us-ascii?Q?pti1IKiXa+tHXJaa6QOvEIYXYCsy72xXDwuuQuQ2jvSS+e9/DB1HQ/JVXyW7?= =?us-ascii?Q?vs7S1ydeF77G1mosjALdRTx6X6hnT5EFrEPwHJZz4XqotCX00VodYbEHEcOP?= =?us-ascii?Q?WGO8VuYlOWsQIP4SH5K3+psEWgjsPDYmObK1+lTzPaJDlr90iUPuM+KXzqZ+?= =?us-ascii?Q?ZY3G9ze6zggLbh5yFN44Sv9RoTOxsHCjBGC068UnncqbjElpdrnPdLdOQrD9?= =?us-ascii?Q?eCeMEfATqHhvowbGm/DOA38saDMbyFBAQMHs5ofeUVFTt/P/T/osTi9rtKHV?= =?us-ascii?Q?vYzOr8DXiICWVUpF7KtqCaqwAoL/g+psyoUzwFDNEq97PcXj4o/gKTlxxBvF?= =?us-ascii?Q?VleYUcsucBrFLVwtmebRudxvFSohQrkc7Sij1wpesN52rV7xYmHZWa5KFNgg?= =?us-ascii?Q?XN6EH+T7TLFMAX2BMltHFAVHrJOmfuy9iXmclGFGKn/Z+GKPT9R4aEBFdBYL?= =?us-ascii?Q?7Nj8xmmIfdR9Qsmlu5TiuZHYj4rQyvtaf3a+/zs3+A1ZI9amqulivl4CVZx9?= =?us-ascii?Q?0/bGjhoZgAAqlz/KCwwTRu56dHqeIW/0/CX5b5QYc3/r2YctULulAHl23siu?= =?us-ascii?Q?Oc7Sym9RJxJ1yt79mCovdZBs9mPXnzn2/04f2ElMVYnjPCdnTpBNi/jEryye?= =?us-ascii?Q?Mw=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 28e981d7-46fa-4735-4bb5-08db017144a0 X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:19.9511 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ICF49kwEugOECq2ECGGd/YixZVYNEwAkIi//M0+Gpxsg6mcXhqzt59AVzfQYA6nm9w9tLAvRcWIdak9QZ+7Tr+IqkTC9tqM+R0f54qa8bdg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939110446100007 Content-Type: text/plain; charset="utf-8" RSS for VFs is only enabled if VMOLR[n].RSSE is set. Signed-off-by: Sriram Yagnaraman --- hw/net/igb_core.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 1eb7ba168f..e4fd4a1a5f 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -69,7 +69,7 @@ typedef struct IGBTxPktVmdqCallbackContext { =20 static ssize_t igb_receive_internal(IGBCore *core, const struct iovec *iov, int iovcnt, - bool has_vnet, bool *assigned); + bool has_vnet, bool *external_tx); =20 static inline void igb_set_interrupt_cause(IGBCore *core, uint32_t val); @@ -942,7 +942,7 @@ static uint16_t igb_receive_assign(IGBCore *core, const= struct eth_header *ehdr, =20 if (core->mac[MRQC] & 1) { if (is_broadcast_ether_addr(ehdr->h_dest)) { - for (i =3D 0; i < 8; i++) { + for (i =3D 0; i < IGB_MAX_VF_FUNCTIONS; i++) { if (core->mac[VMOLR0 + i] & E1000_VMOLR_BAM) { queues |=3D BIT(i); } @@ -976,7 +976,7 @@ static uint16_t igb_receive_assign(IGBCore *core, const= struct eth_header *ehdr, f =3D ta_shift[(rctl >> E1000_RCTL_MO_SHIFT) & 3]; f =3D (((ehdr->h_dest[5] << 8) | ehdr->h_dest[4]) >> f) & = 0xfff; if (macp[f >> 5] & (1 << (f & 0x1f))) { - for (i =3D 0; i < 8; i++) { + for (i =3D 0; i < IGB_MAX_VF_FUNCTIONS; i++) { if (core->mac[VMOLR0 + i] & E1000_VMOLR_ROMPE) { queues |=3D BIT(i); } @@ -999,7 +999,7 @@ static uint16_t igb_receive_assign(IGBCore *core, const= struct eth_header *ehdr, } } } else { - for (i =3D 0; i < 8; i++) { + for (i =3D 0; i < IGB_MAX_VF_FUNCTIONS; i++) { if (core->mac[VMOLR0 + i] & E1000_VMOLR_AUPE) { mask |=3D BIT(i); } @@ -1018,7 +1018,15 @@ static uint16_t igb_receive_assign(IGBCore *core, co= nst struct eth_header *ehdr, queues &=3D core->mac[VFRE]; igb_rss_parse_packet(core, core->rx_pkt, external_tx !=3D NULL, rs= s_info); if (rss_info->queue & 1) { - queues <<=3D 8; + for (i =3D 0; i < IGB_MAX_VF_FUNCTIONS; i++) { + if (!(queues & BIT(i))) { + continue; + } + if (core->mac[VMOLR0 + i] & E1000_VMOLR_RSSE) { + queues |=3D BIT(i + IGB_MAX_VF_FUNCTIONS); + queues &=3D ~BIT(i); + } + } } } else { switch (net_rx_pkt_get_packet_type(core->rx_pkt)) { --=20 2.34.1 From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939109; cv=pass; d=zohomail.com; s=zohoarc; b=OhWOX1EidUumraRZHYPJ4CUp7hQ/donNCqPEcWWe3PJrMVpzk7CJLxvcfcyrYIxKBDvH7U04m1U8SYDZmqAk8zZ0ftqOUi8zKpuL6ma7hOYBEudeYHJNQW4kwao47G/+FaLJ8d63Uqun4A31gijuN2yUUEc43SlqPqovQDznHxE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939109; 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; bh=YWMd+DWMFVxpn7gj8QTQWmS7na3KeLNDzkkd9Izht3Q=; b=AN/iMZwGmBXgpV8o59YXUp/cDQ71/N9FGzTnfG2dO+7tZQV0zx1CXyy5imwCKHIBbjR96Iv8OaHkf5nseF93Y4hZQxG/+xejLDJDux3SRtVJK6W/icH4dUavnoJHl9cm8nFoigastSkbtFro2ub5e5yS1T0hrGTtyANKBH3DYWE= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16749391096611021.6742067742539; Sat, 28 Jan 2023 12:51:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9z-0006bC-HJ; Sat, 28 Jan 2023 15:50:51 -0500 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 1pLs9w-0006aV-IB for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:48 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9u-0005Ml-4T for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:47 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:26 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bIbscTcE5ER0fp/ZA3g3bm7DKHdZyAhM8md87ibNKiYez2Uw6juEMhpguyf8u3ueVyYE+hjN1VQPOj5W9uJiBspb/KVg7wkkLBAwa/BYv5zRcV3EgBaebzhjdL0FD1wyW+yCzqDzJ1jiczE8thcbf1JYPnd3Ee47Ygzmf9hcaCJlzV1r04CUYPTemthMHFvCJ6dL9x/T4dNQ142kP0e24WQazykWbiePgPg74PnLVwDBe/7ulEJpFr/X90no6NWWjPCMWu1YkGXF9EsH0iP59uepkHVkRRP2JuZ+plByoVRfR/ExJ6N5QkB00OG8zpQ6g8sHv8vnQmVWh04tV1upEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YWMd+DWMFVxpn7gj8QTQWmS7na3KeLNDzkkd9Izht3Q=; b=OAMBoRCIUeo3kEeJlHuq89bp2R7JwFjDjVl15LAsEQLTtVrCl9Fn2R9sNh+pAwifw9JCmg3KNnmqLMwSzxUY/dKAzwJxa7LCRY8IkKomkA0jmxEEI5KySx0Sm/zsfJTnUxwyYmx2Uxi1Hh/EAO2PtpGCzgjEn4ICGI62qBmc+uxvHKF3w3drGG+Hu2MO1sFdh7VgmnCA7ChlQRVhL8H7LKUSeA5/i+r07qaqcTdi71LxO9QM54JA2yY1iMuM425gSbbDkXZT+LQVZRbSEtq9LhXJs6tYwcqznNZxKWDYTRnyVMg0oteCNoSEkc7owwHF/T2nkG+54ukgUwzt0TqobQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YWMd+DWMFVxpn7gj8QTQWmS7na3KeLNDzkkd9Izht3Q=; b=mGv9A3kFx4P/WHeCEAdoSKW4SbzPhGsm4ZJJoOYUKwRuA+3rdw70PQeJksu0/hmHxM1aHxbu+LRcIReN6dxrYDefljEyHcVOqHPWMnqE+ZVnWBbQzyBNPiKd2wqjDtBBASHrIIIqmhVEaC5Z9juABkzkUHM1idOyPcXlT9Jtrv4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 6/9] igb: add ICR_RXDW Date: Sat, 28 Jan 2023 14:46:30 +0100 Message-Id: <20230128134633.22730-7-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0031.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::9) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d0c21cf-a72d-409f-d633-08db0171489c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c8VAedQUzQGCWYrB+6a5Pb8JUEvmM16DT8XJyUYyG95ougOSCzdgXl+90KLYnGUGRv4q+OQF+U5Qs0cp1HWjU+yv9Hirbre/AZG5JRSYue0wEx4Hrgcva8GP9H+QmSZGSAEr/EC0FKmmatlAAB6vgxMHXlrhTCbxuNZqaW9OEWf1Wec6QBx/426Ij0gAUv2MNOUAP4pal4j2EEol3O2CKtknr1m3M7mq1mmbi2jHhzBUy1LmydvPn24QZBqVexC5TdOLa1O4IAsRFmOdgU0VrA9st8gMp+8eqM+N7XIDTLmyylFnqcNmAguAuM2EeD5CIQts9D6/fBAm5C8kJ4lDUHmV4IuWS06D+iYU6VJE2eHXRV9WKfTzM/gdqQ7ra6Fw5iaToPUyLXh1Gm07WH9zU7U3IMzut9nW2lwp7DdpUVRWC5LGGuO+/mzIbNaUDmsJR7+jSmm/geZnONZLujmUwAc70buRqCfvT6qT8sn8LmFT3nsA6ZluB11Y24b7zR6AYY9/gwwGlpghm8plKqsriJ8ot3KOl1ovJpS3az+TfV8fnz1BWdWAGXvO982PHRAy/aUlx77/lg4T+kjK85eTS2gLlQWphFlqi539gGzu3C+1sVkBkhkY+rvGABOr1ZB69HlwQUqSayNd1MT6rZCfhr2CCgr1w2hYzbj4ce4Rb4PXaiorJ2zsCH3QCUEKCIxYOytVWML9PWnQtfbEzgt7h6iffDVo53Ar/NYyo8oRRmI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(83380400001)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6666004)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Jjx4LVBi4DiZ64o7T6D3qwRTrB5iq1XCQ/0z62hwhb5pSmhwVn4ypdBaOJYg?= =?us-ascii?Q?ndYuSI9QMFnQavvHC/ekuJcr01QaCFsrU15z08Ls77PPdO6cszi0tGijlkIo?= =?us-ascii?Q?jqqqnYWKts0QOR/wGqThpHHFhFWLLMrZaxkfc5mEIEhnKKHHR+Nj1CIB7GNH?= =?us-ascii?Q?IyZuFGal+NtkZNPIqW3J5xZylarNBlNoKEzIzEDseKQvbERKnWjopnn8RKWc?= =?us-ascii?Q?ZGhdhJS45Q5ELZTSRPPACDO9V/XdQsmhEOJir2HgwLSI39+FAf9dZLJmXSJv?= =?us-ascii?Q?I5kwuVdSUkHoqnAFH8KpQKFMXQsTsR06eaZyeUkXVy4rSA/A2z35i6Z+PlR2?= =?us-ascii?Q?7KRZtgrXid2vVmnsrheHcU2OZfDbHPG1tF5JmVst/M7OJsqTHxfGfuaYr5wO?= =?us-ascii?Q?RvKG3aHxOebRHCLQzefvIBJUZxIKF9akghcqQan/eZyfWvVOH7EH2Bom906L?= =?us-ascii?Q?JhBf5BZJYQbzyV6M+6T1l5lY8mgrefGD1tFAxi7i/TcUxWz0pv3NvryBgyS3?= =?us-ascii?Q?LdII/+3mivaekqvI9WOaDK6Nd3eVcX+rGlXxwUoAiK7hoEf5YFNxvEdIc5bc?= =?us-ascii?Q?16UZUXOd0kO1XUQEpeehzcwObUqOxLB/kViVTeofG04YHroEHKp7oVlLLGMx?= =?us-ascii?Q?EL9l6e9hHBqtPXLdu2i0sdd0w4BaMCxsSH1BScKqTFBarQ4RWFcOvcCwGnUB?= =?us-ascii?Q?WCBP+XIVpxlVGetza9H0vC3hKS28pSj6hwa5JWrlsVwjl7vmBbs2hWghwW1q?= =?us-ascii?Q?Yi0jK+DZ6EbW6r4SokFLG5oIMiVZENaFuHhNVBLeTfMhUJi7OY5sQzuKwLNN?= =?us-ascii?Q?KwOHM2PqHwkrnMPqKrXUZi8ycMGQxnvlxBGXRV6Rab8midKsu2KYIwJsjs3R?= =?us-ascii?Q?GghM0mpHFYkVeZab0CbK3CtCsgXP0RWS6Erv64CMhlXxvYHsgcIarPiKDQ+p?= =?us-ascii?Q?IPrRMDsuUXBr40BDg3tdLPB6rf9UIZ+LztdwIkxVlwYXnzd0gMiQhA1ASQAl?= =?us-ascii?Q?zyeXFNZ1syTAQ/ZamTRYpR5q1MraAL32NiJX+s6Z6GODzqykw82FB6JwZqka?= =?us-ascii?Q?ef8oRvTMbRZ60yuWQJKZzIJm0Eaar9Jz/t6pOPXNhjGufszaAOdLy2WBLL2s?= =?us-ascii?Q?TPEWf6nnjZlWLjrFcfGl81Ynmh7c9AsSju0kxShQwe7obPP5WxXTnjcbMxRV?= =?us-ascii?Q?HGkx8Dph094oK7EVL6CbnL1pbqZ1nEap7dSA0BtUzrI3iCgS3o4GMxo1UwbH?= =?us-ascii?Q?uCUCnFoQKzAztkdNqE6j8rXACydUA/Yv9PoHbWW33WhHMFWaAFNnuNgjEh97?= =?us-ascii?Q?rx/WNda29paCn6zO5GPEvRbjulUA9BKa2b6EByVwyw+B0PmWntlDPVajBwlq?= =?us-ascii?Q?MIX6eHZ+LBnAvYdtk1OgtOLbEOJFtweHcmulR4NHb7z3veSxE3OwBgeGTp1o?= =?us-ascii?Q?iSGE5vZotXcoUzP/CHMD1zI22Asn9lURrqDvk8CGXf3N32sG0YpSgwbYz2oq?= =?us-ascii?Q?qGqu2vFubrgRvEomh4sGmRGiSADS3F5b6UgYzFlKnfuagOS/dARxC26Bscna?= =?us-ascii?Q?Ihs98nl/4+WR3yU3NbTG32bEDNvWpX1E39f2S4oV9u36HH9vJGKfJYafFI94?= =?us-ascii?Q?NA=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 1d0c21cf-a72d-409f-d633-08db0171489c X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:26.5645 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Nz7D8SRGGzsxafmHATER5L4v2ttp+RKan6eDT+Rps+Hp+oq2DSpt399PpIOxy2t/uyi/1dCWXuqxneD29OV4+AQ6E8/D9/vcDHtzhDN1LHE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939110503100009 Content-Type: text/plain; charset="utf-8" IGB uses RXDW ICR bit to indicate that rx descriptor has been written back. This is the same as RXT0 bit in older HW. Signed-off-by: Sriram Yagnaraman --- hw/net/e1000x_regs.h | 4 ++++ hw/net/igb_core.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/net/e1000x_regs.h b/hw/net/e1000x_regs.h index bb3fb36b8d..3a3431d878 100644 --- a/hw/net/e1000x_regs.h +++ b/hw/net/e1000x_regs.h @@ -335,6 +335,7 @@ #define E1000_ICR_RXDMT0 0x00000010 /* rx desc min. threshold (0) */ #define E1000_ICR_RXO 0x00000040 /* rx overrun */ #define E1000_ICR_RXT0 0x00000080 /* rx timer intr (ring 0) */ +#define E1000_ICR_RXDW 0x00000080 /* rx desc written back */ #define E1000_ICR_MDAC 0x00000200 /* MDIO access complete */ #define E1000_ICR_RXCFG 0x00000400 /* RX /c/ ordered set */ #define E1000_ICR_GPI_EN0 0x00000800 /* GP Int 0 */ @@ -378,6 +379,7 @@ #define E1000_ICS_RXDMT0 E1000_ICR_RXDMT0 /* rx desc min. threshold = */ #define E1000_ICS_RXO E1000_ICR_RXO /* rx overrun */ #define E1000_ICS_RXT0 E1000_ICR_RXT0 /* rx timer intr */ +#define E1000_ICS_RXDW E1000_ICR_RXDW /* rx desc written back */ #define E1000_ICS_MDAC E1000_ICR_MDAC /* MDIO access complete */ #define E1000_ICS_RXCFG E1000_ICR_RXCFG /* RX /c/ ordered set */ #define E1000_ICS_GPI_EN0 E1000_ICR_GPI_EN0 /* GP Int 0 */ @@ -407,6 +409,7 @@ #define E1000_IMS_RXDMT0 E1000_ICR_RXDMT0 /* rx desc min. threshold = */ #define E1000_IMS_RXO E1000_ICR_RXO /* rx overrun */ #define E1000_IMS_RXT0 E1000_ICR_RXT0 /* rx timer intr */ +#define E1000_IMS_RXDW E1000_ICR_RXDW /* rx desc written back */ #define E1000_IMS_MDAC E1000_ICR_MDAC /* MDIO access complete */ #define E1000_IMS_RXCFG E1000_ICR_RXCFG /* RX /c/ ordered set */ #define E1000_IMS_GPI_EN0 E1000_ICR_GPI_EN0 /* GP Int 0 */ @@ -441,6 +444,7 @@ #define E1000_IMC_RXDMT0 E1000_ICR_RXDMT0 /* rx desc min. threshold = */ #define E1000_IMC_RXO E1000_ICR_RXO /* rx overrun */ #define E1000_IMC_RXT0 E1000_ICR_RXT0 /* rx timer intr */ +#define E1000_IMC_RXDW E1000_ICR_RXDW /* rx desc written back */ #define E1000_IMC_MDAC E1000_ICR_MDAC /* MDIO access complete */ #define E1000_IMC_RXCFG E1000_ICR_RXCFG /* RX /c/ ordered set */ #define E1000_IMC_GPI_EN0 E1000_ICR_GPI_EN0 /* GP Int 0 */ diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index e4fd4a1a5f..43ff387b16 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -1640,7 +1640,7 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, core->mac[EICR] |=3D igb_rx_wb_eic(core, rxr.i->idx); =20 /* same as RXDW (rx descriptor written back)*/ - icr_bits |=3D E1000_ICR_RXT0; + icr_bits |=3D E1000_ICR_RXDW; } } =20 @@ -1650,7 +1650,7 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, e1000x_inc_reg_if_not_full(core->mac, ROC); } =20 - if (icr_bits & E1000_ICR_RXT0) { + if (icr_bits & E1000_ICR_RXDW) { trace_e1000e_rx_written_to_guest(icr_bits); } else { trace_e1000e_rx_not_written_to_guest(icr_bits); --=20 2.34.1 From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939141; cv=pass; d=zohomail.com; s=zohoarc; b=YPTXu1cE9DddT+lzH778Ej7x1Gpre1XaPk1aW98JiIcFukDiZTUPlp3WWRR5/ID/PtelCpU2CXFMJ3+beDu3sQ1bYtHC80TWeU8sQoaLy9VR2pP1fIaMV20TcnQ4A3/IBmjIRXpUC/Kz6/CgbTwTBWTghN9abG+Je153F+MgIRM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939141; 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; bh=RZkLlBngGOhYergm9/C7JespkP++ArlnL3VvhSPig/E=; b=L+D9H3TcgiLy37Yj+9FLl6Z9Oyse4PIYdc7JD0HtnL31AONp6ZsGRi4YKkvIPqZD4IM163q2HlniWQXhPzoMZKaAUpon6tiNC3OHI15lpUNHuHoJYSaxvZzpmVjCgW/36dfYHUO4uBEpPSt+Rbjr7v892ae6bbjBwfewfXE2CUg= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674939141740826.2032843859528; Sat, 28 Jan 2023 12:52:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9t-0006Yw-Hp; Sat, 28 Jan 2023 15:50:45 -0500 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 1pLs9r-0006YV-T6 for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:44 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9q-0005Ml-En for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:43 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:21 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=frVwQL9eSlZf/GTkgncMUs/QmhT4ot2RGzmSwCgwaNjQKNcbqKi3kQq2QSuVJW1CqJ41dLRrwyYy/mQDphlnVQK28u5ToFt1UlYFvymIEiqqxTHD43hTednC8vI2FTGI3D4c0dcattTnQOLPSgYZW9QooWTGfuoH+3XQ0WXTtw05ayRxkCacqst1pWhIMqc1yax01CD0DWRKzEnWjKphSpnft9E23yT8XEntS0FsX3dg5D+eyF2N4woGxaO0vNzEStYsGiYyXjj8XqZpkdKVg8igLbp0Johzv5BexC9wDAtAFuueWgBFLjMTGtDzHn4q948cYarxH7ZE3IO6K1AA4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RZkLlBngGOhYergm9/C7JespkP++ArlnL3VvhSPig/E=; b=NS6wSvYgvBUs0AmgYB1VowLS0QFSXa+EYhhn0/X7sESKfe0bdHfKxUqdBF+agTiLpS3wseWCWtDKvmY6XwZpo8Cee+8Ufb7H6AcjbL1w3d8Rgwls0Hp8JaD3bT55h0hjOS78reaOq/gz1JjpTxAxi3yI1soLxNMDbNGnpO0El2i5IwGtZRoGD9eE7VOmOg0j/EoWR2EjUvimCYy9rZaOstWaVJ7nx2g+fqPkFreE+2c/6Qap2Msx9zgbfDC3b9aXgVBkqbpRfdb4Kq5W68HIWJKN4PVH7qCI9RCR01npmGU+CROhdJ/QxcE6OV7olX+Cm6ME/oOVUr/c1jENK/8rrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RZkLlBngGOhYergm9/C7JespkP++ArlnL3VvhSPig/E=; b=TfOMhF+SGU2LzwPOotZAN9mma5l0BljQaPE4h7lm6OIx6Xc306McvwbgU67YQpT5+/3pvH8EZwDv7dQADsjzwJ3Maga3083pDHgH1pq9RVrPvtY7ErFXlTZ20iN7uHVG7K84/mF2qfkDtQ6vNhvRNt22SQJVEwPwzH4SXdYKzBI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 7/9] igb: implement VF Tx and Rx stats Date: Sat, 28 Jan 2023 14:46:31 +0100 Message-Id: <20230128134633.22730-8-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0028.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::10) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f49075f-74b4-450a-92fd-08db017144db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +DJS3sPY2jDD5kRT/ckYlIuERVqrqcw5tRlWcXgHGaAvwhUhVSxLOMm+QnCR5eJRe/sBvTSzC6OZ3E/Upi5xtRuFE7g6FXPyprZl4kU+fGLg0d3VKgQzu9scRZozkbgyO/CvBVP4al76A/odcyDuvd9EQFGEj4NNwuUFKX/2Eb4aKwtb48x4z1iThdmbvSrA2bjsWishiXIsgbKQe7qggr72jAYlCjeywb+Vpa3QG18831um8K0ZtOygFdq7eg6fBamjsSBV+0SiswgVl7Wlcz21IcapFxJCMTnlIcFd9NECvKga/9+aIQd5V6tV8TJ4JoEj4gmKAwTlQsoSXMkqynIxMNEnLc6qR8F2wjeACI0xZ7icWkY82QD8dkgO/pxb/KOG5Nwx9RJbFysWQez8kLyNorQVWgo3PoQrhWfuhv+O7VWHpw9fwiHqHLvOBVe8//6KNyuDapdAeOP+hA3J54sgzYqEioHmpNZm9I6+Bq8mbgv9ORK0J82n1TX+Z58VK+WtsLkhsZjGxoMuTeonyQ/PtFw8kYzDSj00mNqLk6chATpn/KzytKvMphVgTwUfuQoFMntXiZrJzwE7u4qtgB7TaE1tLqZ4ml1vzvFVzqb4A2oFZyA6O/6EOPwcQ/1GZe6GQvM2t0QMY16C6STK76ZIm5mUuREDCLLzwUGarKf/kIZAFbpnjMWc9NEdDnBqp18mzecRVOnFTMd55v5AnkoOlUrQSOrKy7nUTHmZsZM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(83380400001)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6666004)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8QpLW2LAVUCTGVdZHI5iriO7bBKpiAIuL9MqEvXPa9eyaKIeVmN+hUzj3WV7?= =?us-ascii?Q?rKE2LQ0ITRXcbJRXvQwM5RwBvvv2+AxQtzskw8LFMxaZcOvaa+GaJlU0CISf?= =?us-ascii?Q?NrhvidRWIKvwLyVEcXSrlw82cUZYYsHNvbTB4LIbkuUniNe7kYt94WSs5b5I?= =?us-ascii?Q?TrsfJd0ZTPzq+aSOcuzqs38VMv34qNdmWZZL6Zht2M1zCh+Oc9Osbplj/m5Z?= =?us-ascii?Q?KPZsNVsp7tqdKP5HpdHsb7VL8yRcw3uvrsHkFf76kK26WZfXtIRRQooKbwfq?= =?us-ascii?Q?f5CLblbgTGwyBtiF/T5zUpmQdZka5GYqyiNa7NChMc7iRi/FQyxxgb62vzLh?= =?us-ascii?Q?MHL7Rb4D7UkjMfsGUJwzhkoJu9fjjRzqff8cbNSSKRBrlVtn+aguXO8RFf+c?= =?us-ascii?Q?7GO7K12tq4ZOKWEdB52Z/xWxrsabQQpu2Rz3nUgYp4b47LTAHWKFMOCr9wB3?= =?us-ascii?Q?LSM8SDUppclHEAD0Swq49JrCHb/vKuzls1LJXitn+S2m8/TeP8T2uq8lGtj2?= =?us-ascii?Q?//rsahLmsLml6r4pfWIRABr2DPrjJ2CLuLIKiQrnTGfwvioUjwcX5lvCy+aB?= =?us-ascii?Q?WRz2tDSwJrqejImN2mn3/y9Olo+awW4NxwJmSmcQYWp1cW0MsoNb89Sn6Gbt?= =?us-ascii?Q?kXH5v/QQwzMGKOLXhymCC0X/ZEHhNZ0elnuOMiUWjzB2L552a+jEHE4JswTC?= =?us-ascii?Q?OGICkWyHFxt4OxKhWbr/ooT5JSUjq19EzYqxSBm4jpyuIj8532rmshMQwvxP?= =?us-ascii?Q?ttSq501VsjGExZrt/RRjRm+XB1IhoAfb42tH/d9Zkniu4SFI2apM1ns01A2W?= =?us-ascii?Q?2ht2x2T8GO5Xqg16NHzsC68wRYJ3uVt8DXpvmi8rh0EFw6pGTgp0VLDBW7Zh?= =?us-ascii?Q?mAEjpDstqBdfvpW4G2qkJrQPL/BzcdCjBj8zMOR7ddOwxazeAFSlqa68L3M0?= =?us-ascii?Q?eaP613FOIFHoj2ZCS8Z+S4s+FSsaRiF7cIcLEGD1igB2N9twVQwGEhhI6lz2?= =?us-ascii?Q?T+FSecZyCVKDHzLLN6xoXHu1VtX7BV5cBPDc266gObe5f5Kx4NGcMAu2WcaV?= =?us-ascii?Q?50ape6wfLieXkCPNIkPdGoF7HAqEypsyOMhOPznlloWHtyaH3US9dCgZ0jOP?= =?us-ascii?Q?Nw1YNC9AxrE00oBIzNnOCSAULBJdbRQwLY8kXOwFpPSTlq7HJgP43SEHOTZA?= =?us-ascii?Q?XtXySJ4ZlKcNRHF5mg/WLYGLjQ5vsvsdT4MhTBZCuEyXY5OskjGk61Uiz8MJ?= =?us-ascii?Q?iMZExhw8n7eAD03ZvG9L/XP4HTxhDHkBOrDeQ4r4TeXupqqAKoeg/Du+JChP?= =?us-ascii?Q?aACWgUMz/Dcy0sRA5roZDWR7nBxigmUCKmW2T/KmGIgVd/ux1HM6h0U11JnK?= =?us-ascii?Q?b4eFV9fnFcjSKZGHDB6QpRlEM5P91AAOxkig8VCnt/9wYgztW0/VD6qxc2B+?= =?us-ascii?Q?gfbuTEoHYEuI8wbuGRsZYjwX8subIHC8dZcFcXr2tCzm5avpQ0j+CvlLqmsV?= =?us-ascii?Q?EXP2P+hvPHULyXhXOa6iVtRRyXf1KaWNQuzxPL7TnNs8BtQ91vv3HFeLgS45?= =?us-ascii?Q?nwZeq0PeAyfI/1eNJjdTxBo4TYWs+MBs93G7pRWa86uridoCVR3idD+mEPiA?= =?us-ascii?Q?VQ=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 3f49075f-74b4-450a-92fd-08db017144db X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:20.4991 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Q1t0Z+zLolHR+7ExzKoCw88z7vDLGcUi4sKE+SGfUIgr0duoJlA+hm6kCLXp2sZL5NATRgOeR98DHqSbGPicpOxIWR+KIw1Hh9+xZmBLcho= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939142625100003 Content-Type: text/plain; charset="utf-8" Please note that loopback counters for VM to VM traffic is not implemented yet: VFGOTLBC, VFGPTLBC, VFGORLBC and VFGPRLBC. Signed-off-by: Sriram Yagnaraman --- hw/net/igb_core.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 43ff387b16..375d9d5e34 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -488,7 +488,7 @@ igb_tx_pkt_send(IGBCore *core, struct igb_tx *tx, int q= ueue_index) } =20 static void -igb_on_tx_done_update_stats(IGBCore *core, struct NetTxPkt *tx_pkt) +igb_on_tx_done_update_stats(IGBCore *core, struct NetTxPkt *tx_pkt, int qn) { static const int PTCregs[6] =3D { PTC64, PTC127, PTC255, PTC511, PTC1023, PTC1522 }; @@ -515,6 +515,14 @@ igb_on_tx_done_update_stats(IGBCore *core, struct NetT= xPkt *tx_pkt) core->mac[GPTC] =3D core->mac[TPT]; core->mac[GOTCL] =3D core->mac[TOTL]; core->mac[GOTCH] =3D core->mac[TOTH]; + + if (core->mac[MRQC] & 1) { + uint16_t pool =3D (qn > IGB_MAX_VF_FUNCTIONS) ? + (qn - IGB_MAX_VF_FUNCTIONS) : qn; + + core->mac[PVFGOTC0 + (pool * 64)] +=3D tot_len; + core->mac[PVFGPTC0 + (pool * 64)]++; + } } =20 static void @@ -577,7 +585,7 @@ igb_process_tx_desc(IGBCore *core, core->mac[VET] & 0xffff); } if (igb_tx_pkt_send(core, tx, queue_index)) { - igb_on_tx_done_update_stats(core, tx->tx_pkt); + igb_on_tx_done_update_stats(core, tx->tx_pkt, queue_index); } } =20 @@ -1364,7 +1372,8 @@ igb_write_to_rx_buffers(IGBCore *core, } =20 static void -igb_update_rx_stats(IGBCore *core, size_t data_size, size_t data_fcs_size) +igb_update_rx_stats(IGBCore *core, const E1000E_RingInfo *rxi, + size_t data_size, size_t data_fcs_size) { e1000x_update_rx_total_stats(core->mac, data_size, data_fcs_size); =20 @@ -1380,6 +1389,18 @@ igb_update_rx_stats(IGBCore *core, size_t data_size,= size_t data_fcs_size) default: break; } + + if (core->mac[MRQC] & 1) { + uint16_t qn =3D rxi->idx; + uint16_t pool =3D (qn > IGB_MAX_VF_FUNCTIONS) ? + (qn - IGB_MAX_VF_FUNCTIONS) : qn; + + core->mac[PVFGORC0 + (pool * 64)] +=3D data_size + 4; + core->mac[PVFGPRC0 + (pool * 64)]++; + if (net_rx_pkt_get_packet_type(core->rx_pkt) =3D=3D ETH_PKT_MCAST)= { + core->mac[PVFMPRC0 + (pool * 64)]++; + } + } } =20 static inline bool @@ -1481,7 +1502,7 @@ igb_write_packet_to_guest(IGBCore *core, struct NetRx= Pkt *pkt, =20 } while (desc_offset < total_size); =20 - igb_update_rx_stats(core, size, total_size); + igb_update_rx_stats(core, rxi, size, total_size); } =20 static inline bool @@ -1490,7 +1511,7 @@ igb_is_oversized(IGBCore *core, const E1000E_RingInfo= *rxi, size_t size) bool vmdq =3D core->mac[MRQC] & 1; uint16_t qn =3D rxi->idx; uint16_t pool =3D (qn > IGB_MAX_VF_FUNCTIONS) ? - (qn - IGB_MAX_VF_FUNCTIONS) : qn; + (qn - IGB_MAX_VF_FUNCTIONS) : qn; =20 bool lpe =3D (vmdq ? core->mac[VMOLR0 + pool] & E1000_VMOLR_LPE : core->mac[RCTL] & E1000_RCTL_LPE); --=20 2.34.1 From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939124; cv=pass; d=zohomail.com; s=zohoarc; b=K/JXeZntMamvc68Xk6v0gjU2mjC+B45+IgOxBFdcbjx2EgRCP/OLYIQRZOHkTfp3Pvdbc0pcX3YIAcTuFLkgXno9IBDrE+R56Nw9eINaydR6sOKTzRLGvH7kaZ3eDKLEQUb8yNCdxxMvbvyy9Hn6vm+2xEi+5FuADC2pHRusF8Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939124; 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; bh=aWlyb/2xjYrrjPXGZnRZBO9TdxBIGj+8g6NmikAJhj4=; b=ipxLSpYRBUMgklro+2bLT6P9DJgUtrtWqXjsmRFSHrFUst+2PJxlv4bF3LXyEAajbh0rZaqCbfzwnNIJBBXS50uZXX+5E+RxR8RdfGqj25boEaoSr5PE7VPknSF4xIIppA1xNh5DCq4uruqombgPIClA4btaFZQ7uQ/9fM0OjhM= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674939124618595.4164265227892; Sat, 28 Jan 2023 12:52:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9u-0006Zv-Vk; Sat, 28 Jan 2023 15:50:47 -0500 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 1pLs9q-0006YB-6B for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:43 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9o-0005Ml-Qw for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:41 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:21 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eH7M1gnurI76z6Jf8EEW+kgr7/1qWyWc6OF/q0G9NHKGTeqDudLBUQvYbvXUeJpfrynEA14ltwONep2wUgKJvMbgClPnCDGjpGydRCVgmdCtl3/cBTtgXS7nC7VmDHZjUfaGeFOWDNdMrCYfCxPPlA+ErE9ymltSBLXP3wDv3QCy9i0WMHM4M+TRj1UZIYW5WrQpwtDL3MCEI2aYb6aQGlJ+1KiHAMHibMYVbdw8Z4yHO3MeLNdo5EgMGZjigIxOHWJhwxOoWnY+X18en2VflOc4a84Kl42GqvDWMnMk8Qq4ukqmMiljfCPOaGAU1o7QPl9gEVJighmKMpQShc9NRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aWlyb/2xjYrrjPXGZnRZBO9TdxBIGj+8g6NmikAJhj4=; b=NFA6CiErbru5t+FuTuJXbBLx0DI3z9ayL2YMxgkSdtZ1/kJMJ8sAvj+hsmzoVWS3fOOl7m96tlITxaVvJsJ/nQuvA0Cvhvdz5YXKwwk9Njs+pN2rHaueT2R8B+ng6ONOKsD6dxMwgbF2AjPlZ+l61gHvxAhjeEGCyQ6hJ/rKcjGrSCGTROwOCQAG6BM5m9y3ehFUlYxboW/XghLYOC3rKMyyVOcCRpvxjiz22LF5hQvXk5HB9MQaJTnuei5aDyUHTx4/iprEjO8f1cy6OI8wjAOslBopO/ZODVv+J4PF23eTjX1ySjtV+lAfoK6Tk9ppP3DmH5qAQS3CR6DyeRyJfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aWlyb/2xjYrrjPXGZnRZBO9TdxBIGj+8g6NmikAJhj4=; b=K2pg8Vi0SjnPDfkR26GIfwBKvSOyJ3RqikTKtoy+NfjoQQGaStt5woHiskeoaoOkQ1bWIianw3GbqoU8Vl82Qnp8PvqbFjKaRoGulXdB/G1OmvKcelTBVv8aFdAcpvL6+UKrzvnV/1S1QvoHz1S4VOD8YW5LhD8IBBtdu5uFkcw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 8/9] igb: respect VT_CTL ignore MAC field Date: Sat, 28 Jan 2023 14:46:32 +0100 Message-Id: <20230128134633.22730-9-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0036.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::13) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: 4eb6e3f7-d8c6-4dc7-f53a-08db017144dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7bYEZr+Cj4XWzU+o2DAfuVBSwTTqON+Xncp+4iIzxPHUY/Ow31r4wIDa2fVdouC3Xf42eeml7hOW3ALkH255a6rW8gyaaP50DMI9MiU3BTWk3l7ykTiE8l/br9Kcc3gseLeUCn6EnW8hwELVIh3+QQskRvQFCFo584bSsFJTFqiPWt5YPCiXlrIbE6O/+FeBlpYaigiuduchoqynNhBV0q4F2t+qkKkqqldOpk9PdpTb3l2NYoFRSYqEDOUIMIWbaBUGCj0Din63Zkoca9egMI1vX2P98vwf8u/JIxp7cp6jpSE8oAVayph/Wjq4YOF9ipCxKlEKkaPtiA+1YjiswyosKVFd6vVLM5b+jCzM5LLdhArwxV9WDsiAkovQMPBGbNM//qgRteDnRgYZyqBwR3KVLi3mMbQWjvEZehtM8+X7Sz2gHd2ZNsWgnljfqrU9ZTTska6BWKX5CDyN8LMPm/UNuVBhAqcvH+pqBpJ67VQtTBebiWGjCPpXPqpc9dp+7yEmN3EOoaLw/8PcwAQ4Mm7wsYFd5zllfnukXnFG3xs4hk91z6VXi3C1Wl5IKdWZEO0DzI9ga8yPWsQLKfji4G0jE2GZU7eYB9RavimPckL2rgJ54S/iRqmpksVrPAXBTA8LD59U9pV7kTXRkMO6EdTOS/cmLfzbMVWbjo0KYGWqEBgQC0qA47MqMDCmJmH7H1Ip08MH7iCcKm6PQDdyxsfaXeLsDdtPpi6PVP/XZ5w= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(83380400001)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6666004)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i9j4EsdGI/gV5Oml2fpqwDxBVSVyYPsu1b7pOuKpJODASlbnlLCte7yVlzuw?= =?us-ascii?Q?M1y8hYDbeUxjqPwtdmJE5lgWqCcpBrKp8ba8r2uNOs/f04T31scKIWt5rFmE?= =?us-ascii?Q?mApPnmj0812PPoANTy+4baJiWe9TdcZe5Ycn2BUrvp74VNyrpdF9l57KpAcs?= =?us-ascii?Q?plq1mOMvmK2Jrcku7ROfL2RPss+f2l1Pg2v2QWZjwSqNUOoyDZP5ILviAsFC?= =?us-ascii?Q?x6uh1Wm1E1bEHUuBmZSDWFIO5yPUOu649fuT9aUqbFT3K04u+YiMCD8Igllv?= =?us-ascii?Q?lbue6i91rtdxwPfcSVjPhuROPmXus2P2KE1rBB/eXW2Pu64tzj4qmrFwEImr?= =?us-ascii?Q?tUAVXG7QgRGPbvS2roNIbXQb6wHpKi5ATb3Az9YarC2Upik9/E7+uCzH9/Rx?= =?us-ascii?Q?WJ9eGU+G1yHbseKRPshpE9xxyWaH1mSUx94T5UKtzOeFeOapNvGvWxTSju/b?= =?us-ascii?Q?5EoCkoiJztSuGbOc6w7RzewQkr/TD1oCumPLub1BA4/BO5o7cmFHTBnaDd7Z?= =?us-ascii?Q?+NMlSQPLas7ACNKg6bU9kp0/egEO9/OzH83hdvKR1pPi5NJAtHTyaUY3xMiZ?= =?us-ascii?Q?Cwk30iHZp61HC1grCx6EgbDUwyi9SQol8H1nlRgQtkV4Lm7XxTbpP3KteIZs?= =?us-ascii?Q?Qm10fJ2FDamkynmPF8uscxE6w/AmdvWD7RNDFlBF+o2pc7QPObogt6GdM/Jr?= =?us-ascii?Q?YmT/XXFRW5qfey1XbOP+b6ffTtyyKEXREzUcnNPb5Ly4hiRSWj+NaMV0vjco?= =?us-ascii?Q?U2sq3MLJSyhrGwPLoP33ljqOTVjmzGD7tS4GPOX/+hz0tsS9Reb+wzxP5SdF?= =?us-ascii?Q?V6c7HP5KFVpd6zMTIe6XdXrhIrWtBvaob2Emuy4MpccSredD/7BvHpOdcwWM?= =?us-ascii?Q?dTq8x6tSqA7F0WpLiXAwo4jJXn+UZyYe5Hs9daZJ98hKgfbRkS5HqfdiWDSM?= =?us-ascii?Q?oddifW+5yk1/kHV4UhwmQJx2eY1pW9FEU8sIO7+b/qXHoNEpgrP3IBu4h3Yt?= =?us-ascii?Q?MryE+yi/+WdPXDSec/X73mf2CPdeKIXUs0T3qElZrEjQbf/x8kp/yk28VLsO?= =?us-ascii?Q?ucDno7OgW7IJkfyn30JkUpAASr1y2vsnHymGwKhmqtreHMEn52h+a+AZuElV?= =?us-ascii?Q?uW62yTTrpqiHLzUDvYtGYw14fj3CR6TUxoNJ7yha6BN457FDpmJIjmfm6It1?= =?us-ascii?Q?eSIF//zxL5EArA+yEarhgcxWutSmkTF9rFTV/cWlnFu8UqiijlXSNT4BLQED?= =?us-ascii?Q?N4kYC/9qCtecqg0syyT62wmmpcHfde/lt5OWe0p35q4eK3z3MgfhtxJgplRP?= =?us-ascii?Q?FtRelcPvjJUzpmDMM/KxjEDRCLX4/ia6iGh6tQFXC5uO3sigyvN8jdFnzPCN?= =?us-ascii?Q?dcJ22VUmmEUjYCfvuAeUGCbZd7q69SCwsGpoSIHWl8QKfrhrtfASlmoRlSOE?= =?us-ascii?Q?kSjb8j1T43TVTSEyEPxBuMnV7bqU8NJpWEEeRF4lIJ7y5jG8BtDjOG6712Lq?= =?us-ascii?Q?GJiOORlomAXvXXel/oV7hXDVgrpKSy8dGupghx9Cso7hoNueDFTGghzRevK8?= =?us-ascii?Q?B729/kqm2cXL4OnJ0FcqtL+sPiFDiOGu3ZBZ4H3X3WT39lNHdqx+nkRp9ubp?= =?us-ascii?Q?dg=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: 4eb6e3f7-d8c6-4dc7-f53a-08db017144dd X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:20.3885 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mSS+E7Kv6cvAhKtsDsUoWUVhUXQI7zrYtCfgAdNT6GPR/ViyV31nKkD8l5xaROjRTrGkURSb6zT9kBF+P6cfYpswVVXOCH8jD75kcxjo4jE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939126569100011 Content-Type: text/plain; charset="utf-8" Also trace out a warning if replication mode is disabled, since we only support replication mode enabled. Signed-off-by: Sriram Yagnaraman --- hw/net/igb_core.c | 9 +++++++++ hw/net/trace-events | 2 ++ 2 files changed, 11 insertions(+) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 375d9d5e34..8e33e15505 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -949,6 +949,10 @@ static uint16_t igb_receive_assign(IGBCore *core, cons= t struct eth_header *ehdr, } =20 if (core->mac[MRQC] & 1) { + if (!(core->mac[VT_CTL] & E1000_VT_CTL_VM_REPL_EN)) { + trace_igb_rx_vmdq_replication_mode_disabled(); + } + if (is_broadcast_ether_addr(ehdr->h_dest)) { for (i =3D 0; i < IGB_MAX_VF_FUNCTIONS; i++) { if (core->mac[VMOLR0 + i] & E1000_VMOLR_BAM) { @@ -995,6 +999,11 @@ static uint16_t igb_receive_assign(IGBCore *core, cons= t struct eth_header *ehdr, } } =20 + /* assume a full pool list if IGMAC is set */ + if (core->mac[VT_CTL] & E1000_VT_CTL_IGNORE_MAC) { + queues =3D BIT(IGB_MAX_VF_FUNCTIONS) - 1; + } + if (e1000x_vlan_rx_filter_enabled(core->mac)) { uint16_t mask =3D 0; =20 diff --git a/hw/net/trace-events b/hw/net/trace-events index e94172e748..9bc7658692 100644 --- a/hw/net/trace-events +++ b/hw/net/trace-events @@ -288,6 +288,8 @@ igb_rx_desc_buff_write(uint64_t addr, uint16_t offset, = const void* source, uint3 =20 igb_rx_metadata_rss(uint32_t rss) "RSS data: 0x%X" =20 +igb_rx_vmdq_replication_mode_disabled(void) "WARN: Only replication mode e= nabled is supported" + igb_irq_icr_clear_gpie_nsicr(void) "Clearing ICR on read due to GPIE.NSICR= enabled" igb_irq_icr_write(uint32_t bits, uint32_t old_icr, uint32_t new_icr) "Clea= ring ICR bits 0x%x: 0x%x --> 0x%x" igb_irq_set_iam(uint32_t icr) "Update IAM: 0x%x" --=20 2.34.1 From nobody Wed May 15 15:06:15 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) ARC-Seal: i=2; a=rsa-sha256; t=1674939109; cv=pass; d=zohomail.com; s=zohoarc; b=E4P6qiYCX0ADuBzDyaloFSdmpmFkvpHdLdj4ay3yd8UQPlhqhN9sx2UJZGduEI/eg64+zrlfvyLBX+7Q3cjFmTFHW84SGFtHtVIxDwSQoleq194kwb/9dKskVxUhc2f7q/pin+K4VbZvTuFsYjvBaYreb28LNiyeQPLRUA2nBcw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674939109; 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; bh=+78nmude9Trd7pf6IUw4ymNxxRA7ckSssJsy7Ml4Qmc=; b=HehfB350fboLux5AU9SA3AHjClImDXsMMyTrFn5hZTnxno/VxcJCKClZcYTwtN58Mu73aak+VAS1XDw9gkIqW7jGst2U+ovX4XeynIPJui106hgWCCOKp2cUfdMYpUCXwoL1N8n34A9eHcIIn7HmlnEvDKJViZHKJyjP26MdXjg= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=est.tech) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674939109760885.9834898181914; Sat, 28 Jan 2023 12:51:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLs9z-0006bE-KY; Sat, 28 Jan 2023 15:50:51 -0500 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 1pLs9t-0006Z1-RU for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:46 -0500 Received: from mail-db8eur05hn2032d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::32d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLs9s-0005Ml-5p for qemu-devel@nongnu.org; Sat, 28 Jan 2023 15:50:45 -0500 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) by AM7P189MB0661.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:116::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.30; Sat, 28 Jan 2023 20:50:22 +0000 Received: from DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420]) by DBBP189MB1433.EURP189.PROD.OUTLOOK.COM ([fe80::8f70:435b:ab64:9420%9]) with mapi id 15.20.6043.030; Sat, 28 Jan 2023 20:50:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XQq3p+TUHhTpa4LZQMc//Yep3pnAH1zW1CPQghe59aiB2VK31DUPkwCp2bu9B2ekhJdBIVu2zLiIkvWba+FIWdvb8HBWN9jCjZgu9vxyArp7na4yCp66Zp6C73aITT9yLSIKMpBvjXVySPW9l+tN/+Bf0t+8MxdM3fq/hLMW3f3rlyIspskj1+UYFUw9xE/Dq6VIRpakK5TeETVKbavefJS+5eiTCdCs8nAxzwxnwDI6X+ERqNkGnYB27KfQDOnY7FmPhGWVfxH5kd4DdpnFkFDJSD4RzryvyJz0hUz74K8n0PBZKlzRx9bTbiUj/ZkFl6fFRKlfyFrxyRgkou1Kew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+78nmude9Trd7pf6IUw4ymNxxRA7ckSssJsy7Ml4Qmc=; b=HRvClQjyN8hCAUI2/4dEAaBtwp74NXcYqiJcsJ4mqtBz8PTEOgXYSj7IXnBuJHo1k2y8W8MyjcUQyG1YS7wARIcqkAI4WpZbGxn/mcIUdv5S8clpkEz0e8gLyWOHga66Dv60NNqFYSUJrzpyVzeVAPjTQLwiVRp8bTH5SmBWff+rPAxYqyY5GYrNCBJ5vYim552RYwTbseAwWm0154cARK90+mzYSKww1QpJHTdGra7eXTLmOxkFpfnZmS3yzauGVjShCJVMvxw6AEk8nuLDabwCo470MzE73H+tiClTGuDwYmq+4jSbU5FLNrCmw0Ya5Z7BI40zD19l4HnziHCTyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=estab.onmicrosoft.com; s=selector2-estab-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+78nmude9Trd7pf6IUw4ymNxxRA7ckSssJsy7Ml4Qmc=; b=A5SfuGBzuA6J3oPCriXbTwkMDVqwzsoZZ1vEpFBRZSJx04Q27gt0OmSTEpyU8L/NG5cyJEigMVHC/aOy3tNZh0q1Kxy+8ziKPlCg21VUIkmTMqGsZF32jy2zJKziX/xE1AN/AyneYfHhe3Wb65XN9qk4mSvV6KgNuRz7Th94wuE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; From: Sriram Yagnaraman To: Cc: qemu-devel@nongnu.org, Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , Sriram Yagnaraman Subject: [PATCH 9/9] igb: respect VMVIR and VMOLR for VLAN Date: Sat, 28 Jan 2023 14:46:33 +0100 Message-Id: <20230128134633.22730-10-sriram.yagnaraman@est.tech> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128134633.22730-1-sriram.yagnaraman@est.tech> References: <20230128134633.22730-1-sriram.yagnaraman@est.tech> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: GVYP280CA0036.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::13) To DBBP189MB1433.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:1e7::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBP189MB1433:EE_|AM7P189MB0661:EE_ X-MS-Office365-Filtering-Correlation-Id: de5d1c82-f41d-4b91-dd68-08db01714508 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2y4J3avtWR/wEDLoD1d84CcO4xpB4FnBl8JbrYCQLkjBUE3I3a0r0Ov/O2lN+UAGsovl0YJbFut6MtoWj3cMuPhGy7FmB704S13oWtO2QBgVH9F4cYrT196TtnCq9uWfgOXPFmLlqSAvPvmPYe4HCLGPvsfSBxglvsCiEnQpjwFZgz1g+Ls+72Tc2aV8ZM+3WvBAHRSrAP3nsit7/vnEFCICDOd9NkNu7P51NCl0GXTl3CLK9+ukOjNOEo+hdne1iDQ5I7GTPndw/w5SE7RgkeSXAei13vqtwo5/R/Sj/JF4+iv994bk/VxwQZFdGJD3fbClxH4Lfp6moi7FmSTDBXJhfXPKPbq4I392lV5CXId0ChdDQ6eB4Tt8iE9MvOXgs3BZMmmrGZ8RusDzkr/zDcOY1nkAMwQIjhMW3txL4aWPdwTLzhaSh+G+jh5zEXBF4tdHPGbKwYeDLyGlwKM9VrKtxGraratbHHsjMwbjDukfxZJVWNAVGwFYR0Sh1+OQ0VoPb8/DFspVkOb9wfwmBXjlFJUSXm5M9DRm81L1d2Za33+FKaouwA+OW+oYgviWSTzzmvwnZCr4lEQ82/4q/4a8ZBepG0YG9s/6JWnvQUMnY4NAwIZ7lFHvc5qwPOK3bBY4ji6ibcqRo6WqdBTQGOqWKV2d620RnPV/3zm0j+8GZsbp1w97CObcoxMRV0tVIMO8giItiBpXMFAYmQbRi+Z6I9Ehh15rsqgNmslrdm4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBP189MB1433.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230025)(39830400003)(396003)(346002)(376002)(136003)(34036004)(109986016)(451199018)(8936002)(41300700001)(86362001)(2616005)(83380400001)(810100004)(38100700002)(41320700001)(316002)(8676002)(54906003)(36756003)(4326008)(66556008)(66476007)(70586007)(66946007)(1076003)(6506007)(6666004)(6512007)(26005)(186003)(6486002)(508600001)(44832011)(2906002)(5660300002)(266003)(37730700002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uxlTB1el2TyiEl4gg47g26o1IS32THGpAEW0LY3ng34WaSAqSl8Nc1EszFIh?= =?us-ascii?Q?CoJIfYVoVwAOP1I5kbFHTpoad9rusbfi0uoMyAL6pV1YSK3UWTe5piY3q7Yt?= =?us-ascii?Q?OvItJNP4UbjItjLARWHxZo4lJ8sPN7WglJstHtEsM9KygqrEvsQASczaqvEy?= =?us-ascii?Q?NmEOXlFPn7GswbTfPqmMXrLn4O5wIfFMidJyqB8SG4aAR7ohyQaO6G0sO5nA?= =?us-ascii?Q?T+RpFmluubc5Ad8Or41WiP1oAPnuu940CcMSnJ42NkOPw63AKwF7ZXJGMOhS?= =?us-ascii?Q?GrISxFXWmt5kbMAMf4Ctnsc9FSNF3gpHTvj6Uv3sFv1gKHjE2Gu0ZmydGXFt?= =?us-ascii?Q?IVg8O2zkv5KJjJxmfrzaE/4RicxtjRs5gmYQ95tfpACLvSpbg+gqfottKthG?= =?us-ascii?Q?ypM6/4eSoD/98w0bz50Cu5TOeN/B7vBqo/lddCE1li72UhFgRQJL2qXyEO+k?= =?us-ascii?Q?q8CkF2dBr2gqoJ59bW5Q5JchD4Y0evjHeWhSzkipIh+N3U9NBvLB1KVkZ4sQ?= =?us-ascii?Q?uoB53cWlW/uXylY68UuvJI/nWQ5GW/7j7CLJQnOxIbqM6OAbi0LHuCNhN9Aj?= =?us-ascii?Q?vpvpscWDVm+YCZTGv6M+szbhEeNUO5+Yb/zEbNR9AArDjUwOQnKNjp+C2qhA?= =?us-ascii?Q?9m1qduCwvQD2z07NenTgYkXmjciCl2MVGLzUulSfZToP+WLtEdr0/LoF0/B9?= =?us-ascii?Q?NDBlm8rFCrIQNyc3zPrM+qhJgItv3My5466z+u74j089SKi+MXyDOu8q7R5J?= =?us-ascii?Q?BSx56aGN1cd1u0MzOnwJR5fYoT+xT9iHX8ZAZjPPZNYOgCJ82Ijm2m8lZGw/?= =?us-ascii?Q?NSjnvT/RIGMtOJKfXGUfbC9OnQeRZ56nsQ8IpAj/qgAgamImApa4wAggCwrw?= =?us-ascii?Q?wRvFT6EWaylJ20M+RFh+WRMRunaz2HkSZu8GNTOV6JAuJCyNaCoJbII6I8vo?= =?us-ascii?Q?EQcLOxu4gXXVl/COsmR3B1Oo75v8qqJWz4jIlUcc3OxcJUW6Syr6EgOru9Wm?= =?us-ascii?Q?K6DtDL0o3BBTX9rs40KhxaJUF/9RFlxxdzl/qEzXUa/1y2/zQ4+pxq5qMzrC?= =?us-ascii?Q?cs0JRMZpYR2W7A6BGgcFvoMfJaUTfGzBKivXWLRj75KTjsJh3x/fEjVsLEnx?= =?us-ascii?Q?xPGk1bhR9PCHU/b+9I+tdgxCjLNIORt5tPIGftZWSCvXTPRMz2MCsgoSz4xN?= =?us-ascii?Q?aHCUZqlQsxou5D3X/XItcXBys8yxEHtQOJpMxGtT+6GP3BcOYWtUiykhOFSM?= =?us-ascii?Q?Rul31dM3LbXOw2fbhR4zidEpD1V1J2rcZAYQPpc531UvQAeYj6Qrgvra4MJ3?= =?us-ascii?Q?Xlyh9lXDriooIyrjjmV2uhVr7s24BYKxqIzgkZCf+tipsdlRsk1qqweEgP3T?= =?us-ascii?Q?gSl7QUKJdy6RE5ttAM6jdmYh3nensA/2Qo57/nJ8zVMCPOKQcHkgujEaFtoW?= =?us-ascii?Q?/Y5YENtaCNbaZxLeh+oRU4jzIOcg9SnwsrwKleF4/IWwtG64NcawjQNgnQ9y?= =?us-ascii?Q?C0YTiQhXX6B1tCqZP8VVyWmimOHvz5cfdZS744xcXE/bKKBITgfU9yZM1mgB?= =?us-ascii?Q?W5oPrm4OUX8ptV1rEXxRFtyYVTD2DgevWcbQdsY93OIMOr0OCVx0K+MLRCbg?= =?us-ascii?Q?xw=3D=3D?= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: de5d1c82-f41d-4b91-dd68-08db01714508 X-MS-Exchange-CrossTenant-AuthSource: DBBP189MB1433.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 20:50:20.6397 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aGqLYNCbGYanBS2sl/dQmisY/fc+xeogNZKlAZTqol76FO8wVxXknqcvv98CTpIafZBzsKGgkIDKUlSr9laI8eNl+2CNpQtd0xKpVGmgR4E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P189MB0661 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: pass client-ip=2a01:111:f400:7e1a::32d; envelope-from=sriram.yagnaraman@est.tech; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 @estab.onmicrosoft.com) X-ZM-MESSAGEID: 1674939110591100011 Content-Type: text/plain; charset="utf-8" Add support for stripping/inserting VLAN for VFs. Signed-off-by: Sriram Yagnaraman --- hw/net/igb_core.c | 100 ++++++++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 35 deletions(-) diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 8e33e15505..96a5c5eca3 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -384,6 +384,26 @@ igb_rss_parse_packet(IGBCore *core, struct NetRxPkt *p= kt, bool tx, info->queue =3D E1000_RSS_QUEUE(&core->mac[RETA], info->hash); } =20 +static inline bool +igb_tx_insert_vlan(IGBCore *core, uint16_t qn, + struct igb_tx *tx, bool desc_vle) +{ + if (core->mac[MRQC] & 1) { + uint16_t pool =3D (qn > IGB_MAX_VF_FUNCTIONS) ? + (qn - IGB_MAX_VF_FUNCTIONS) : qn; + + if (core->mac[VMVIR0 + pool] & E1000_VMVIR_VLANA_DEFAULT) { + /* always insert default VLAN */ + desc_vle =3D true; + tx->vlan =3D core->mac[VMVIR0 + pool] & 0xfff; + } else if (core->mac[VMVIR0 + pool] & E1000_VMVIR_VLANA_NEVER) { + return false; + } + } + + return desc_vle && e1000x_vlan_enabled(core->mac); +} + static bool igb_setup_tx_offloads(IGBCore *core, struct igb_tx *tx) { @@ -580,7 +600,8 @@ igb_process_tx_desc(IGBCore *core, =20 if (cmd_type_len & E1000_TXD_CMD_EOP) { if (!tx->skip_cp && net_tx_pkt_parse(tx->tx_pkt)) { - if (cmd_type_len & E1000_TXD_CMD_VLE) { + if (igb_tx_insert_vlan(core, queue_index, tx, + (cmd_type_len & E1000_TXD_CMD_VLE))) { net_tx_pkt_setup_vlan_header_ex(tx->tx_pkt, tx->vlan, core->mac[VET] & 0xffff); } @@ -1514,6 +1535,22 @@ igb_write_packet_to_guest(IGBCore *core, struct NetR= xPkt *pkt, igb_update_rx_stats(core, rxi, size, total_size); } =20 +static inline bool +igb_rx_strip_vlan(IGBCore *core, const E1000E_RingInfo *rxi, + eth_pkt_types_e pkt_type) +{ + if (core->mac[MRQC] & 1) { + uint16_t qn =3D rxi->idx; + uint16_t pool =3D (qn > IGB_MAX_VF_FUNCTIONS) ? + (qn - IGB_MAX_VF_FUNCTIONS) : qn; + return (pkt_type =3D=3D ETH_PKT_MCAST) ? + core->mac[RPLOLR] & E1000_RPLOLR_STRVLAN : + core->mac[VMOLR0 + pool] & E1000_VMOLR_STRVLAN; + } + + return e1000x_vlan_enabled(core->mac); +} + static inline bool igb_is_oversized(IGBCore *core, const E1000E_RingInfo *rxi, size_t size) { @@ -1574,6 +1611,7 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, size_t total_size; ssize_t retval =3D 0; int i; + bool strip_vlan =3D false; =20 trace_e1000e_rx_receive_iov(iovcnt); =20 @@ -1615,10 +1653,7 @@ igb_receive_internal(IGBCore *core, const struct iov= ec *iov, int iovcnt, =20 ehdr =3D PKT_GET_ETH_HDR(filter_buf); net_rx_pkt_set_packet_type(core->rx_pkt, get_eth_packet_type(ehdr)); - - net_rx_pkt_attach_iovec_ex(core->rx_pkt, iov, iovcnt, iov_ofs, - e1000x_vlan_enabled(core->mac), - core->mac[VET] & 0xffff); + net_rx_pkt_set_protocols(core->rx_pkt, filter_buf, size); =20 queues =3D igb_receive_assign(core, ehdr, &rss_info, external_tx); if (!queues) { @@ -1626,8 +1661,8 @@ igb_receive_internal(IGBCore *core, const struct iove= c *iov, int iovcnt, return orig_size; } =20 - total_size =3D net_rx_pkt_get_total_len(core->rx_pkt) + - e1000x_fcs_len(core->mac); + retval =3D orig_size; + total_size =3D size + e1000x_fcs_len(core->mac); =20 for (i =3D 0; i < IGB_NUM_QUEUES; i++) { if (!(queues & BIT(i))) { @@ -1635,43 +1670,38 @@ igb_receive_internal(IGBCore *core, const struct io= vec *iov, int iovcnt, } =20 igb_rx_ring_init(core, &rxr, i); + strip_vlan =3D igb_rx_strip_vlan(core, rxr.i, + get_eth_packet_type(ehdr)); + net_rx_pkt_attach_iovec_ex(core->rx_pkt, iov, iovcnt, iov_ofs, + strip_vlan, core->mac[VET] & 0xffff); + igb_rx_fix_l4_csum(core, core->rx_pkt); + if (!igb_has_rxbufs(core, rxr.i, total_size)) { icr_bits |=3D E1000_ICS_RXO; + continue; } - } - - if (!icr_bits) { - retval =3D orig_size; - igb_rx_fix_l4_csum(core, core->rx_pkt); - - for (i =3D 0; i < IGB_NUM_QUEUES; i++) { - if (!(queues & BIT(i))) { - continue; - } =20 - igb_rx_ring_init(core, &rxr, i); - if (igb_is_oversized(core, rxr.i, size)) { - oversized |=3D BIT(i); - continue; - } + if (igb_is_oversized(core, rxr.i, total_size)) { + oversized |=3D BIT(i); + continue; + } =20 - if (!(core->mac[RXDCTL0 + (i * 16)] & E1000_RXDCTL_QUEUE_ENABL= E)) { - continue; - } + if (!(core->mac[RXDCTL0 + (i * 16)] & E1000_RXDCTL_QUEUE_ENABLE)) { + continue; + } =20 - trace_e1000e_rx_rss_dispatched_to_queue(rxr.i->idx); - igb_write_packet_to_guest(core, core->rx_pkt, &rxr, &rss_info); + trace_e1000e_rx_rss_dispatched_to_queue(rxr.i->idx); + igb_write_packet_to_guest(core, core->rx_pkt, &rxr, &rss_info); =20 - /* Check if receive descriptor minimum threshold hit */ - if (igb_rx_descr_threshold_hit(core, rxr.i)) { - icr_bits |=3D E1000_ICS_RXDMT0; - } + /* Check if receive descriptor minimum threshold hit */ + if (igb_rx_descr_threshold_hit(core, rxr.i)) { + icr_bits |=3D E1000_ICS_RXDMT0; + } =20 - core->mac[EICR] |=3D igb_rx_wb_eic(core, rxr.i->idx); + core->mac[EICR] |=3D igb_rx_wb_eic(core, rxr.i->idx); =20 - /* same as RXDW (rx descriptor written back)*/ - icr_bits |=3D E1000_ICR_RXDW; - } + /* same as RXDW (rx descriptor written back)*/ + icr_bits |=3D E1000_ICR_RXDW; } =20 /* 8.19.37 increment ROC only if packet is oversized for all queues */ --=20 2.34.1