From patchwork Thu May 12 17:06:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111076 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C66EDA00C3; Thu, 12 May 2022 19:07:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E30B04283E; Thu, 12 May 2022 19:07:10 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id 07AE542831 for ; Thu, 12 May 2022 19:07:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aSzA6aHxJ/HHOhLHjVGgCfb+r9UhUYutnTJVllj0HceaTiHFRNyIcKdfDnG3RrpMkUog2oxHiUGGkPdIb5bYCn8CG3MBIG9RxOaixlxDQMTz6tJa+24EACGWdnIsGPCQrRX2jb83iFUYO7NJRn2O10DsmqWx5QybxrzH4SMx+E6oJ5VmeN3oB5er0wBSE1V+c0fyhDqLxJhl7Xe8cJ+5RvoRCN8wMWnNQF+X5bak9LvPVsh/Pxbxm82pvvK9vrFxE0mBpC9goW3pifTTPHQeF5d29pzlyWGfVPM+afLnL+y5nAOQ+bLfxuy9NngeJ88KwISSV0Qp7CEna89B29MpVA== 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=UWMSCO+z1vp8h7il4BLIAdIhEMk5oScAvqiln5qQfH0=; b=f5C/72dKvrg1XjaqPOcR5x0Z4QPDpk6HNAurDT4oku7KH3VblEJfOatOZW+F2XQxRsc4fmHDMeOuTIQoKOTcKXMtoIQEanWRKE7T/mGxrv/hKn5bIWlx5tI93J/Dydc8uRoMOYVBqWCacp2Tch33cFT46SUipLVvXx6Jm/HYWL3VdRYJ1UdrACiqn748ZPzcgnhTJjytMHZAqzJ92/M33psYL2xG1gVKu5mSgvWupvpEagGlAKp1/ZcCe/3ZorYWX7YvSWGFVXWd/kNoe+ygyXFla3O28yBbPnLzbv2wvsgpHAYiTn9eK0F12dvKmlrVzkmEqJgLh7dQqUz/SEQiQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UWMSCO+z1vp8h7il4BLIAdIhEMk5oScAvqiln5qQfH0=; b=uhVstqcH1i3Zp+5Ok0erb7pKdBJO7s56qBWW32YR7lNqJa8dPyy7eHNOth0vnw6U8odWRAjKoX92NTRkprf4/n+CKDlKlqyO0+tegLd6lmWBw/x1RDm5rHo3MYDf/3TCUOurg2NhmEtMQhw/3dZHV0hTqASkn5nNtofKLHv2A/w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May 2022 17:07:02 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:02 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 1/8] net/vmxnet3: add V5 support Date: Thu, 12 May 2022 13:06:35 -0400 Message-Id: <20220512170642.28930-2-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6787c40b-cea2-4594-acf9-08da3439d4de X-MS-TrafficTypeDiagnostic: BL0PR05MB4721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HxVjKUu3OfFV0nMRQ0ZdF2QQY8DS7a28DGYIbfB/UKMMlOcMiMOAusBlZBZ7TCxkxumeEi3GudFeaniAuo+G0W36cEAy2REXpfY/ykKn9RBlE86/au3JlqhFlipL8dKl4ZRExf9aLGhdzjCuu2fMAEhpqzQ5/M95dOnHlNTGGe5bdwZ2VHLuyzlL82iZzuQu0BTRrGOBLToCBjJA0WjleCph4YleddNZLKGrEE0dQ0EJRRX2L+7urPcMkbAoJvL8ZI/dL8RhrE8JRRoFznAMm0gnovh3IPdAOt44Y0XDTZRihsWkwxUVcXd4+HD4qVhBzXyTnW2d+sSygToX2jXQfbT7AXj1jRphfo+ee4+oqfxum4IMsxnK91JOIQ5K12tWUf8f1HL0p25o9OOFr9/dT5P6+clM3WTbEDgaK6HasBZQULzmFWX/QCxJIetehwoeTPkq7j8rfg5GBqCo7YCW/8TpUVPPcqOovCDo6GX8p5KgeHyTgFDwHg95e/dezKzYAGiirsFZf19Jtxr4gscx77G+VfymtjNRrp2jCLKRLgJREr86zu3KTu3Qr+qTVvDPMLaYng+Lf/4vQKM4Z+5EqHjX8ry1avl3Q3KDNDCE1sTxCbJ210s6+C1GLfL5r6IM2wtg5YcG0ug06j5Fb2jH2v0Zl+S3ZdDDQmzH7JHeXGqTGr0Ct4QuASW4W34l6/iWo6/3qSlXwrtE0LLHwv26qA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(36756003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ncQ0L55MocywcS76uIPFQ/2Hh+7p/Q7NwAHpiHP53siLEW9fNiublTw7NG09B1cP9ABVhF4uM2il9wBD6JbuMXzYUpZdamT2yBChIk96DRgDXguupmYArYg4IYhFnri10ndIcArkHIkvRVU00y2PwRlkPw2hEs0m5FVB/ACiQr+6Gt6naiOXkCQhBgvVD1PP2L05aoWoM+6KiZrns11QaTA8/aQhmwJn3m/MLsLH30NDGnXRbxurxac66tK6wi9ct385k3BM8+EHDYfRreIJdFb5CQKBA1uE/y49VG1rqw841WPPNIdM4vOLOJpmKMm4QomzgPoQxv/yx9FvWQixq7w3RnESF7sPZiD2njZd3/leCcPKPlFkSe+Vq/htIhWhA53iQR2aFiIVHsO0bpa/Cc5Q2dK4DQEq093/jgky9j9Q6HfknJCsUryOCbVar5VQptCq9v7/T3vOjKZGXH9c+qptP8sFynpnel1AW14YO9CHtB3cLEgSgvZC08BII7xnrZbVAgH7k29uByHxFBwK2wdXQiMkfve81EX3aIHnhp6S04SAF2bqTBghNidLPz51vydbEpJ8bvY+FSEizWFL7mYjdjNdTPTAfElC3cDeSD9oZroRkq+k54kB6jl0tCbSq20RINPwzaJVyfSG1zh4TGLxUZSvOiJXLldJSXdYw2Otf3q4HGQNaHx3au/G5rQsfQ8D0nm7970tnJGlURuYiM+mTN7wcxTaCShVXma+lWNLVDib6OOfYbd6LXmQ4HfNGoyg+VRFcG00HyHv8vcIFev+Qo0GFXDxmHPvjYpUyMyipxEJDgoWOrqAf2QsRenZybdXurSZrU1np6Si3BaOwVJUfaY62dvlzOkfTlJZrKR46kyWyISesCla4tdDfHTG3Jo2IM+Mlti6lUq/zfp44+nhD+BOPXDt8rB74pgXwp960K066ftJ58U300ciqWQYNn00qiY5nDsMO3VPm54eCeNd6G/9NjpcvB+ISH21wm7jWOYufoajmn4dayahq7d5oFYjfpjcm9kxZgSsfFtJADTM0mLvWeXZjWFQahFwVfee5m4YDEQy24Qi+X3RAKQBwMW48tWoIIZnDE+M/8d8A6IRYHdZA1z3pbyVnv32GQHLIAKmV29/d34fTm3pfFYMA79fDTClLf1ZvYvCrAuy1T5CwIjEcCwfCSS+Ajr8P7lBminOdcRRbYRIGPWLfn4Moz50vQF+KFIk2Ka1pqzULPi6UnQj2EnLV24b/lc5DGiBIAAMFKcww8ZcWl61C/rQ6nbOJqjfQ6O2jZAIzJLFwiUyVFq02t+1rSkeW0Ic9xCmFzdXShx46m/+0g8bx3Mm+OK1EF8yHfPjT5Sn4p38hnCxXIrRZIci0KTEdAWtdzF9B2pjrXlOGdnbXPan53dM8o6PPn7iZ4Dk14DrB3OC2y3aRW8RL+6xKYcb72fq++9pmPbd9GOLn9N8WX7V81czPXjb72SPidZRIjQNuozCcHnhtKwyXSX4PCQhwvMMslhoT7IrN4VUkyMPz5hGHqNseFHOp4gm/gIRGopaQFX15aKa9kaaHCbTm9anw8gHX7Lu8qzHZ6bnrTMdqdXB3ZcAYsSTffM1i8lJfO4fGkHX+Gtms4fKU33W+G0WAH5neyCNrUke5peG3QP1ZLQiyDVPYq/WLhAfuHPBwAH5Q71aHGATsAzYqXHzM0BDHyiMUhcqIRWI5bgUQEoEL5FY88jZHR4ovg/WyTgQz/nrvLFjqA== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6787c40b-cea2-4594-acf9-08da3439d4de X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:01.8927 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3t9YCMgZiORINjhkmvlM5Nq9zpw5FXJP7YHlz10AOoTDyHmRPPeSfg/pEyGmbUonntW3uNxxQdXNv+TzAZzM3w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4721 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add VMXNET3 v5 support Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 +++++-- drivers/net/vmxnet3/vmxnet3_ethdev.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index d1ef1cad08..a7e1e5fef5 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -316,9 +316,12 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) /* Check h/w version compatibility with driver. */ ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS); - PMD_INIT_LOG(DEBUG, "Hardware version : %d", ver); - if (ver & (1 << VMXNET3_REV_4)) { + if (ver & (1 << VMXNET3_REV_5)) { + VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS, + 1 << VMXNET3_REV_5); + hw->version = VMXNET3_REV_5 + 1; + } else if (ver & (1 << VMXNET3_REV_4)) { VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS, 1 << VMXNET3_REV_4); hw->version = VMXNET3_REV_4 + 1; diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h index ef858ac951..7ec3b2e1f0 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.h +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h @@ -124,11 +124,13 @@ struct vmxnet3_hw { UPT1_RxStats snapshot_rx_stats[VMXNET3_MAX_RX_QUEUES]; }; +#define VMXNET3_REV_5 4 /* Vmxnet3 Rev. 5 */ #define VMXNET3_REV_4 3 /* Vmxnet3 Rev. 4 */ #define VMXNET3_REV_3 2 /* Vmxnet3 Rev. 3 */ #define VMXNET3_REV_2 1 /* Vmxnet3 Rev. 2 */ #define VMXNET3_REV_1 0 /* Vmxnet3 Rev. 1 */ +#define VMXNET3_VERSION_GE_5(hw) ((hw)->version >= VMXNET3_REV_5 + 1) #define VMXNET3_VERSION_GE_4(hw) ((hw)->version >= VMXNET3_REV_4 + 1) #define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1) #define VMXNET3_VERSION_GE_2(hw) ((hw)->version >= VMXNET3_REV_2 + 1) From patchwork Thu May 12 17:06:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111074 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 57AB2A00C3; Thu, 12 May 2022 19:07:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 258A242833; Thu, 12 May 2022 19:07:09 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id 27A43410EF for ; Thu, 12 May 2022 19:07:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aPVKl96rxYF0dpdNPMjuHXeQIlWZb9sKXi0tgcYuPLjmlhJA/U9VR1XtkVXcaAK80m4eWuFWMUBUg851lw+XB9YTtsUzLzCu7lZA5L1/UH+tHR6y+IFNBPPYlydI50fIk1EERBNlEiHruR/3/ABUei7A0/8DPBD1UgT60VfLG6l+Kn8rmjbsDh/+uPfwWMBA1QuHeeoaZjtiSniAxUFj5oAU6N9gDWfET5J8Fpg9fXumAUrJV7MRwr1/Y7DcNw6NSJ3Ih1D5B4pEIYvYhRDEuv4vmHlY7M4M1CsljVd9UUyUhnpJb3yC9JPkH8/Zcobzg8X7fVJJdEHcaAKZGl9Btw== 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=fKbgVDq0s40AbASTneCpQkrLXqKWjdP0B/eEomJWKH4=; b=S4z00SUzStfSS/+OVW+7C9yEs82uRqIs/5axr7j4m5sAfzVcXx2P8vOKVfqWyOOLg9dSLwal4JQSJR0t5oWlUVOP7wCWO3j4GQLC/CyuBs9zj3bP+y/Dqwlgk2b/uSnONN13+xyBxFm0vQafeAtco41g51gpmIbXEr7+GtFRDtpKDz1PtQ/sFprs0eb5/Yvbwa+ePvSflyOnBQdXsJ1Eqenb5pppuDHIKbcY1iXkiYJkoegA2Sg4Bb+ASoCjOjiwU6egtBrQMyU+VL1sTFo73jWVHS6Ah4mzQV40xH6ppmpfk3HowA7Rq0QdsHdDxbTMoslDiqCOqzlnT7mF8TWuGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fKbgVDq0s40AbASTneCpQkrLXqKWjdP0B/eEomJWKH4=; b=ncy8VAyLK8sy4Eh1B1t/IVDFD5Ujj5hN+2Wo2ktbJx4rB0Jat+lPkGT59wQvXw4BJC/pIoz6yzpSGZXtrJtliG6UJ3gc0uZ2CDDKQvociYan7bi2TxQrb/EtuVNFnUNXUozFw1xchv9qbm2NZC8RY3CBP6GLwT6ZwDkVXT0Qp+A= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May 2022 17:07:02 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:02 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 2/8] net/vmxnet3: implement RETA query and RETA update Date: Thu, 12 May 2022 13:06:36 -0400 Message-Id: <20220512170642.28930-3-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e55014d-5434-4d0c-8018-08da3439d534 X-MS-TrafficTypeDiagnostic: BL0PR05MB4721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3nOpBg761eAUWvfoq3IitiA+sTzy5x41YHukIfwhpHddjgvF6y0BOKgjTZcla2B3RlBN3VhR700tHrSWJK0chl2QFoTMisxvB+WhE7Jam1O9NPVzF4KihQGLgN+xdwHqXjgMNdtzuV+gzua/LeCl4QI63aBpE5g249NdHvtV5zTkn+snjihR/6voiY8avaYXjjgnY3T3/7n7hLt/E29O84kOoR1tPl/fWiV44OwC1FdbTCp+HgUNIjUFs9977x3CiLXafR55/GLr2A3skqsEZvw2eko6R1gigzAltGnZqdqBN8LmL0vYJ7oeSy3zcUzK+i6ln8mwUYdseAWqb9bMmQ4lSmfhRYa0TA3nfSm6BusqcSwYTndjR+PE3qUBil5giBNMsK1ILszNg41K6wDJ/Ey3Fa1lgZu56NZ05uxg1+VIdoB+Mq87OC97tgEXvHe1mx2yCGhu2C4fL+21AK7cdY226uRVDLaUfhgQ0daxv7SSCZrCNZtlk858cEIX+KcoNxz6WHe2cGwz7unZPRVDEXw2HX5ocFzUDCX8Jh/Q1am7aRLgJAx7hg/PfGCwaDWhaSA9kXyqNHu2cDIe17ZETmFEZnNjPEOq/syKSHGlA9XuOKO75q5AC2Y6BiS4g0U4EovM2bIwtTTMyHWW0swONg0JCgZlV+gChmHuRwoS/wTVFhzwwHAFOuhPu4WqyVLqlC4o4bGmwcYmnfGDsfzzZw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(15650500001)(36756003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0GDGjZckdLoFHCEb66L2sscQOq/umkqZOoecvh4Q4OZi8bNIjHdAwDZuw4K/FVHrqbF8Tw3hMJAhZle4hnS6yFv9mGf0+7ujO5JPNF7mSqTga9yAVw6TG1G5uxOaILJPNHSlUFFzlwh7kNSMHT/zZH7yU1VLQRzV8R1pGVtj07X+D/yIjgt+GW7arTmbYDX92KmTNFycHf5A0ptXkDmMxvOADrCyCP2LUcOe0BeLW/wM93iJcAvXLkIi9pMs3HROcevnrUzCsegjYSO7lJXlGpPV4BoTS8kp60Nbnks2Yq3+xl3x1FfTiCMh0DnIlZqEKZ54LYNdmL8KcJD5Ch7RKZIHyG2gqH6loBu0fcXcTtWwjAiTyI7D1DGAw6+LWl9kKANpAkKQDcqtkE7jzenhO3jXWUEB1AXysAlBHH7po8m0hH/iHapaB8WZed7le2Xc+T2Qyi55x149mp89XgoMgNENyoRkYvohgCzxSlAfzNfcF0F7i/33TShcDbhsdavLw1t7I6h1lty3/1TK1WDvIdG9TnRC2YudrojnYQlbKdgVHJd+wjj5LmkPn/2FuFNfy/1wBrA/qf9Ps5OOKW2tTiWUbR1oK2rfFhOLUi9P3wVxubeWC2pXMJfppLRmczZW0SIBaNJZc04TawZm+Y4TLWArq/FXLeetYHlB165i2aJQv1vfqtXIiVSeypOGruuGciGHo+HAlwwdIAVgnytkeXtqTZwKbp6pWKvBf++gv+TIz/8G10bP0WzRXCJCXIDnUma92Ke/Vy1KfgqVXEIJmExB4hxj7Ge3SfNwCqGrNFSGpx6pCZInETiinAhJPeKGClckc+V4025otltlXeplriatqHL4F9fKyoJHA5tFZmFoZm+GRzpWoLtPGqLCDebSj9wKBm5UiUCEpVlEhNPF4P2gQlwkJhizC1QcO9iZPgWKROl9iWI9y/85HcmhPtaNvMXU7u6T3grNblcKbiOc6zxgPt8haQQiUVxOJ7fMWOnT+JuSEECDOhRzaYMsBk4Spg6zz8jqppBn8cIfoVBfQtfd7zbc0LCmwB3IjVIOhsUHwzB5L6m6JKexgNhnq23wnB0GZkNbpUuCRbmS5Yc2LgtanebAN2bV1knlzoCfQDPH8q9TN8MAyzzkuyCemBLJZDydZLvBY1tHwN9eRXD/l2VZv9bmbRKQwVmy+y2U40l0pWcLgOpLzlMKPlkEJulQRC+H1Tv0tJ/i+4JnUGSLTVwhSCllGtuoE7D07sSTj34uV+ZaEfwoIc2rpdfklFAdBXzDqL2Rc4+jZUNhdiHeO0rK/5dvTEqQ+ZiwjtPoa8RMYMbeuC3MIRtaIFmM70t4AjvoRwuHZQnsO2yHlTUpGNGYaYYFsFujykt9tanER1dHxVVgY4+5IlZj+8ari4Hg7eT7SGcUCmuHXjcF7hQQ/59FR//f9FSmrZIVHHq7BegkLz8h832vFSxf1K6StsszqMf0c8VU2QGW9KXwYiYnRoIqMgWhcnN5A66XI3vNqWlQohsx+LyqPSTPoMh/DIMP4Z3mb30LoUpd1ZqNaaH86I8BFUwXJRM+v/4MqgANjSQPZ6ZmPqAOQ+1N0ygBHmRnp5+A3UzNp01/Jrgw6lvWOONMiRlAZrLKW4XX7of6958OL6wCndejRAMkGjhgR7+nMnxdyy9Zo9+tDmQjOpRHMa+AdJ2I3/fr8tGt9p6Cz3WYJ5JLbxHrfWjDH/dtopY7zSfLDsVsK7k18DKeoALtbg== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e55014d-5434-4d0c-8018-08da3439d534 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:02.2520 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FYqj/O6AEZqnChq9EVFfSjjZBw9XOYv40UlyYOG5/6vEWkCK614t2fz9AUCw8gmmvB2NUtGuJEdps0OvXbLmOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4721 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add RETA query and RETA update support for VMXNET3 Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 67 ++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index a7e1e5fef5..d5f9903946 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -95,6 +95,14 @@ static int vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr); static void vmxnet3_process_events(struct rte_eth_dev *dev); static void vmxnet3_interrupt_handler(void *param); +static int +vmxnet3_rss_reta_update(struct rte_eth_dev *dev, + struct rte_eth_rss_reta_entry64 *reta_conf, + uint16_t reta_size); +static int +vmxnet3_rss_reta_query(struct rte_eth_dev *dev, + struct rte_eth_rss_reta_entry64 *reta_conf, + uint16_t reta_size); static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id); static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, @@ -137,6 +145,8 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = { .tx_queue_release = vmxnet3_dev_tx_queue_release, .rx_queue_intr_enable = vmxnet3_dev_rx_queue_intr_enable, .rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable, + .reta_update = vmxnet3_rss_reta_update, + .reta_query = vmxnet3_rss_reta_query, }; struct vmxnet3_xstats_name_off { @@ -1696,3 +1706,60 @@ RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); RTE_PMD_REGISTER_KMOD_DEP(net_vmxnet3, "* igb_uio | uio_pci_generic | vfio-pci"); RTE_LOG_REGISTER_SUFFIX(vmxnet3_logtype_init, init, NOTICE); RTE_LOG_REGISTER_SUFFIX(vmxnet3_logtype_driver, driver, NOTICE); + +static int +vmxnet3_rss_reta_update(struct rte_eth_dev *dev, + struct rte_eth_rss_reta_entry64 *reta_conf, + uint16_t reta_size) +{ + int i, idx, shift; + struct vmxnet3_hw *hw = dev->data->dev_private; + struct VMXNET3_RSSConf *dev_rss_conf = hw->rss_conf; + + if (reta_size != dev_rss_conf->indTableSize) { + PMD_DRV_LOG(ERR, + "The size of hash lookup table configured (%d) doesn't match " + "the supported number (%d)", + reta_size, dev_rss_conf->indTableSize); + return -EINVAL; + } + + for (i = 0; i < reta_size; i++) { + idx = i / RTE_ETH_RETA_GROUP_SIZE; + shift = i % RTE_ETH_RETA_GROUP_SIZE; + if (reta_conf[idx].mask & RTE_BIT64(shift)) + dev_rss_conf->indTable[i] = (uint8_t)reta_conf[idx].reta[shift]; + } + + VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, + VMXNET3_CMD_UPDATE_RSSIDT); + + return 0; +} + +static int +vmxnet3_rss_reta_query(struct rte_eth_dev *dev, + struct rte_eth_rss_reta_entry64 *reta_conf, + uint16_t reta_size) +{ + int i, idx, shift; + struct vmxnet3_hw *hw = dev->data->dev_private; + struct VMXNET3_RSSConf *dev_rss_conf = hw->rss_conf; + + if (reta_size != dev_rss_conf->indTableSize) { + PMD_DRV_LOG(ERR, + "Size of requested hash lookup table (%d) doesn't " + "match the configured size (%d)", + reta_size, dev_rss_conf->indTableSize); + return -EINVAL; + } + + for (i = 0; i < reta_size; i++) { + idx = i / RTE_ETH_RETA_GROUP_SIZE; + shift = i % RTE_ETH_RETA_GROUP_SIZE; + if (reta_conf[idx].mask & RTE_BIT64(shift)) + reta_conf[idx].reta[shift] = dev_rss_conf->indTable[i]; + } + + return 0; +} From patchwork Thu May 12 17:06:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111075 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4CD0AA00C3; Thu, 12 May 2022 19:07:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0417D42838; Thu, 12 May 2022 19:07:10 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id 92692410EF for ; Thu, 12 May 2022 19:07:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Spr27XsLmO2pYKmJovZXqi93ltlvaCU+MpICMYOiyroLl0MET6GRSdLu6kVvj6TDT5fKZXB5Is9SmQaLf/q/pEHYroECODHxmMkEfiypDkiIc2y8sGlpuReDGg4lk7d2hC4hbBvfnOzV2MNAEdXYySm/LVeeNOV5t43TtvUio/FTT16eh7QZKvxR7szdOCaa8T6XMRfWthma3gh2ZvoVxuS3tFU6gmtx2hefc0eg5AB1VL3H3B/ANVfBciZ84oamxbX+owDcxxQoWVh204d+r/9o10ulpYsY0/tmtbpZ5PL+EGNBoLkbzlfr9x9vOc1t/1LNyJcKmwE9RUBbExH5MA== 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=OFo7RvKtzMSOcTBxiISBJdTJLOGit9IHqwL0q73F69c=; b=I0xcTG+2u8ZOWPzZhCOXr6MUGIwhSrZc3Js452ucFfMbzD7R9oCYUQAxyiY7Yg69qtdvXYA19sQTNkfQj4B2BN7dZF1/iBEt1LDsi64gCUqxThIBmbfrCzAi6h8A/XT2JItewPSef77Xbc9xxBRQfgRUgqa8/OHXIKcGC02odhAgTl3NGzQJmTDQo3KhBDdSkTlsvkocFVYAfzg0euUIhFSbY5wPXQ8OYk6aYDxoT6HxG07DR111kfTHTYiRW5A6dqg/7WrJ+Mn7NUUMimbpEjaUL122tYJAjybZYSwWSB+ZKyMv9rlgroWd1JQVCovtOUGLXembfBeMNavhrTgmxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OFo7RvKtzMSOcTBxiISBJdTJLOGit9IHqwL0q73F69c=; b=HAI8w8+zNEEHTwSSY8w/zk+/iZGPbk4CQve5pvZo8HP3F8uZbFOmwX51GHwRa0V9P3tRjw8/lcOIeBDUYQbpk8lsOd3fbXPIX4IIca/Gvxwl+8ySbmjWYivh3WquUZUunoUjKxxtHN2LvuGE/XhawLC6T/kaPutB43HRF+TWOh4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May 2022 17:07:03 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:03 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 3/8] net/vmxnet3: add Rx queue usage count utility Date: Thu, 12 May 2022 13:06:37 -0400 Message-Id: <20220512170642.28930-4-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da151524-44f3-47e5-9099-08da3439d566 X-MS-TrafficTypeDiagnostic: BL0PR05MB4721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qtJRrDHDC197unwM8kwuw8z+sns3pAoCjji85Uclpj4ytWFTUIz7mnDSNnq/FU6pb+WojjXXoRn3mV2p3cHF6KlNQwaeEzEYzYpuTcqdYEeKM4xqFClriPTMsAkEztzceEq3DmIrYje3bWmSeK69JlrKz9eRJt2U9/uOJ3dBxaPyqm9/SuTQdfeD4yZhmsok/vwMXclyXNooR7I3rgFJf4PeldgzFMzmBqRftDjn7XBdgw99znuYCRsZDs5S0GiKWOY6+Dr0LspwSceFruA9IJ9ys9Qt9cczDS93P7RF7yXP3Qk7vloaJ+WuWH2KGLzryiPh+B8uSKFkocno1ZOkRYhyMfAKB/3LOyZXArVJuhXxqSjVUDRlovbxd46KFGh48WoL9cej23YvMCt98J5z3haSVa46TgKblssJnb101H6BmYT3bZVL3DuvT9EeHfrgCGbUo4/uyaiMLsZIRW1So4fyy7S7pEZRkbp+56WyJ9T2W/wHmVQ70cxZhEAJaEbU3cDY7ZJjSDJNfxMQDEK7SohZfnCKq1hP7ajmmhYo4DAnla3iNHR4aEOZ3i4NEiPzDuvv5VaZD+BVTmKknBCp+o/+TPacmnAhFj24six0LtRX5F7PX1cD5lQqei8WEjRQvN8CzlPas2NNVlAlnX8AuQCb/O2UkfaCwsIUwYV91QVTkqrcZPIyZFO5RUl4kk2kJuVwt+CoGzEnrbmjuUp0hg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(19627235002)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(36756003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tYXGOPJ6er7QU61E/b3/QaR1cz5mDFSd17xAld/Qpqm4S1WWQMexR295rJtHxBGChoKR2duJ5SnCzCB10S2fuljPtvHJXSzeICPvW2lou9BL0DsFFbdESXBei93BzA1JhKNjr+mEs0fJmUqMeGn71Bt9A/HxAR03xiboK8r6yza9wIn7yXGwVTgpv2sEzYXFjkS2Ocnmy4ecWVdoHw7IEL6Pm1zSVyhggoaG6wDM7aTTVNQZ/D+3P4TKB6ApEZW3ilw4qccYz3yIRflAQXblRCGOD5xHgcu2wPKNkj6U6pC6P91+A3N/53lh1sRBUDKzuXPSO9f8ogVbzAvmTjECgVwih/kOM4OAFUTQJOVbNNuv+BP+Rjl4p1RIuBCV8VsKQQk1BD98fUocrVAnqGWgweDLzTgkNHNxPfmXnVSzQF0bEO1QgBl0/lobGjNPCAnMwyGiLJ/kPz6zKnKg0ZLJdqr6vRBDCHKmvMAdi4qA5Ax87Z2eLDNxHlZgbRjruUVcZOQQOjN8uAmDrgDk4jioa3OcGOXt826s1vFPLxM5i9ZPzdxtPfqxdUKF6l4V3Uixj8tckoLLDGgaoaQOtBSgBWCZakLPmccBdAEgvQJnb3ZLoY6UkeCabd4rnd360yV+M1yB468p11zkMq7RUT39TmWl9ds2h4o68x5+4mvan3MNJbDO0onEYODMD4C0VPGHfVgnuDPwvZI+U9spyK1/bC1ijig5oEip7qrYfjFM7fPyOWhhVC8vrEkPPHKTixKGrMJLCVSnu0wk8UVGZA62RWYu83snGUS5+7sVnwPaePUNVXSR8xjSwq8L1GD1vP3dnYzNfySqE84rT4UGUCI4tIgFp6erHgLvf/UcPmv6A83E7QVm6aa/M4ydTrPlXbBB9uAwA+6s9kgb77P6SixOPDO6drAdK1lRoSII/QKtoaUzE/bHWttKdSWjQE5mVpC2zO2W26T5bTNTObhism2IUdx9U1K4oBAwAJ+bJXtlu4Eimf+w5aS2Swvmb9F+HVMUYlEc6WsSYMhI5aLi/uQo8VxabJpTZshFrsR8WkyQzUbWG/1ZsLwWUl4HeczF7E4VfSUxT3XjWsdVrGw288YhURB8mKz0T9V/uOUiIKp4czTleUfXCQxdHTqGYPEC23zpwDADz/iraPgl+aJ11+0vMgfCds7hksNLoXZlAkjP79f0WkRMB1r9EGtwSdGFYwF6MBZluPPVbpVoEFtkUqF1CZ0/Dmt24xaqIrgdtRbsrS8YoJyOW5/yuYnDdv1+eyHzVwhJfLES4KmzPiG+8IF3hYNCFo9IShwdhZ8k0CL91ybC70TwgPe9+oGLg/44JVK90XkMSCOL5mAmhCLP9gNPbt6VQ0yqXKE42ocOHz1p9Abgy3z+0XETnXEUoPW9n0EUnfUwEySpBAQqtLJjByM+41Pt778iR077EGR8zHphHj2zvH0Reg4gOflsU4ujAh5mp5eNtxfaP0HfVsJ0HgRP9XrXTKNbueA6vxyzv/e61xkRlHLGN1WQ0494zEGR7vE+5xdzYnLJ4xd3E57dM+s/FDFmTEZf7tzA1ZJusf95L/6TXuD4Waq/jZysDohugTPmnCDhE0+UTXrCzyb+S0kYY5s2JIvwDO66yFzqQlf4F9sQlFbeaOoJuRmkdaHL1gBRgXJsMES/pGi24B8X++w//2Kd+Wosb8IlKd42f4F2Fw4Txq5BtFDKJOs+/HuHcP8XZEp4+QcjJtJRnlEO4NAsnQ== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: da151524-44f3-47e5-9099-08da3439d566 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:02.7207 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QMHP5LfCHhoRrNw3ifts6o1ApFrAqAtcrNu6zZMpi1INesuYafCxDmMqj0bauPvoGGYbDF+YI+ONQVDDD0TSFw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4721 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Count the number of entries in the Rx queue for debugging. Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2 Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 1 + drivers/net/vmxnet3/vmxnet3_ethdev.h | 3 +++ drivers/net/vmxnet3/vmxnet3_rxtx.c | 30 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index d5f9903946..cd32c1b4ee 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -294,6 +294,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) eth_dev->rx_pkt_burst = &vmxnet3_recv_pkts; eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts; eth_dev->tx_pkt_prepare = vmxnet3_prep_pkts; + eth_dev->rx_queue_count = vmxnet3_dev_rx_queue_count; pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); /* extra mbuf field is required to guess MSS */ diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h index 7ec3b2e1f0..ceaeb66392 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.h +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h @@ -193,6 +193,9 @@ int vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint16_t nb_rx_desc, unsigned int socket_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mb_pool); + +uint32_t vmxnet3_dev_rx_queue_count(void *rx_queue); + int vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc, unsigned int socket_id, const struct rte_eth_txconf *tx_conf); diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index d745064bc4..e15b377d8c 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -1019,6 +1019,36 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) return nb_rx; } +uint32_t +vmxnet3_dev_rx_queue_count(void *rx_queue) +{ + const vmxnet3_rx_queue_t *rxq; + const Vmxnet3_RxCompDesc *rcd; + uint32_t idx, nb_rxd = 0; + uint8_t gen; + + rxq = rx_queue; + if (unlikely(rxq->stopped)) { + PMD_RX_LOG(DEBUG, "Rx queue is stopped."); + return 0; + } + + gen = rxq->comp_ring.gen; + idx = rxq->comp_ring.next2proc; + rcd = &rxq->comp_ring.base[idx].rcd; + while (rcd->gen == gen) { + if (rcd->eop) + ++nb_rxd; + if (++idx == rxq->comp_ring.size) { + idx = 0; + gen ^= 1; + } + rcd = &rxq->comp_ring.base[idx].rcd; + } + + return nb_rxd; +} + int vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, From patchwork Thu May 12 17:06:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111077 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7D822A00C3; Thu, 12 May 2022 19:07:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5A8A42841; Thu, 12 May 2022 19:07:11 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id 7688342831 for ; Thu, 12 May 2022 19:07:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XnXoTLTcE1W2hw9DHBplkABmb6OistrMoOlWU3ky1fMImyhd5lZxdBtKPlIzc/NBg8v1szyr/hR/SexC4EHdoUafmgVYs7VlL7XlAJsYsBb0EGvU7bh1qlLxg415Pg1yfw/c53Q9xyWkEN0SbcvXQQhn3Vk384uDm09syEHOjsJdmduANUDHUC+hVCyAqssi/Zj56MMwO/5lS2jL0bmKgD76TXHWyoDy0Z63tq0r0QzOVWFL9dzZ6s7pBpRyr0gUdXB83zhyvBIAvAOEHBZjAI8dD8UbrHRoCarBkmjYGp+4Pq8uWdRU62WZjngl+L1PZcczW+M8LXAX5oTA1NbDrw== 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=pWfLjTyqvPyLcKeNvdyDR7w6tiuAfXiJvBwJkV2iHnc=; b=oX6ECqg6JrDFs/BJuA+zkLopILmsUiEhnACtFu78HXVL74LYFIS1/w3dOvs98ocOxohbQrQPXaRqCweYYmp0ihmyziEK/dxbN2hK9rj/ZRrbncM8MTRzPLwvd3u7jJRhkS5zLfXyfOmlM8/WgUn1Ylme9wsbDL1Zhp6lWBop7BEmgpbPos49xPUw0QBJ0lYnNLVHWyaq7K0aSQUBiux9eIDoEPgp6hvScLfhyvxaT6qmRY5KLvJgpuq+S8WaG01WZr8yx6gQTyh0maCh58cAzRlj1TpuTPv/MxzI9i/KjnpINHS1kv3O4VqKtAdMtR3lsI/iDxEn5mMmHL2N5hN2Mw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pWfLjTyqvPyLcKeNvdyDR7w6tiuAfXiJvBwJkV2iHnc=; b=f6JIOYYVC+bR/6OnQr0wMUqoCPMGJ3W+uowZHYUnSLLDBiAkXR8JR4aG4ysU0dz/P6WWoCJT9ng0UGfhXXG7VP7i0zQ2LuEGZsfgozj1TbInOo5zEj6HlZKiBalg+9p4u5EYXeL6ldHZBVK+UkxDwLFR3jU58o+ZJmxdVBKgyPw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May 2022 17:07:04 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:04 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 4/8] net/vmxnet3: report HW version on FW version get Date: Thu, 12 May 2022 13:06:38 -0400 Message-Id: <20220512170642.28930-5-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54a69b24-cd28-4067-b399-08da3439d5ab X-MS-TrafficTypeDiagnostic: BL0PR05MB4721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1kc17Nfdy/bFhHvhlC3/fjI/EkVcMx5PenmadSXF1G765cXEIY9ImY+naxnXTvfKMlrnGWJk3eQa57JlEdw6HuRrr37nDdoLNxl5s28OCkRtlP98Opz9fY4+zR7KarychGHApzAofIo+gFN1cKltlzlASg2ZTmB2CRUmmW0HGux5aZkiwiBmmf5KNSrNa3Ad6gudNDGwTsbBDd1+LpjD8ZDRXL89JaS6FoQS/eiLcgv5pR27hZWGl7FQ8GiwtWUHW1Ss5bVMfkATMAUX6Lt+oVx3xceqdKB1uvZX4CVHrh4LgRl1woGwK9EPAFVBGDldJfR59xCN8WSkzMutwnnvJ2N55hDlF638OzBQ7tTDUxG6zvHgDQDhf5t8v3hQJ8JPavxwh1Dk6Es2n5hRVraIS2GX+3b4cGFI3bYKZcxjXpbxvP5zXVKFbAZs9SU/0QKSQ5CIKCcyIwA4k7XLS6XDzLqRt4fmqsazUfCxnAxl/zySzzybxS9jbsnznJYghZbJo5q8fcAxwJeSGr55bjq6//miTUisqcODdh9I95QLuiMgmITwqLtHk9yWZWWCOYfAdJWWrM+eMrqVJH7BWgt1Rp8gz2U7FrPpnYy+nWSpmwPZfu8HGfv/3CheclN7m9jr1FIdudtCaiI0UpQWZKwGwpkdXVqBJdhtzwOOci+Ya7RxrS7O5rv38VfL/4Wpigowscpo9qp0wS/eYPsqB7HhEw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(36756003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: soMyx+MX4TSuLGllY0WbFDC2tIZBLeg6jEo9NLCDqgXaWoDydunOxYwi5mKKipDyMQkFfQQNJNbTM4WPz5yzXpdinROpJ6lJY3XXi0rHcQkzVMJr2pL9LHOO7/rf4B9oZTj4v+216qo+3JJlUX6ZmVDF6+vEB/vxyjTn9On0PAYvtx/7kBgTKOaiKyXbWx2xCgVjqJcNr+3EULEWvzB1sCwM3CIo6iAXzmEHC0hkLqGSfpC/ExGFM4oizWsoFt/Kbis+u2QbxTIqVilK8HBeY2DtMNPtaPd0uAC1WtzTNwlhxsFO/1HGUZ+uUNtXYkGbK7T+eXzhB8jns9k88e1FSJ/6rJ0EejBFYlmCyGAB0ORTc/CJq8qFbTZD85th4rm8c6StWUcrrJlGvKkWnHq1JdxETmz3eoKxBjvhUQQRs5X6M2B+DkL6zQ6OlPm6w/7SBSPEMvY3u1XUj4DZEjth/0jo+xsc3Y4X1aNscI62BX5PEFwhZReC83LWG3gFGlTvK0YQqxzGwDUWaPaQzU6kEAE5j/VU2pp2lT7sWwkFTk8vxqUsgj8dfJdMwLKv+Lzjz9H9I2V2YsBXM41irK6ndf11iIg/ODlC63QVkMh5f73zjudvBlno56C5hhkcZ+uEu45y2ffONlOfsYAGhn3Sy2KdzaqkUOnYCWrm4+dT6SbewGPq2qDWuF4tEDnkw8FcpAMDGDD8JlT1iRyuzhnM82R7zcazrOWjmsAq1gS+ElVFdB1qnwNZ3IZnty6+9biJgPMvCB5TN5YkK6SanC4b0UUTmai+PRR8hHZDi1OCgHByrRpZz4KA+17nhtJRgEG60rHafmwLF3MNPB0iZchfm37pUyTlpjc2ZYDTJiYcARpH+JiQr7R6vYQX9vu4GG7UCtaaJhObNFR7KN/ETxDfBl7oJryUFZ5QzcMohAmhuZiR38Va8Pv2EXWulKvzAY+HxGybLe40cM3iqlLFBeNkzhrcb+UHjsN2n367VkuaLm1zIAzmTUqo07JjIAX7hy8edAfx5bRrkD4sgm7loTM5HbrduLKnbip0zRsiZlL+oMB1xPyanesMrXgjNn/6q5jLUwbZjLcb8KVpnSXIOIjBK1uiwxLOZj7ZyTKgyj08EL4AocoOxBE5qqqIEEO71TaWBqtT9F/rvHlYDzlpqvVbhI/kBuTiB+2inevl4eJBmATETKVO+k2Z/84XA4IgzRNPG3o1Iu7RXl9X+zcZrG1piXh0OJ2oLC+CC2HdAqhJWYQSMoGZIUjiqJAlhdCDscdi/LMkZg4BgBM71VsJ360IOKtwczsCu4e1OHnfaxZ5xiTjTquNW2rQ/VplRvqbpECfFrSoxRlFiDnaYp20TZ0rT9X0rGrVohyIh2GTf8lwS4B8WBW8s9OcXlWeeTKZ5QZYAWw6TNkwdBd1footWAgPMmKeI6ZDYK17fUOn7R7OT6TPCOO9NPpqkxpPLC3ckK0MJIuIWvC6VJknymQqdKOpimyfQAQ50Vu4tUPttXSCSFa69oAu8YzP0xvoyTNqLVAYtlZqbngR02l2ZKGQx68Hvdd2cnazq7y0d+p1fkbVFQ3a55s9rcLKsh/SzwOAZREvTXIB5KONgHeY2Ysv0DYi4YFWTUslVaeIU8N5PY1MlFHqNMmFb8a7cE9e1ZqT//ZscB91uu2+uYfstNpSdxSt/hAmKaz8c3mAGmHYUsC6EN1v+Djak1IuHtMWT9VBKnvjNvjRZHUlq6O/k60gMsPVjg== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54a69b24-cd28-4067-b399-08da3439d5ab X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:03.0957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: R2xRPtwAy318RV6jxxHh6faMSUbh/DfjGIqsLqQOCOj4p0FANVt1HT46Dh8rcEyxMWM1L9j8J2RyGDX+mmTzDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4721 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Implement fw_version_get API for vmxnet3 Align addition order in vmxnet3_eth_dev_ops with eth_dev_ops Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 35 ++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index cd32c1b4ee..d14ddfcbeb 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -103,6 +103,10 @@ static int vmxnet3_rss_reta_query(struct rte_eth_dev *dev, struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size); +static int +vmxnet3_hw_ver_get(struct rte_eth_dev *dev, + char *fw_version, size_t fw_size); + static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id); static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, @@ -124,27 +128,28 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = { .dev_stop = vmxnet3_dev_stop, .dev_close = vmxnet3_dev_close, .dev_reset = vmxnet3_dev_reset, + .link_update = vmxnet3_dev_link_update, .promiscuous_enable = vmxnet3_dev_promiscuous_enable, .promiscuous_disable = vmxnet3_dev_promiscuous_disable, .allmulticast_enable = vmxnet3_dev_allmulticast_enable, .allmulticast_disable = vmxnet3_dev_allmulticast_disable, - .link_update = vmxnet3_dev_link_update, + .mac_addr_set = vmxnet3_mac_addr_set, + .mtu_set = vmxnet3_dev_mtu_set, .stats_get = vmxnet3_dev_stats_get, - .xstats_get_names = vmxnet3_dev_xstats_get_names, - .xstats_get = vmxnet3_dev_xstats_get, .stats_reset = vmxnet3_dev_stats_reset, - .mac_addr_set = vmxnet3_mac_addr_set, + .xstats_get = vmxnet3_dev_xstats_get, + .xstats_get_names = vmxnet3_dev_xstats_get_names, + .fw_version_get = vmxnet3_hw_ver_get, .dev_infos_get = vmxnet3_dev_info_get, .dev_supported_ptypes_get = vmxnet3_dev_supported_ptypes_get, - .mtu_set = vmxnet3_dev_mtu_set, .vlan_filter_set = vmxnet3_dev_vlan_filter_set, .vlan_offload_set = vmxnet3_dev_vlan_offload_set, .rx_queue_setup = vmxnet3_dev_rx_queue_setup, .rx_queue_release = vmxnet3_dev_rx_queue_release, - .tx_queue_setup = vmxnet3_dev_tx_queue_setup, - .tx_queue_release = vmxnet3_dev_tx_queue_release, .rx_queue_intr_enable = vmxnet3_dev_rx_queue_intr_enable, .rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable, + .tx_queue_setup = vmxnet3_dev_tx_queue_setup, + .tx_queue_release = vmxnet3_dev_tx_queue_release, .reta_update = vmxnet3_rss_reta_update, .reta_query = vmxnet3_rss_reta_query, }; @@ -1764,3 +1769,19 @@ vmxnet3_rss_reta_query(struct rte_eth_dev *dev, return 0; } + +static int +vmxnet3_hw_ver_get(struct rte_eth_dev *dev, + char *fw_version, size_t fw_size) +{ + int ret; + struct vmxnet3_hw *hw = dev->data->dev_private; + + ret = snprintf(fw_version, fw_size, "v%d", hw->version); + + ret += 1; /* add the size of '\0' */ + if (fw_size < (uint32_t)ret) + return ret; + else + return 0; +} From patchwork Thu May 12 17:06:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111078 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 90326A00C3; Thu, 12 May 2022 19:07:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC65E42845; Thu, 12 May 2022 19:07:12 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id E039942831 for ; Thu, 12 May 2022 19:07:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F3wqgrmf8a0a9LQyGTn9OaTkE80EEzVO8O8rvd7nGN9ujJgRuKWQJZjAULDP4vMGiQ3kKoxqh2K6WQSzGqrchseEp//c+XwCzHA8MvBr7qufCJdaBgr0U57s44fgCbwa3rlTOd1hxZWpLZfesmmpR9eCCUt8uJ0jrzP4EzbC0XJ12m2DFp8ppxaMnwchULzCeviUGEE/zaxU3X8QA2sZ8hCXYMc1YjH9laJZg20UL051VsO4uPDNeVcUAd1/kfTvHqbGsqNfSgoPOM3BqVyGc64qXQ22MGMPR0qekeTxcW8AVptBzMC5M2Ju+86Oa+kYNnNsTObE1TWuPIkvRuGE0w== 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=o814Ps8CI4s3gPVDOCVnsrwpnx2Spmwf4huIZBaiJDk=; b=Hq8axWbrJAIF+TazfM6YLKmoy7XmhnmfLZiwX+XRES2431B4NalxeGOHgwI8JchQYWx/98rvsboAG7XQH66Vgdvnxv7VkTKdAIf7gYDqycRQwoMbZ6Ih/HdylFV3ueJFJ7nvYK/PHb9UNMnJiqanRfVZSWoirX7A9kT8E2nNWzn5eFxtsiKVrrrDyYqsoRm/jCwLvvx5CjB0b/4f96WUfYvZBKur9j+6ZgVMVoC2RY0hajX0M0bs3BLnYk9+K6HBcl3ftdTwmBPhKJDqR+u6YQu/6pab5cNQYdJfSBb9WzOcKAmLRJ6WbkBCiLOxKAjYWZeiHXasMxo6Yp48saaHyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o814Ps8CI4s3gPVDOCVnsrwpnx2Spmwf4huIZBaiJDk=; b=L9Oe1yFwM7yXVDyJ9ovLvEt020KCvdzIdRELxHreKLsr5ah7SKQjVMxHMgGJr5cNus/xKX2HbH2+ubN72/yfJ2bEEgUxV2jc4hF2oIHaCbZmIgGnYjLjU29bvQThrPlbfmUunRxbNpzmhXwBHDCNavIH7KFY+Zdu6gf8l+pnFms= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May 2022 17:07:05 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:05 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 5/8] net/vmxnet3: version 6 Date: Thu, 12 May 2022 13:06:39 -0400 Message-Id: <20220512170642.28930-6-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88793f51-02f3-45be-88ac-08da3439d5e2 X-MS-TrafficTypeDiagnostic: BL0PR05MB4721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HeljyRQVDBW7D9ESGnEGy3rOTmfPZ99JGTsc/fJVBA2/bHp2bUfLPC78uMQs2M6hJ9ag3tn5SqkL3QZz5d9FQ9awy9QdpfERCrTsZQCdFba8ShITH2YRg9lvs2SZgOUyLcfzoLsPgK54dIvp7e5C1nuq9C2cyxcxfKkcrnsDm+Jx2C4oGU6u4l4v6MvLvQ11I0P+fc41IJZsdC7LqhS5L/HPai0GeX+ItSCdHft6cdT6uDVA4RE0vu/5wT3Kp17vnBwzBjiI4dJFomVCndNZKPFn5cOkIxb0acVZ2S8YhwoWXSFCyRp7DGK1EnabhLapvRQ4cMNhaQK7wsFpyq4r0EnlgWr56863fZMSmI+5rTL5Y1kkgOoC5aL0lDCON3Y2yN6/Y40QP95Xac8nt66iscz1vWYlkjs9MGklEV/gE6ijjgljSDVRW209EOiFqLjWvWlrremqUE3YRBcORaOeV4j1sUkZmgQZh5dZhQ8s+rY36g7IpW8Ms+vS27c/KGj+ctNhzBPLskw8LLJ7HH5d3k3kOKuy4lhsfnn2iyocUs+77UlG3+4VoCP/VKtE/NmvlmK1uXnQAoi6LkaebZPoxtG+IxZ9KdbFk5FOj/DZzjJ/lp0uLyq4o3GnjENTjLWBR/dwX0Ynn1+wENEqIo33H4bXjREg147+WMJO/QJ9NKMHfnc3KLs06d7jRxwfJXhhqSCzWUaP+T8VYsKip/6CVfNBPQ7FErdcKBpNB43wmVg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(19627235002)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(30864003)(36756003)(83380400001)(21314003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xaWMVhH3pHiL4JDROLGQW/JP2D7uWVBcpBv6GhVIADlheRYj7Saaax2hTeuRldPLSF2pUPltbPzWP4l4UoKznn1XG/Cz4UEaynCl4z1F51TlalHCeDUtQ98l4LS3W5UU63STSBiFyxke3fRw0Bc7wGnyFkISBw9yvaQlYELNRcEdDLj5XsAXpy7CFLZVDbFPn+T1VGhnaSg9dQeffqXhkoXBhxbbk6ONitEubDhG4G2ppD7QGVEi/kMa7vc6dSgPww11hBvV4Mfl31rRQNdLuSzotOGltUhUrnNC8PszRIY0m0xNfcus7H4fBG31Ailf28BZlku6B0YMuzWhO7HGToGl/2Wg0JtRd8Zp34uYyrbKFXDLC4Ftt/k52U8Q+3mebsb2j3vDIpY0muV7OMPMncYX2ZGzgjVYv320Ue/CE67gKoW6qvRCE/4pTOo7gagXtt5sp1tghzadMXdkMjJbxGfjUuIT8B+/wcco6txd/CNMz0YAT5HpzwKE8iKDqnrF4euszp7XexehbFkEFglorkB4pDD3jE6+hCgJHhEZCQzBnMz00ZAgTuUMwnaBc1o5eJ0UBfztA3tAS7Ka72R/Lje0dsqvSxyjjg8YiMMA8qtWtECO/TkqJ5pXkTaV02+m5EhtO1SZRskiWbAGna4XrlUNXU/EHugBTD2CGnOYh15Qyz3OmhbbPw0vjAwmZVrVAzSyVfuNCDx0iwbxCeF/X5+VR99k1FwlerUCbg4w1BGBEHNCAR+uTkmsj1u2oCjfCn6PuSg9hkYLpYE/zF2lXy43g2XNYC/1hI4mnBrt4yDW9lB/7uCKAd48V3LKUHLabLBPtTMbocF+Lf7eaIK+6hdC9h2naNUayX5q6u9qea0MvTCGffpwC7Rk5/yaIrInZx0hC0FMuwHt7a1t5Jt6C7pNs79UJjNpnMkirGmYaRiyp7ARxwEKwIW9CpkvwaKqdchHAI5lkaSLIPzxJFf5LczIBHde86LfRrithJhg/ydT7RHfyO4bE+g0nBZfonHD3790Qg+6YYTLl57StIDaoEjEgNk526clB3+Y3yxjdFCID+ttR+8ZIY9hrngk79kLCNCQOA9j1Ik/5cjKEFFZpqefhMXVjUlHnt5IPRpXAUR59H147NZZg/tPPDPv7UCmtgUHwqO4oXfZdOsistNgrkXp7VUXr4Z3qelTLL0zc0jaoQW+dMPuSn0JsPzqbBo6STb7/xw0MR84TZ0kU50p2zlxlrj71Yu+WJmXPIqY+XgHOWiuxcMIgl6ZjoTztRgQMlO9D9nniq2wZn/dAyPhlKABfyhYjVHxb5cSzUQkTl6n2pCKz8kUUbymlHhFwCTfPxwnE6/SegdMcMRvm/1NJeLB138gr3eqaLyj7rGlXK8HnEoEKFSaZo+lUmopKueZ0lpTgC6XaZNzphZwVALCS6EyM85Qsxn14vnG1WA94cKl8sCxgHZEemc5eRVofvCnncvsUMa7t2GR4gDVVAwNr66zTLZriFqiCePqI69+DQsNY8YpPX1eHshqmcZoI4CxLQGIDgUtaRx6cVXtfIsH9K7rrgcBAt5PT/vvY0ayPJLqsqI1DYulr3dNiHusA2U5aMTU6cmfHlXTEbupTp9qH48ZJbugSs3Ujb0Z29b3QSVw0xwTo82j4AY3b/wJbVku6RDboT+N+f2SEJgveOmQn9YI+PYSlAVZ9k/ymAjHW7S8QvXi10qs6YOJrFyebdu8+K1FG1N23WC+7b84VDbI7A== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88793f51-02f3-45be-88ac-08da3439d5e2 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:03.5175 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ycQTz3jci9Y82BgqUUJs1txPQCGriA9Fjh3FIwmPM72H9f5XLSG/aMhPac6kT65tsZ3wrvwkvaeD7588vdtWoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4721 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org vmxnet3 version 6 supports some new features, including but not limited to: - Increased max MTU up to 9190 - Increased max number of queues, both for Rx and Tx - Removes power-of-two limitations - Extended interrupt structures, required implementation for additional number of queues Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/base/vmxnet3_defs.h | 73 ++++++-- drivers/net/vmxnet3/vmxnet3_ethdev.c | 220 +++++++++++++++++------- drivers/net/vmxnet3/vmxnet3_ethdev.h | 10 +- drivers/net/vmxnet3/vmxnet3_rxtx.c | 2 +- 4 files changed, 226 insertions(+), 79 deletions(-) diff --git a/drivers/net/vmxnet3/base/vmxnet3_defs.h b/drivers/net/vmxnet3/base/vmxnet3_defs.h index 8d62b3e116..bd6695e69d 100644 --- a/drivers/net/vmxnet3/base/vmxnet3_defs.h +++ b/drivers/net/vmxnet3/base/vmxnet3_defs.h @@ -103,7 +103,11 @@ typedef enum { VMXNET3_CMD_GET_CONF_INTR, VMXNET3_CMD_GET_ADAPTIVE_RING_INFO, VMXNET3_CMD_GET_TXDATA_DESC_SIZE, - VMXNET3_CMD_RESERVED5, + VMXNET3_CMD_RESERVED5, + VMXNET3_CMD_RESERVED6, + VMXNET3_CMD_RESERVED7, + VMXNET3_CMD_RESERVED8, + VMXNET3_CMD_GET_MAX_QUEUES_CONF, } Vmxnet3_Cmd; /* Adaptive Ring Info Flags */ @@ -571,6 +575,24 @@ enum vmxnet3_intr_type { /* addition 1 for events */ #define VMXNET3_MAX_INTRS 25 +/* Version 6 and later will use below macros */ +#define VMXNET3_EXT_MAX_TX_QUEUES 32 +#define VMXNET3_EXT_MAX_RX_QUEUES 32 + +/* Version-dependent MAX RX/TX queues macro */ +#define MAX_RX_QUEUES(hw) \ + (VMXNET3_VERSION_GE_6((hw)) ? \ + VMXNET3_EXT_MAX_RX_QUEUES : \ + VMXNET3_MAX_RX_QUEUES) +#define MAX_TX_QUEUES(hw) \ + (VMXNET3_VERSION_GE_6((hw)) ? \ + VMXNET3_EXT_MAX_TX_QUEUES : \ + VMXNET3_MAX_TX_QUEUES) + +/* addition 1 for events */ +#define VMXNET3_EXT_MAX_INTRS 65 +#define VMXNET3_FIRST_SET_INTRS 64 + /* value of intrCtrl */ #define VMXNET3_IC_DISABLE_ALL 0x1 /* bit 0 */ @@ -587,6 +609,21 @@ struct Vmxnet3_IntrConf { #include "vmware_pack_end.h" Vmxnet3_IntrConf; +typedef +#include "vmware_pack_begin.h" +struct Vmxnet3_IntrConfExt { + uint8 autoMask; + uint8 numIntrs; /* # of interrupts */ + uint8 eventIntrIdx; + uint8 reserved; + __le32 intrCtrl; + __le32 reserved1; + uint8 modLevels[VMXNET3_EXT_MAX_INTRS]; /* moderation level for each intr */ + uint8 reserved2[3]; +} +#include "vmware_pack_end.h" +Vmxnet3_IntrConfExt; + /* one bit per VLAN ID, the size is in the units of uint32 */ #define VMXNET3_VFT_SIZE (4096 / (sizeof(uint32) * 8)) @@ -692,6 +729,15 @@ struct Vmxnet3_DSDevRead { #include "vmware_pack_end.h" Vmxnet3_DSDevRead; +typedef +#include "vmware_pack_begin.h" +struct Vmxnet3_DSDevReadExt { + /* read-only region for device, read by dev in response to a SET cmd */ + struct Vmxnet3_IntrConfExt intrConfExt; +} +#include "vmware_pack_end.h" +Vmxnet3_DSDevReadExt; + typedef #include "vmware_pack_begin.h" struct Vmxnet3_TxQueueDesc { @@ -778,18 +824,18 @@ Vmxnet3_CmdInfo; typedef #include "vmware_pack_begin.h" struct Vmxnet3_DriverShared { - __le32 magic; - __le32 pad; /* make devRead start at 64-bit boundaries */ - Vmxnet3_DSDevRead devRead; - __le32 ecr; - __le32 reserved; - - union { - __le32 reserved1[4]; - Vmxnet3_CmdInfo cmdInfo; /* only valid in the context of executing the - * relevant command - */ - } cu; + __le32 magic; + __le32 size; /* size of DriverShared */ + Vmxnet3_DSDevRead devRead; + __le32 ecr; + __le32 reserved; + + union { + __le32 reserved1[4]; + /* only valid in the context of executing the relevant command */ + Vmxnet3_CmdInfo cmdInfo; + } cu; + struct Vmxnet3_DSDevReadExt devReadExt; } #include "vmware_pack_end.h" Vmxnet3_DriverShared; @@ -821,6 +867,7 @@ do {\ ((vfTable[vid >> 5] & (1 << (vid & 31))) != 0) #define VMXNET3_MAX_MTU 9000 +#define VMXNET3_V6_MAX_MTU 9190 #define VMXNET3_MIN_MTU 60 #define VMXNET3_LINK_UP (10000 << 16 | 1) // 10 Gbps, up diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index d14ddfcbeb..af4a1a1b40 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -222,24 +222,20 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw, unsigned int intr_idx) } /* - * Enable all intrs used by the device + * Simple helper to get intrCtrl and eventIntrIdx based on config and hw version */ static void -vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) +vmxnet3_get_intr_ctrl_ev(struct vmxnet3_hw *hw, + uint8 **out_eventIntrIdx, + uint32 **out_intrCtrl) { - Vmxnet3_DSDevRead *devRead = &hw->shared->devRead; - - PMD_INIT_FUNC_TRACE(); - devRead->intrConf.intrCtrl &= rte_cpu_to_le_32(~VMXNET3_IC_DISABLE_ALL); - - if (hw->intr.lsc_only) { - vmxnet3_enable_intr(hw, devRead->intrConf.eventIntrIdx); + if (VMXNET3_VERSION_GE_6(hw) && hw->queuesExtEnabled) { + *out_eventIntrIdx = &hw->shared->devReadExt.intrConfExt.eventIntrIdx; + *out_intrCtrl = &hw->shared->devReadExt.intrConfExt.intrCtrl; } else { - int i; - - for (i = 0; i < hw->intr.num_intrs; i++) - vmxnet3_enable_intr(hw, i); + *out_eventIntrIdx = &hw->shared->devRead.intrConf.eventIntrIdx; + *out_intrCtrl = &hw->shared->devRead.intrConf.intrCtrl; } } @@ -250,15 +246,42 @@ static void vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw) { int i; + uint8 *eventIntrIdx; + uint32 *intrCtrl; PMD_INIT_FUNC_TRACE(); + vmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl); + + *intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL); - hw->shared->devRead.intrConf.intrCtrl |= - rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL); - for (i = 0; i < hw->num_intrs; i++) + for (i = 0; i < hw->intr.num_intrs; i++) vmxnet3_disable_intr(hw, i); } +/* + * Enable all intrs used by the device + */ +static void +vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) +{ + uint8 *eventIntrIdx; + uint32 *intrCtrl; + + PMD_INIT_FUNC_TRACE(); + vmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl); + + *intrCtrl &= rte_cpu_to_le_32(~VMXNET3_IC_DISABLE_ALL); + + if (hw->intr.lsc_only) { + vmxnet3_enable_intr(hw, *eventIntrIdx); + } else { + int i; + + for (i = 0; i < hw->intr.num_intrs; i++) + vmxnet3_enable_intr(hw, i); + } +} + /* * Gets tx data ring descriptor size. */ @@ -333,7 +356,11 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) /* Check h/w version compatibility with driver. */ ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS); - if (ver & (1 << VMXNET3_REV_5)) { + if (ver & (1 << VMXNET3_REV_6)) { + VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS, + 1 << VMXNET3_REV_6); + hw->version = VMXNET3_REV_6 + 1; + } else if (ver & (1 << VMXNET3_REV_5)) { VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS, 1 << VMXNET3_REV_5); hw->version = VMXNET3_REV_5 + 1; @@ -508,15 +535,22 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev) if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) dev->data->dev_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH; - if (dev->data->nb_tx_queues > VMXNET3_MAX_TX_QUEUES || - dev->data->nb_rx_queues > VMXNET3_MAX_RX_QUEUES) { - PMD_INIT_LOG(ERR, "ERROR: Number of queues not supported"); - return -EINVAL; + if (!VMXNET3_VERSION_GE_6(hw)) { + if (!rte_is_power_of_2(dev->data->nb_rx_queues)) { + PMD_INIT_LOG(ERR, + "ERROR: Number of rx queues not power of 2"); + return -EINVAL; + } } - if (!rte_is_power_of_2(dev->data->nb_rx_queues)) { - PMD_INIT_LOG(ERR, "ERROR: Number of rx queues not power of 2"); - return -EINVAL; + /* At this point, the number of queues requested has already + * been validated against dev_infos max queues by EAL + */ + if (dev->data->nb_rx_queues > VMXNET3_MAX_RX_QUEUES || + dev->data->nb_tx_queues > VMXNET3_MAX_TX_QUEUES) { + hw->queuesExtEnabled = 1; + } else { + hw->queuesExtEnabled = 0; } size = dev->data->nb_rx_queues * sizeof(struct Vmxnet3_TxQueueDesc) + @@ -627,9 +661,9 @@ vmxnet3_configure_msix(struct rte_eth_dev *dev) return -1; intr_vector = dev->data->nb_rx_queues; - if (intr_vector > VMXNET3_MAX_RX_QUEUES) { + if (intr_vector > MAX_RX_QUEUES(hw)) { PMD_INIT_LOG(ERR, "At most %d intr queues supported", - VMXNET3_MAX_RX_QUEUES); + MAX_RX_QUEUES(hw)); return -ENOTSUP; } @@ -777,6 +811,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) uint32_t mtu = dev->data->mtu; Vmxnet3_DriverShared *shared = hw->shared; Vmxnet3_DSDevRead *devRead = &shared->devRead; + struct Vmxnet3_DSDevReadExt *devReadExt = &shared->devReadExt; uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads; uint32_t i; int ret; @@ -853,13 +888,27 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) } /* intr settings */ - devRead->intrConf.autoMask = hw->intr.mask_mode == VMXNET3_IMM_AUTO; - devRead->intrConf.numIntrs = hw->intr.num_intrs; - for (i = 0; i < hw->intr.num_intrs; i++) - devRead->intrConf.modLevels[i] = hw->intr.mod_levels[i]; + if (VMXNET3_VERSION_GE_6(hw) && hw->queuesExtEnabled) { + devReadExt->intrConfExt.autoMask = hw->intr.mask_mode == + VMXNET3_IMM_AUTO; + devReadExt->intrConfExt.numIntrs = hw->intr.num_intrs; + for (i = 0; i < hw->intr.num_intrs; i++) + devReadExt->intrConfExt.modLevels[i] = + hw->intr.mod_levels[i]; + + devReadExt->intrConfExt.eventIntrIdx = hw->intr.event_intr_idx; + devReadExt->intrConfExt.intrCtrl |= + rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL); + } else { + devRead->intrConf.autoMask = hw->intr.mask_mode == + VMXNET3_IMM_AUTO; + devRead->intrConf.numIntrs = hw->intr.num_intrs; + for (i = 0; i < hw->intr.num_intrs; i++) + devRead->intrConf.modLevels[i] = hw->intr.mod_levels[i]; - devRead->intrConf.eventIntrIdx = hw->intr.event_intr_idx; - devRead->intrConf.intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL); + devRead->intrConf.eventIntrIdx = hw->intr.event_intr_idx; + devRead->intrConf.intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL); + } /* RxMode set to 0 of VMXNET3_RXM_xxx */ devRead->rxFilterConf.rxMode = 0; @@ -937,18 +986,24 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) return -EINVAL; } - /* Setup memory region for rx buffers */ - ret = vmxnet3_dev_setup_memreg(dev); - if (ret == 0) { - VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, - VMXNET3_CMD_REGISTER_MEMREGS); - ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD); - if (ret != 0) - PMD_INIT_LOG(DEBUG, - "Failed in setup memory region cmd\n"); - ret = 0; + /* Check memregs restrictions first */ + if (dev->data->nb_rx_queues <= VMXNET3_MAX_RX_QUEUES && + dev->data->nb_tx_queues <= VMXNET3_MAX_TX_QUEUES) { + ret = vmxnet3_dev_setup_memreg(dev); + if (ret == 0) { + VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, + VMXNET3_CMD_REGISTER_MEMREGS); + ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD); + if (ret != 0) + PMD_INIT_LOG(DEBUG, + "Failed in setup memory region cmd\n"); + ret = 0; + } else { + PMD_INIT_LOG(DEBUG, "Failed to setup memory region\n"); + } } else { - PMD_INIT_LOG(DEBUG, "Failed to setup memory region\n"); + PMD_INIT_LOG(WARNING, "Memregs can't init (rx: %d, tx: %d)", + dev->data->nb_rx_queues, dev->data->nb_tx_queues); } if (VMXNET3_VERSION_GE_4(hw) && @@ -1203,8 +1258,6 @@ vmxnet3_hw_stats_save(struct vmxnet3_hw *hw) VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS); - RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_TX_QUEUES); - for (i = 0; i < hw->num_tx_queues; i++) vmxnet3_hw_tx_stats_get(hw, i, &hw->saved_tx_stats[i]); for (i = 0; i < hw->num_rx_queues; i++) @@ -1306,7 +1359,6 @@ vmxnet3_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS); - RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_TX_QUEUES); for (i = 0; i < hw->num_tx_queues; i++) { vmxnet3_tx_stats_get(hw, i, &txStats); @@ -1323,7 +1375,6 @@ vmxnet3_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) stats->oerrors += txStats.pktsTxError + txStats.pktsTxDiscard; } - RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_RX_QUEUES); for (i = 0; i < hw->num_rx_queues; i++) { vmxnet3_rx_stats_get(hw, i, &rxStats); @@ -1377,9 +1428,27 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { struct vmxnet3_hw *hw = dev->data->dev_private; + int queues = 0; + + if (VMXNET3_VERSION_GE_6(hw)) { + VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, + VMXNET3_CMD_GET_MAX_QUEUES_CONF); + queues = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD); + + if (queues > 0) { + dev_info->max_rx_queues = + RTE_MIN(VMXNET3_EXT_MAX_RX_QUEUES, ((queues >> 8) & 0xff)); + dev_info->max_tx_queues = + RTE_MIN(VMXNET3_EXT_MAX_TX_QUEUES, (queues & 0xff)); + } else { + dev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES; + dev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES; + } + } else { + dev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES; + dev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES; + } - dev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES; - dev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES; dev_info->min_rx_bufsize = 1518 + RTE_PKTMBUF_HEADROOM; dev_info->max_rx_pktlen = 16384; /* includes CRC, cf MAXFRS register */ dev_info->min_mtu = VMXNET3_MIN_MTU; @@ -1430,24 +1499,50 @@ vmxnet3_dev_supported_ptypes_get(struct rte_eth_dev *dev) } static int -vmxnet3_dev_mtu_set(struct rte_eth_dev *dev, __rte_unused uint16_t mtu) +vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) { - if (dev->data->dev_started) { - PMD_DRV_LOG(ERR, "Port %d must be stopped to configure MTU", - dev->data->port_id); - return -EBUSY; - } + struct vmxnet3_hw *hw = dev->data->dev_private; + rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr)); + vmxnet3_write_mac(hw, mac_addr->addr_bytes); return 0; } static int -vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) +vmxnet3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) { struct vmxnet3_hw *hw = dev->data->dev_private; + uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 4; + + if (mtu < VMXNET3_MIN_MTU) + return -EINVAL; + + if (VMXNET3_VERSION_GE_6(hw)) { + if (mtu > VMXNET3_V6_MAX_MTU) + return -EINVAL; + } else { + if (mtu > VMXNET3_MAX_MTU) { + PMD_DRV_LOG(ERR, "MTU %d too large in device version v%d", + mtu, hw->version); + return -EINVAL; + } + } + + dev->data->mtu = mtu; + /* update max frame size */ + dev->data->dev_conf.rxmode.mtu = frame_size; + + if (dev->data->dev_started == 0) + return 0; + + /* changing mtu for vmxnet3 pmd does not require a restart + * as it does not need to repopulate the rx rings to support + * different mtu size. We stop and restart the device here + * just to pass the mtu info to the backend. + */ + vmxnet3_dev_stop(dev); + vmxnet3_dev_start(dev); - rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr)); - vmxnet3_write_mac(hw, mac_addr->addr_bytes); return 0; } @@ -1668,11 +1763,14 @@ vmxnet3_interrupt_handler(void *param) { struct rte_eth_dev *dev = param; struct vmxnet3_hw *hw = dev->data->dev_private; - Vmxnet3_DSDevRead *devRead = &hw->shared->devRead; uint32_t events; + uint8 *eventIntrIdx; + uint32 *intrCtrl; PMD_INIT_FUNC_TRACE(); - vmxnet3_disable_intr(hw, devRead->intrConf.eventIntrIdx); + + vmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl); + vmxnet3_disable_intr(hw, *eventIntrIdx); events = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_ECR); if (events == 0) @@ -1681,7 +1779,7 @@ vmxnet3_interrupt_handler(void *param) RTE_LOG(DEBUG, PMD, "Reading events: 0x%X", events); vmxnet3_process_events(dev); done: - vmxnet3_enable_intr(hw, devRead->intrConf.eventIntrIdx); + vmxnet3_enable_intr(hw, *eventIntrIdx); } static int diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h index ceaeb66392..5a303717b1 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.h +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h @@ -70,7 +70,7 @@ struct vmxnet3_intr { enum vmxnet3_intr_type type; /* MSI-X, MSI, or INTx? */ uint8_t num_intrs; /* # of intr vectors */ uint8_t event_intr_idx; /* idx of the intr vector for event */ - uint8_t mod_levels[VMXNET3_MAX_MSIX_VECT]; /* moderation level */ + uint8_t mod_levels[VMXNET3_EXT_MAX_INTRS]; /* moderation level */ bool lsc_only; /* no Rx queue interrupt */ }; @@ -108,6 +108,7 @@ struct vmxnet3_hw { uint64_t queueDescPA; uint16_t queue_desc_len; uint16_t mtu; + bool queuesExtEnabled; VMXNET3_RSSConf *rss_conf; uint64_t rss_confPA; @@ -117,19 +118,20 @@ struct vmxnet3_hw { Vmxnet3_MemRegs *memRegs; uint64_t memRegsPA; #define VMXNET3_VFT_TABLE_SIZE (VMXNET3_VFT_SIZE * sizeof(uint32_t)) - UPT1_TxStats saved_tx_stats[VMXNET3_MAX_TX_QUEUES]; - UPT1_RxStats saved_rx_stats[VMXNET3_MAX_RX_QUEUES]; - + UPT1_TxStats saved_tx_stats[VMXNET3_EXT_MAX_TX_QUEUES]; + UPT1_RxStats saved_rx_stats[VMXNET3_EXT_MAX_RX_QUEUES]; UPT1_TxStats snapshot_tx_stats[VMXNET3_MAX_TX_QUEUES]; UPT1_RxStats snapshot_rx_stats[VMXNET3_MAX_RX_QUEUES]; }; +#define VMXNET3_REV_6 5 /* Vmxnet3 Rev. 6 */ #define VMXNET3_REV_5 4 /* Vmxnet3 Rev. 5 */ #define VMXNET3_REV_4 3 /* Vmxnet3 Rev. 4 */ #define VMXNET3_REV_3 2 /* Vmxnet3 Rev. 3 */ #define VMXNET3_REV_2 1 /* Vmxnet3 Rev. 2 */ #define VMXNET3_REV_1 0 /* Vmxnet3 Rev. 1 */ +#define VMXNET3_VERSION_GE_6(hw) ((hw)->version >= VMXNET3_REV_6 + 1) #define VMXNET3_VERSION_GE_5(hw) ((hw)->version >= VMXNET3_REV_5 + 1) #define VMXNET3_VERSION_GE_4(hw) ((hw)->version >= VMXNET3_REV_4 + 1) #define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index e15b377d8c..c94e3762e6 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -1400,7 +1400,7 @@ vmxnet3_rss_configure(struct rte_eth_dev *dev) /* loading hashKeySize */ dev_rss_conf->hashKeySize = VMXNET3_RSS_MAX_KEY_SIZE; /* loading indTableSize: Must not exceed VMXNET3_RSS_MAX_IND_TABLE_SIZE (128)*/ - dev_rss_conf->indTableSize = (uint16_t)(hw->num_rx_queues * 4); + dev_rss_conf->indTableSize = (uint16_t)((MAX_RX_QUEUES(hw)) * 4); if (port_rss_conf->rss_key == NULL) { /* Default hash key */ From patchwork Thu May 12 17:06:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111080 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 655BAA00C3; Thu, 12 May 2022 19:07:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71DC442850; Thu, 12 May 2022 19:07:14 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id 59B9D42835 for ; Thu, 12 May 2022 19:07:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zr8UlGbsrPUOJWBVuCKXy7vnQRPXhYMsHzFHmiCLgzpDHpN8ZgvEJpiH0llj498RwBAjroeU2HXxoXQe7yd9V28fd2+2hpLruC0H8a01FH5WQ2R4MEujxyNtLWqmH5U11h3pFl6PaCQyCJeQ9KM3Adjdem9C0oWrooJF5JLIrg1JmIDqD2NimGRO+2WqV7T+/TCJJKbO1odW1P8J018k6VZFtVBPe8R7BjxV+d17pCLGytMrLGsbpXG8bqhpDyKyh/1q1YSDrEfH7AmCXGmo9LXfh9tbHoAP8GXSQc95dvzhLZ+q3bW4LtGrkBcdQBAvh9w3MUhyr3novgPqkqK7Zw== 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=EMC3izk0LWnDG17Ql3ObBbDlJA0mNnM7DW1qI2WP8So=; b=Dme7rDaJ+c/ru3fY092HPISxKH0zfdHzipN9u52r58tVLalUrKvxFxxq+HzBuUSzpDwIRFXMq/mLhr62co0rpheAaEo9A5yx5gxfwWNR/ILNXs/w0AHxXrjhFSy66lB2JG5vvV8JTlWKBL6j8WBteVU/IrobplD+r98G2/fuGmvUenIfp0nxutPGDQmlb5ys8F3/JRJoV+vR2CgvCiFN+hChCY506p0lkhTcILYa40qJWPMCeu67eNgCXhiRwaR+fwD/kuh4TaJ+FZbgKzr32VveklOZ0B+kood+yvoFTrCP0FRi037omIjmosqaZwsfRIMKvwsjQMQ+IL4ixZJZLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EMC3izk0LWnDG17Ql3ObBbDlJA0mNnM7DW1qI2WP8So=; b=Cabmg43PIYuq+qGUvgcRkjmifUHWsTw7nyJMKfAe760DCoh7syE9cFoCX+demXBlkuNLYc3rpQ431FKTIn70K7rHioksWo5ilNma2IpVYWij1FhLkoTVkQA+vV9vKHq0rJ01Svq5X2tqlSb935ouzxssC8K0wCn5i+Av8eU2JJQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May 2022 17:07:06 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:06 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 6/8] net/vmxnet3: advertise RETA size in device info Date: Thu, 12 May 2022 13:06:40 -0400 Message-Id: <20220512170642.28930-7-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09038e8b-7044-47eb-0df2-08da3439d62a X-MS-TrafficTypeDiagnostic: BL0PR05MB4721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SmWDm8rl3pTJwwOY/w8MxN4pFMybN/ImrYAwZewOuSjuQ5UDMGmJgXFF8dOneyK2wpSqpQfLinzce8i9V5UizkpHjoY2xarz3WvhAeB9AtJ+qgmADdKMyP1ZrTF/RzNxY1YdyM4bBZUYUlpAwhbeiQGAkB6PyJTDYlKafDC6ldX2ZX/3pXNfouaiUd3hOp4XJsA9gaxg0lwOM7MTWJZAmNaYN7PzRngqxiJaMECZWXhUXDRmWQSqDQB6uCOuVojdy3PHbogLJVE6PKq3tXkzYZSYWKixVAIJAv5hCkd4/eojRUlB/GSGvkjBy3ihb52NtHQsxOcMotGNzijR2AAnLGO3Kcq1V+nCzbqCjs/UK1TPxyS5gwVR6hsIl08qD9EXFJbw5wlr/EmoPE4avpNDmONlhaPaK1idNl0f0B/f/6ffouTn06uBUMz0vPf2b+OqaRLt0M6nt9BKJZV2SFtnhFA/1LZP/6aNc36prWYrzAIIMtbVimWf/iETlv2hqwO1RxbMpkioqL+jaoxNQ5ws7tQ1cdxJzHOhnrXCH5IlDlTuSdX8V/jluDo2Pyp/5t87OoLC9i8jRd3TIQwibBofCESf1dFb6kG/ds80OpgD69Yh0fj5ERoXaAessAcug3WCtZQzIF8k5pfT5TLpjkSSMSuDnY9VoE860gMlVDmDD6TZEw4LVpRjL8IyQPi2oeFSp2cmDY/GnmJHyv6yKIgjFA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(36756003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7ov5MlzWHp6201FiaZwBtQS+MvsS9bnwHxkHUEfbgs6ZrD+VaSRbZEQZOUzCzmJqsGGEGvcN3m1q4zybCDwnvhupkIkqFD1mKzUvrn6aEjOo/iUaDU6j2bwnr9sF5kEJQgug0aGY7VHLyrYVd/z1awbLwSV8eqyBsYXEe2TGKAHvsOhO+a2fsG2UJvHZcWn5reeFM8+fXWPpcKfSR50ECm1GKjmJi7sfZ0sSGyrOdnieF94ne0mHMdMMNMvDjJETATvzgSIDBV1mCo6byy3hYf7z8pDKMC8IWgZ6GxvbCGbLjYcuWJwUZe8txzP7CNLZYh1Eny1d8PXitxBFHn6qEdpUOOgCrAkNQig1KBVE42P5/kS4JcVSh3V8hsW0CdDj0shHY5oA+lLk0elVqbO6n4kO49KciPIOEsV/dE4zOLbaZMUFSS9SgxZV/CvUJb7gfAAxDDHNBOjNhmDyrEUDeHqH2QYRT65nCHBmApDaZ9NtgmFCkakSSA0HZo0fAu8zeXdggZ4PVxR+GSpTZ0KI617i+Ss6zcms59/Y/FDKQ2sXRpNrTpblXk3NULpNKz6rg7Ps2ms8GTwKnifDZNy83uFewGM2T9XKkebUkvY3VM/dM3qFPb3HYqZ0XYjYvmwFamYtDplic/ZZnKGSwM+Lcgxouaz4qFMZJKCdbM6zjLvdcsMcFYc3DNl4q82lFAHZZFA6isDMmN0ovsqVWO1klMbsKu8Bwk2DpjI6PUE/IjrLEm52N90aIv+w545J55WK+d9bQiXlen0p+yx0/19g03VaalBYludbgJcQl9TkCBbAHicUk0TunYk4rF9XLigPylQnB3T3owEdRpnumbU5/QqnuCuE+x2aFoXtZo6wgu6ysGl1D/qpApsCJdoXh5D61c8LS4J42mHrllthOpA+yt6uqlc/M5zA1ESNNdHo/jPuTlhgvMg9wUK82DLRmXvs5K69QfUxjyTHV4mkMvdcNCyTlZpTvsKZnlNEvUIdm/KrH5r96NYE7XGVWPKKRSqoAVYSn4qb9pzuvBdCxokCI7cM5l5dgifFkkqaapfs4AUTnM/V+f+QYDkuMeZEtr6r+ZzoL01E8iFf40ZFkbleDg4703sx5L9nVVkWe9jiEYpsA9TrlwZvqXSjND9W3dk6IO4xWDfiLesJpWgCHiHwla3Ps1w1b/AEvsAVo+IhbVMyI/Ok1ogTRn/g+VHkDj6AIjG3SuudDi72ooxOGRQ6MozqSFrHXbFl5ZzNBTxuL2rsEJyjoKCa40y+ViRn/HTRsABFE/hZqq6ndotFNHTt6lU/7yuu8CoywIMWPXc6Zdqh+GGf6DJvvILjDrYF27DvHIlEcMXJ3oaIwlEldzJJ/vNMfcxl13J+8IT2ct281RGWtsQ2E44xWD1Q4a7gemJKbVGjhKRtcoEDzDFDIhI4A0IwrKQTz7ycz1s+cQ07lMU43+AK4yCb3II+iLCE2Awj6Z3n26l5K9DlIV1OZQTAvFcS4YVMG0x+hMGiozzkP4HPg7IIEuwz6T6CY7DhmsEANSZzWfEIfXmfd2V1AytEnzebVFjmKndD93fWKBUNjp2zTr6uL076ESXUTLk/641gisB2JLe8Ly1Vm/Uy/m1SM08gmPq9KoP6jFSYrjbtqEJ8647LvIQWXkPyxWEXlB2ifBQWWsr1shMiKJoJns1Aj8nnTqg6tqdV3H7ksE7D9WPUiOohI5WmVFwhTl2sLMNvi4P5BHKsTcU3bAPHVmxgCQ== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09038e8b-7044-47eb-0df2-08da3439d62a X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:03.9238 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AKpk7BtU9tMvK6qu14N2CUAROSjc9GG+r2I5mT+JTn1ffVGW3EIV+T+OU9zMlTGGAtNC8lLh5pnQGzJDI/PYpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4721 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Currently the driver assumes that the size of the reta table is four times the number of Rx queues at multiple places. However, it sets it to four times the maximum number of queues (4 * 32 = 128) when it first initializes the device. Change the other uses to use the stored value, not the assumed default. Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index af4a1a1b40..e2a695fa88 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -1480,7 +1480,12 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev, dev_info->rx_queue_offload_capa = 0; dev_info->tx_offload_capa = VMXNET3_TX_OFFLOAD_CAP; dev_info->tx_queue_offload_capa = 0; - + if (hw->rss_conf == NULL) { + /* RSS not configured */ + dev_info->reta_size = 0; + } else { + dev_info->reta_size = hw->rss_conf->indTableSize; + } return 0; } From patchwork Thu May 12 17:06:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111081 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 43501A00C3; Thu, 12 May 2022 19:08:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44AD942855; Thu, 12 May 2022 19:07:15 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id C341542831 for ; Thu, 12 May 2022 19:07:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ThIH9GHA2SEZGuuI+59VShS1yOaNTa6U1E1fDFjSZvzSwWLk8HCC5aV0HgYVlaYhUIPyFr5GRM3HouT6CNzsGRdz3i88KZ+zpthxHh21AqZ/qVzoXl28f1m2W3BFhzcsla3J9W9OIT2sRDwhkSOPkOYZXIV4eWcucr4Yi6ywHRChXdZkVDLeneiHX6lAWPcy/s5BLvSBWBucDkBM/PC+0gSlVNxmxwB+zkX/CiCIDVUcLucRi+egeCk/oUJUU12xkabOylYOKT8wnK7lm4w3oNR+oGY5uSlG+hUNizYP1APwrhK/sKOIkZmpG/QWAAsg3EBy+XBuQIbjZdvf43MkKA== 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=qiGlPiWwTFWRjKydROO4flCwFI/15vBXJ8HAX5j0tnE=; b=L3Gn3eIUUb2ITPDc/SJQQOZTHCxPj5SYsDEj46CEXl6m0GtYHZYb5OpAl38uBJq/EGSgFTbTb+qGIdSlPGuaWzMIW+0pb+n0S7fGFD7AC/jVc+4vm6cTk/CE27hmG/JWBlytyfcQBcVCoGaxLu8oPL2AijqQEHduhCgTLGz7IauAIHfTczW49d+cB792sj/ncIIvFe9kvGYTZGZOr+WgmHlOK2yht9LI/Abe6r7pRq2slqXOY3ghlQKIwl3hCGnUqdhCbtgpu91gQZLckAnyAkbrBHWKsK5d63zFeuwA8vZeFV59UBJxeHkoOAq8eThhd87xstPOOaMChr89SnlD4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qiGlPiWwTFWRjKydROO4flCwFI/15vBXJ8HAX5j0tnE=; b=sqdma4FSnUt2FdvvJSP2Bsml5F95Ma/Lk1z+jA736l82ldmQRpHXxaZmu517Ri4VHqtsWwFXX2ioqMpRPuLXvTkNQ18DurdKm2TSi4JSPFDlvLjJhAXT7pW47Z46H2/k7ydajS8dWmiBjzFSu1RMCDd5kxr1v2NRlS+HHA6W8KY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by BL0PR05MB4721.namprd05.prod.outlook.com (2603:10b6:208:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.12; Thu, 12 May 2022 17:07:06 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:06 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 7/8] net/vmxnet3: set packet type for fragmented packet Date: Thu, 12 May 2022 13:06:41 -0400 Message-Id: <20220512170642.28930-8-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: addb2757-fcc5-4ae4-6c52-08da3439d66a X-MS-TrafficTypeDiagnostic: BL0PR05MB4721:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ROvL+4VRLtM7jvG14h+hs3UO6fziabyslooiZqiJOvMCYylPHF/nZL7+wpd/J3JaG6ADoBwptIS97oPSjZBUvzF/0UHdmRw/4DlSLBfYCl/xqaVr/krYsYx/vE18sLd0Y5i50+MwhKdTcA4KHcbIqAsbLBA+wvYgHt1qWSOh/8citmMBZc3fydAAFo2s3SCafWSDLI1BoN2MadnWnHER4DtFbEAU2k3vGwN8BWV++c8xk/8hdsuNEX3iR0bDq+cUrmpIatFh4VjLMbW8tDYYWvYBuTbIV1uuM7iucJvKOtExXGcJuQ+QZEAe63HDxiwN9KZ2SyAfb9/XqYsVdkc3z4oqQIjq4LHaDb7TxpDnUmMX0yBiQtGl3wjrJeBTKp2k8AKBQkSupQOZ2y/HD52km1vwASbUaj7FgwbOumiKjs1lP/SSSWK2r4tnIXBmu1t8yzrrTga94HPX6J5694VU5I3I31Qi52f/QnPEwVcggAmD6uKWrFn9c9nEVpX+I56iezszvMa1xKCb9rYtDk57T+Bs/BSolkEmP9KVknUAyWZnG1pKAhECHOtvAxZdPhLaejT5Bn9HmM4KL4gDAYFwt2Zop8SEWAw7QC7ScDJRxkKq63UJCEVOmDjgeMLSvvSLm8QaUh4iTPEJzaX2ezo8dSXKn3K6J/ZBdR/cchfrZP3NJMxMlLHKNKYoifebeDHoJ3qPCuMHomvcqAoy2RF4+g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(38350700002)(66476007)(66556008)(86362001)(6666004)(66946007)(8676002)(34206002)(4326008)(38100700002)(6486002)(508600001)(6636002)(37006003)(316002)(1076003)(186003)(107886003)(19627235002)(6506007)(52116002)(2616005)(5660300002)(26005)(6512007)(8936002)(2906002)(36756003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n9qkVwA4ZJHfqbUxGZr7ztG787LCitvIu1OlBLH7h8WgvgjyztR4sJZ3vqh04AvYmFPNResT0eIjKh+ZWF8nP3LFiHhqAtTDcCwbFmJsOcGhZdHtUq5ZUZ7mrg38zl6voTQFk3CkmtV/5edILZhohM+kIp/yLf5oYF0tYAEFZY1XxA7Rt+CBOav3t3oaps6z1UmHScuGMFduv9XZ/yumVD0AEckeD6V86JgzGfheFkmnjAKamiCDyHJeMJTeCCCzu+paPCfjTJKLwHP2AQiXHOcy8Nj+Pv5K+NwfD38O2ud2hjevx8mWMUE+2wu6MBhtOJaQoeZsL2gjfHxSB7QK8OSfZznloITZlXwlEqcRLuIA1zhIHRw80ayXe878gnCL8pqXpTH5FqHcpk75l1FfUihC/sDOZu4ozcwD1XbtpfGo7X7WBxcCfNSsN0h03XRlYpE1byMt6CPVhGdkV54PIFoiP9PphLpklyO1v9dpW8bJzP6Yph0X0Fj3by/ogQqPhrcYUtK6RBkTIdkap/F46EGxFbVnQ0FePnynWKGZF+Q6AZtJinkCue6QSf/+t7FOZglyie/TZwUwwKZBGoQX8LHAx5mUncg+1OmG+jteE9VAm/+3oTYPouA5xIjjCY+Pm88XYbVsgq0g5XtadmeW4O0KTz0enoHNBXkL8/4S46IVCDrqDkQ0bB4LFNHAH3nql/B0JtCGtkC260Su1tO+KPTdU/3NnQ1PKN9mnXWPnAmDAvLJUMVkJxuMmVeGECb6TrrMa9cJyMzhuQTAWLuH/Sm45amupvxdOIwvfJqF1I3gLh276wZOUaDAIwrqyIi73N/iT2q8hQiLLbNibUh6NqOqQXqrAkHWsH2LnSy+BqKK29rmXJX7KejK6uxoaveAakbuSpu/GGokMZNj0Qbt8K6VVtrHMAsZcbcYTrlQvBfhJkzSVRvl3rNVZ3okYRPNDcMgcrnfsSFR1AXY19m7FGExGqwB60/RBulYxvrTU+Hs60DAOSANbsJj97SGhfI3U6s0i91tzRgYKrE0A5gBiMv0dyKeLE663JGNegaUVuoy+aypmhlinVTnXcsxqWEEN0lEojPCGxr8HU7Nmau1mRFge11UmgcEUPGKvXugBdiDVKyo1tZlmRp1DsCobA8KZeWkzjBtOO8eKJX8C2P1ViRH5zEETI2WOdtATNN4eKVz3LEOQ2mQPOlYKlndaHGuheQtpnRujAdJkj9LE0rhU4wwgi0R/myeg5pKfg2jAcXl3nASZ0aQwGm2cerav7tNm9ET4wnHxPb+cemmOfC58t4xm5Pdm4ab3E5tdvE6ZAERgr3p9sZKHNRT1t+PuOy8IfqAltaWN9ASZF3VnU9p6jDeDCrzAq3vsvJ21gMJz9wvOSjqb8V/vQUaQOqsObS21tkysnW8YIVnQpClfr0zRPR1w8FmEp/SLOmOYXm2kY27xKmG8yGTrErUK3SzPggmyYZpvsutrcm9kGzTQ89rL6U8HnLUaKWe/geyDNzhiJIkjx/nmv9/74ieUEBow4CDvGAomvLQ3hDvvC/6nIsLJaJen5plfuNp8Z1MyPRviq/UWora7c/U0rVPgWoOb3ICNBmuHDHHwBvNMqN7d4OKstZV5TvI6AETjcKS/RCQJEFCYYpGg8fakvKclSdyyqLjJligjAABKRKpYVf/fp1JOE7WZY4JWHQ8ce19pUmWiSOLEkjCkkSAK7vhot/zbV5irvd+RdBuJkBjwBT8rs6eZQ== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: addb2757-fcc5-4ae4-6c52-08da3439d66a X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:04.4706 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2OgsK1CNdHxM2Rs1ZM/HUuwBWSxsZO5cXYDMC4+bHup5R9YZszA8R8HGHSuoBZldaxqT3N0x4VhWxrNgAmcBqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR05MB4721 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The packet type is set even if it is a fragmented packet Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index c94e3762e6..a875ffec07 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -759,6 +759,23 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd, /* Check packet type, checksum errors, etc. */ if (rcd->cnc) { ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN; + + if (rcd->v4) { + packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN; + if (rcd->tcp) + packet_type |= RTE_PTYPE_L4_TCP; + else if (rcd->udp) + packet_type |= RTE_PTYPE_L4_UDP; + } else if (rcd->v6) { + packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN; + if (rcd->tcp) + packet_type |= RTE_PTYPE_L4_TCP; + else if (rcd->udp) + packet_type |= RTE_PTYPE_L4_UDP; + } else { + packet_type |= RTE_PTYPE_UNKNOWN; + } + } else { if (rcd->v4) { packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN; From patchwork Thu May 12 17:06:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Gupta X-Patchwork-Id: 111079 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9D599A00C3; Thu, 12 May 2022 19:07:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9B89E4284A; Thu, 12 May 2022 19:07:13 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2045.outbound.protection.outlook.com [40.107.100.45]) by mails.dpdk.org (Postfix) with ESMTP id 4550A42831 for ; Thu, 12 May 2022 19:07:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l7CcPxyv0rvPhHSWbKlahhi2R+NNvnwfd9yUPemuHJWJcGBf8kZ97UBbltPNjG7fJt5To3TyppBfK0D5LiIZG/bMuue3hIBbWe44knm37pirI42oTS0dWFzgIuHNlQyyGujJGA/W39RQQaUsuNjES29vcGQoakq1DUO16CxaUnKKgyh69cMAOzoIXfR0BUaz31f5NGro87EU2n9SMpx/6IBCWHGFB6cCuXR5X+Gbq2ZX3PQlv+k3874Bwq4l58sPrrKheaWZ/U8qHTvZ2jWVSk3zfDwcOtFU1cJHLsP9DdqfR5jMG6NZ9dHaDFJPp8iOuPK0rS5vhn0kirSPoKPT1Q== 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=4Gb/omVoKJCP5vECiW/thOHPpcWRcWpSpV9EmPaK/xM=; b=YvFrudFgNaCNDviuLVGZ7rGj62m2O2mn1rwbLLCoN+0daq7/qzckPkGt3jg/YMO0fUCbvxwjlr2y0bBNins8KKTIVaDYjX4G2MUi+gbhlQqZueiaBP4QdH4pXAyP2dvEl8GAKlYroPTEcNm9OyT0ODWr1vaA+EVcR4oXOHNhAOr/hSdR/ouuptyLX6WcmzdK88AHGl+/QF+y1y10F6CiHD4AvNh9/sw2Z/ymJhwQzcCDpHARNPCC6NzVVOQWEqJDRJNpGUAyWdFbYda7a606iyKvTwLt9ICDiJpktPZCD234qBuNAmzGlUG7etyUqz+KfkYluRckiOJoYxZrg8U7GQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Gb/omVoKJCP5vECiW/thOHPpcWRcWpSpV9EmPaK/xM=; b=fHJf12h8IlMXNq0bUtmYnOuk1Qmpz3Y/NPc+UJTlC2M12AO6qZfLuPjAuB/Cpgy1VR3rVfYlNtW8No+w02f4Ywt+gmDqveTYry0/YsaSvCrCdocuhyZ1sh2Nh0xegKswvNa8QVjAEm4drNPd4M4s1DJ5b6+3JnICNv3NeHRaL9c= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) by CY4PR05MB3222.namprd05.prod.outlook.com (2603:10b6:903:fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.5; Thu, 12 May 2022 17:07:07 +0000 Received: from BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8]) by BYAPR05MB5624.namprd05.prod.outlook.com ([fe80::49ad:2ac7:16c0:51c8%6]) with mapi id 15.20.5273.004; Thu, 12 May 2022 17:07:07 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v5 8/8] Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt") Date: Thu, 12 May 2022 13:06:42 -0400 Message-Id: <20220512170642.28930-9-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220512170642.28930-1-pagupta@vmware.com> References: <20220512170642.28930-1-pagupta@vmware.com> X-ClientProxiedBy: BYAPR02CA0014.namprd02.prod.outlook.com (2603:10b6:a02:ee::27) To BYAPR05MB5624.namprd05.prod.outlook.com (2603:10b6:a03:1d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4b55a8f-7217-4825-c8a7-08da3439d6c9 X-MS-TrafficTypeDiagnostic: CY4PR05MB3222:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yuC6C9JyPjaUdOeR+VRPgSMnU2f8VwJhU+iXAyE7ijBRHOH0Mqt1WCfNueSVfw41WbV2uHJEAwQbJjN9LzR7OpbfaqBVGElDAvoXjJG0eG7GP+C8oYa1QlfpJhsIk54YxYexKm+IEvz8g90Vov8bSX7TaeDxcZbD/mRWe5oHZiTwulJa6VxKC8EItll0pVNatX14RDXmvw9wsNiCxfoLStrSYM1MYUYQi7dyvBI3TSt5bAyPVXLNqdUuqE0Vt8f9hyMfPJogI0tmInLo8PAkmjkA1mbWseCXbGJZfthzCtsUFtP9wl1jyaVUAp9G3KM98E7c0UsZdTj7gOBL08LYb1lUyo3KnuY1BbF74330LW9jJ8POx+nt2arw27iGfIae8oGEGbHpdJo6dGwcMRj75qwPGexd4jPO34SfTMsBw11UPocbujmcEdND4QyjmDYudJCqFdOUb0JQWC4hZD/Uy4ArqVMzY9RPNY+4wCLzCEn9PMuS8geJO3oc/mGdKRLzTWjVRpHRC3y8HDf5DLxjtISjZN7QsMH4d6NTrfqb+WJrYc1mpuveNTeuql9Zm8FSjIF0PgZPsAz6yAYXD4h2FrHgJoi0CTkc4fcqyzB0+IWyJvYlOKreF8SzJdIIK2dVbwmRDrvdnLatdR6K8ggo/ywPUpN8b97OapoKeroJETHGMe+bc+ArTHZvVkUwhOtsx8Ep1dqs4RegIiJ2WwY2z95BKBVaI0dOFtkAIzs4xw4OdVhyU83auoKxaMbantex X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR05MB5624.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(66556008)(66946007)(6506007)(5660300002)(1076003)(34206002)(107886003)(83380400001)(52116002)(8676002)(4326008)(6666004)(26005)(66476007)(186003)(2906002)(6512007)(8936002)(86362001)(2616005)(6486002)(508600001)(6636002)(4744005)(37006003)(36756003)(316002)(38350700002)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oLppyd0oJGZk/+IBWE/rA/xbnDrCGwtZk6BKxexfo98PqYshCMfMfFLYB+TZvDVNlc2Sii/cJkKD88F+EuCLdiVEKu+rIs2uUPwGjnXPGp2tQURJhacIgB9J/67OfK+f5oH0IUoZXr5iDlfjDZpMRcNpNLMDiaToX2V+C5OY82aq5QRusIOlvxFGNA88gYQ2JokhXHdKV/v78qg4H7sWbru8LITl8YoTUSEYWuPrsoXsvLGXjOHET01rLFAlhAl6u5r98MB7ZmN+ui58ubmOZGVnrnD/VjRSR7zp2yN1VUNzSjAA36YxFlVEONvN2rdB3/Cy/PT4xGhJgKzBlLQlM9WxwztXeWoHFVf+zaopK4Rq5buevPVN2707zGwNzKLY3d79duuzBKRdYiuDy4E4R2RysTe5EiFAEfaecs3KzuzQZRPbwDvEF54JXidu5dNwSl81VJczSBdgt6ckdoyschcpoyXgERqgeNUwitKLCfypwOzvKvHj/Wi/sWcmD+upBn7WjYqMvawbtJSP/fiFy7LxPR/6zw+hnOhdGIHfO98z1CGpHG9WXSsO/vo0BUqhvR4fEtcGHKvt4+ymTqn4yHr10F4FRz7LR0ss7UlWf8/17UIZFhiElmG8x3qCizoA3AIEK2rYNmDXC2TAIcEm03S5HltZdjwIuG6xxjvlunm0ELLZkedNethmN8HXZwkdfyOepruprTva7O4moDoOSwV8pqIRSpJS7y7okYudh9HgO4nzr6qoc3u3bcuXCNRyy9RkfN24vIiM+x4gMJezle6UQFPipwyEQu1sJxviXZuAYZKAEeit7PA/9x+5MexE1klx80sKuAvfBzTpDQjghIWx722vKswgdd/urgyMfEoHcC2lWWE+8jWiPvgPKv+yehzJeyfgDUyxz4LkaJvQnv3H0a4yX7ogUeqlTbqaD+Iz1+YfGKjc9rfTVgalabVQX7q5v/OuaumVIdP+5V47yToDNXaNvVvVHIMW2nBvIBqD8VtspKPUuMppR7tZnFB9NLI/iVb9366/9Jk2Xs9dGLLtmwt8W9kXcLbBeTPb6Brz/q7Tl+6FXZvYa5rjYBa7vmGxXpL1ROHingKn58PsdC7Dt3l6s8hEhVLjCv2TGZ3FKOf5Xs9peD008a2k5rRoH2/TNAiPfnHS0HscMBJsnVB/vGsQKlIfzFsrp1hIvVqZIt8te/gs6n86wQhiPJFwKBb9KV4wFaRAGYJfq07kHh/pPcdUfcehTPcCpVW5Qnso1K02jsznSFuDyf/CXsc779NdxKkuhoH/+nJq39scQlIa+kEXcloVYSIZPvVqnYXlVa1h1S6MKchXa6vNTmjSIVhspBygVfjb38V6xwZUwH8tGgP3KsDid/oubFz17I823qanFt9VTjiQyuAdev6JsUEgLEL4D3UNndgSuCHvNwXZKx/JtsTapf0DlP0pI2F5vzwc9j9H2jyTjPy+mhL+wY1Gvfb57c7IbCeZafEGo9PsTkhDaKqSKhBl0oF2yAreI8daEfkOtubkD/kNAXRtTcWaA+V+j0e9TifkY9CVrRzxXch2PNFMEL0iHIW+gmqMNyJCwHxpw92UaaMTZMPp6Q7vx1/FcWDWYpB1P9yKAlcDBG3eB9t1Jr3/ysUsuAl4MBNvXkSKaEgbxCVoaQ8btsiBvQOO5lxVh1cQqh5ogtIH94bm2xzu+sr2xBabRYqhY5A3/nBlSXwJq9Zyr5mmYsshFwelbGMuYLMKzrn17A== X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4b55a8f-7217-4825-c8a7-08da3439d6c9 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2022 17:07:04.9237 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: s/TcP3qRA9Ivms4nPS7xh2oM4rle4rRAaCp1YuCpTg6AHJzhlYQXR1DIvpusebkx8r8GjLB8j2BTb4CDgmMTqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR05MB3222 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Fix merge error in initialization for rxDataRing feature. Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index e2a695fa88..fe999c772e 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -876,6 +876,11 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) rqd->conf.rxRingSize[1] = rxq->cmd_ring[1].size; rqd->conf.compRingSize = rxq->comp_ring.size; + if (VMXNET3_VERSION_GE_3(hw)) { + rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA; + rqd->conf.rxDataRingDescSize = rxq->data_desc_size; + } + if (hw->intr.lsc_only) rqd->conf.intrIdx = 1; else