From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6DB94A0545; Wed, 25 May 2022 02:41:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 198A242B73; Wed, 25 May 2022 02:41:05 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2070.outbound.protection.outlook.com [40.107.223.70]) by mails.dpdk.org (Postfix) with ESMTP id F3EF6410FB for ; Wed, 25 May 2022 02:40:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aw8lXZ+Ts2o8ice1kiw9Dvga4lPfE8GxKZvJ7Zv6Dx4NbXrJucnHJT7MtLsqiflsir2SXPl4WVnYyJMlcgEGKJGYwkFFlzzq/uwWDGDX/WsPWTSrr7/LIAa/Pgh1PmbdowYu+VJUgEx1j+QpqwBncrn2YWo6RzZmssZAQof33GHjDsbgnR5T7L3kOKKp3F1OC0qkCQgFj5un9B6GAQvE4eBC7ffk5lzeLh6Q7dM8DHoQYVhS+oU5DI9dXgF6Qrm4D986m5br3MLQSAPiwcJHlpJd+M9GowBTGM3QlmhpSeTTg+rMGCZZRoH+T9s7hEEsyDPKLPqeSMi/r85Ii5p9/w== 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=8rIFgrWj9Sl0709PZ6gJGluFlXPRNIZ+3gBFNg1M0Zc=; b=L1/735TGizibrTXTFUnIUxIE1DpwTGrY3PSL21dHQSQlkHjcuHMBVnEn33WaTjEeO6TDBXsR/N/trxAG9SUU+UxUw8oeZ0clFsBpHYcdAxq36lc9mE3hbfIZ4gV2pQTIyLfcV+HFvuwY2+p7DuBhoulXZW77j7VCxSUS8uZxXswGCDypXCQr8v2YdrV+W4USR0wrOjMrUKWHMlUA7JqLcsv0VaQVmvjpSCyZg2XTf8zzUGxUuQKI5OHrG1J1VJvHYbCNYR3DNj7OI2YyyZ/1EmU8z88ARzoneOmIc64wnC1wZ5lmnGFRYENGeFdkNcRSa1WGALl1uJtpbyn0K5LkRA== 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=8rIFgrWj9Sl0709PZ6gJGluFlXPRNIZ+3gBFNg1M0Zc=; b=mrmqJy01kFUn7uarxAYpnN09Z7wdXPor96BBfmB8WqGMd28Ydp5XRkWro8iSHhE+G9ymyaG6V7gtCQX3heS+se0nYyLy8HodF33rhGH+NvQzRTUTrCKE3RIo763rUneSY/yrnuA7M7iUrHC+B6bfUCfRMLTII4H+0YBj+2h5WOs= 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 SN7PR05MB7534.namprd05.prod.outlook.com (2603:10b6:806:f7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7; Wed, 25 May 2022 00:40:51 +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.5293.013; Wed, 25 May 2022 00:40:51 +0000 From: Pankaj Gupta To: jbehrens@vmware.com Cc: dev@dpdk.org, pagupta@vmware.com Subject: [PATCH v6 6/9] net/vmxnet3: add version 6 support Date: Tue, 24 May 2022 17:40:25 -0700 Message-Id: <20220525004028.24938-7-pagupta@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220525004028.24938-1-pagupta@vmware.com> References: <20220525004028.24938-1-pagupta@vmware.com> Content-Type: text/plain X-ClientProxiedBy: SJ0PR05CA0056.namprd05.prod.outlook.com (2603:10b6:a03:33f::31) 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: a67edd46-6d7e-4915-5a9c-08da3de736c7 X-MS-TrafficTypeDiagnostic: SN7PR05MB7534: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: Osdef7CoQfZNykI4WAErG/xucHM3KgNFgVS9FVlLkRnTHapvqb7VKx8FpWRTujRUgdP8K8VnV0L/puWKAVypVrqqFVHIRehY/aBeLyjsF3kug7zj6LZsMS2b0ZLg9lkgBbEHXdiKlII6NgFegTMTD4ULf8qR4uAAaq6OY1N+bIrpoustMXHcnLSvVU+q10pywmS43dh7JvVjQmJKdvWElwcxQvuYY28X5cxMkswS/cplNPsuLMZWEsSzewgsl8XBUp6FgkHKvIbc7rYQVmZ3EBfgTcKhDypC6xcoOwXvK9gvdtLNuUz0Es2/GBnoyxbon7FsOfiHyZSuJ2fzBMC4LUB+VWHapkAW+csJL3J25Uk2Gh3+Axh5p8arztoBnMi7V5U5lPEvRjaoDMFyJUWJRjf5nvGMF3wFCtiNv80zjuHuOnErsE/uR2T/RVVWRgFyiudPFsmcFIkY4upP7u4NKnwCKrnk7mvdsUQMEM2nfaiwz0MjKCl5FEYGNurVMKI4e8r9dcMQIOLOpozXPz+ZJDPxJVer4V58Q9cak4w2N0C1s0zQHjdp3HRIRwRpkzMsen0a1sgPz8zqtTBq507JSqfHuH+trHc79D3zBZ2btqT6iW6NosaiCJVXvzxv7DMGQGPM5sU9Bxwx5AmUfLVBH23KTExz0lcV5uCOGDwc7I5+tzbzb5RJi9e4eFv0k6EK3+0LvoQgfqf+W8JfGQjOrD/3YGNldVUFfV6lyGmuA26TjAC4heARcPYPHBj0vXi8rOpK7EJDUCp6tU/Jf1O6xQ== 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)(316002)(30864003)(38100700002)(5660300002)(38350700002)(8936002)(186003)(52116002)(2616005)(36756003)(6506007)(19627235002)(1076003)(6486002)(6666004)(508600001)(37006003)(6512007)(6636002)(107886003)(83380400001)(8676002)(34206002)(4326008)(66476007)(66556008)(66946007)(86362001)(2906002)(26005)(21314003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ONHsPZjE6X/l20QiWI2a4yjUpEQV/9s7u4YcVYlM5HcEA3kRjFhETmLIt4nP?= =?us-ascii?Q?jQB5MnEoL/NWEOtfDNx1JG7j/4xQnw7nuz+cit06Z8PhXlsg1u+a11t510jF?= =?us-ascii?Q?PSYbKDUrTiwTuvPc4i2QNf0S/zC3tNCBa+1gcHaolk3f2oI6txmsQdQGZNP0?= =?us-ascii?Q?dOzmttqGN20w5IfZVcaYfla8hUX+FzuCTsb+GrB73nPi2aRpimpcNG3M4iYA?= =?us-ascii?Q?N2jKrXnNKAxj4DarrdeiOWnSUVC9shRt9IXMTrtV/8f7UCXrFPhRT0IpA0z4?= =?us-ascii?Q?zCspFNJ+5YOi8lbKBBAwUQB8Hr2Q7MY0TrGvfveTsuYYxi1zu8EN+K+f35lm?= =?us-ascii?Q?uGC/iEVDNpZWoGEqcrmiBl9ZZLhGV1ILSD6IEg4BGWGHw8ehts+wpKbKJ3r3?= =?us-ascii?Q?bpwQjrCqZGwFfvB7WyKDnvDUSby96DCV06/9mVjEyl5q6Uel5DHaf/CLAa/l?= =?us-ascii?Q?+lO6Usrs+UAWyxDzk2YsqiO+3d+AxCs5qXUi6/+3AoNIeg+Fc0EoW12L97BA?= =?us-ascii?Q?zm45Fl84K08QTXM0F0Ckv4xt9+1oFIQSnfC9Xe4KxntGwMc5aAynw34zbv/i?= =?us-ascii?Q?56e0+sNY5rgualNdbhX/789Kw77xfDGp/jFxmD8vfgj60ZyjFlv1HIi5bMmn?= =?us-ascii?Q?uS2BIERj/Wc2xzWVsJoq2Yw9ijy1vqBtmhXuZWL1zplZo4JyaSJVsc1FB103?= =?us-ascii?Q?QxzmQ/9BVxnhF6ebQZCwziL9dsXI2AEg59HkkAq68ig8U7ZZ+Jtp61ccWeZM?= =?us-ascii?Q?bIVX3UWhww62em8WHGpjnhFlXdsZBkRV026FT/Q+j65XaKlArOY8EOVEfhOE?= =?us-ascii?Q?FahOujC5cHxa+hxWWI3Og3qtMhp0Heg+fVYwQib0AzMhhewrLjrbUBegVyEh?= =?us-ascii?Q?to/OO7xI4R2ZwiJDbzyOeKRe5R2zaz4FNKG1+SjOqqDOQ/KLZ65S1b0MOT9O?= =?us-ascii?Q?eXTleFe5SUEuygcov2348JNlkieBhd3xXB2jFIsVmMbUaNlPc5DcPN851nVE?= =?us-ascii?Q?oeSEHLzUlyOpjsQJHk1aMbSOA9LmoO/hEkcT1eN27PO0uBdaX/m4+TWBbwnn?= =?us-ascii?Q?VJvNkVFlWw5NSMTSff5WMQ9kDHQNIu5/J2jda4Q5G0Zqicw14hri+OuCCoJI?= =?us-ascii?Q?txDD53MVitPOGpuzU6enmJSgct1kyhYI8s+7O1XrVY53v1zE0ywoMZurJk6t?= =?us-ascii?Q?uJECQm5Eukw3Jmn5NtAhDWQCql80VErE+VobJltP2LmEFcMJiqacR7ufriRf?= =?us-ascii?Q?nVc6EvxpPYcQ5hN5jbEMNGwyC2yvtORQWJbLd1zFIFJM64XNdH9MQF+T9/BD?= =?us-ascii?Q?1dm7w2BH0VeZ81pAEUfFl+vO3EJUNExP8cpGaWcJXgpi/gruJtoaEP+MPNxJ?= =?us-ascii?Q?/s3mVZS/1NF39cHynItCGel6mvWx/qc1DCXu3Tjk8SwKCej/nRWA/BQQZr8u?= =?us-ascii?Q?L7otLAzqbGLsQECw1dHRPL4fc3lS6MRXUWsbSPK/vTgpbEEZBEDZsCjfeVZZ?= =?us-ascii?Q?lOdehPUAIAkTFxUq7vp9yRTmNxp30kk93KUWlmHVYKCIjIHHR+dNxNSwYUSO?= =?us-ascii?Q?aGspn3wdVGUuWS/zVrf34lKs0FvsGJRmYyKXCTUyD+nbAzDK/172nPTPprgL?= =?us-ascii?Q?7Z9kzz8h8pSm6HlbikurAWaOxrc+IDn3KjcnbDeLNGru374EhcT0xMgnRfMY?= =?us-ascii?Q?QRoZEi4N0Z1+qsber3ip+QmpWMTO0IRbIZbiiSee1PS0wlpMAMwMoKc79fis?= =?us-ascii?Q?ep6S7MmEPQ=3D=3D?= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: a67edd46-6d7e-4915-5a9c-08da3de736c7 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5624.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 00:40:49.3839 (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: slB6Kgs6gU0JJxVb1xp2/xKYAYmwNUdTnEowD2QDA30rYwejQGyQefyIpYu1QwxZaOZ+XJvA/OQ2CwpzKnx/CA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR05MB7534 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 versions on ESXi 7.0 Update 2. Signed-off-by: Pankaj Gupta Reviewed-by: Jochen Behrens --- doc/guides/rel_notes/release_21_08.rst | 8 + 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 +- 5 files changed, 234 insertions(+), 79 deletions(-) diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst index 4027bd4390..810da2cc1f 100644 --- a/doc/guides/rel_notes/release_21_08.rst +++ b/doc/guides/rel_notes/release_21_08.rst @@ -133,6 +133,14 @@ New Features * **Added RETA query and RETA update support for vmxnet3.** +* **Added vmxnet3 version 6 supports with some new features.** + + * 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 + API Changes ----------- 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 62844f3d39..52309811e5 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -221,24 +221,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; } } @@ -249,15 +245,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. */ @@ -332,7 +355,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; @@ -507,15 +534,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) + @@ -626,9 +660,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; } @@ -776,6 +810,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; @@ -852,13 +887,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; @@ -936,18 +985,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) && @@ -1202,8 +1257,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++) @@ -1305,7 +1358,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); @@ -1322,7 +1374,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); @@ -1376,9 +1427,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; @@ -1445,24 +1514,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; } @@ -1683,11 +1778,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) @@ -1696,7 +1794,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 */ -- 2.17.1