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 67FF6A00C4; Fri, 5 Aug 2022 08:34:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ADFA342C55; Fri, 5 Aug 2022 08:33:18 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2119.outbound.protection.outlook.com [40.107.223.119]) by mails.dpdk.org (Postfix) with ESMTP id 2CF1442C68 for ; Fri, 5 Aug 2022 08:33:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nrw8uYBiuLxksmuk6oL2QfWAXGjB96y9G/ub44K5upDRqrT1//j7NuW0xKaqSc477TgHIeKT5eGpU9HHQsth4z8HG1SS7YyqHXkuE+6oTP8IBlfWFNN8G5btLW7WO1hxny0LtfoTq5EIcfHAoW0sPChkjjo17PRnp1qnNJKi2y6O0kJI0YHEKSGT3d6MCVXqm3/EW+/LDDz9F/2Cm+e/xxd7tw3cHYd0DcdmXp6q4qqLV/Kq70/XwEAslo9hN++nUQPILnJGHVtWxiY86WOlEBzF8nDNladOPSB9RSzs/nYwLG2FRzOAwZGjvBs42Z7Im96oVuxsDX7o3isCiU62cQ== 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=XAt+KvckIFt8gH4alJ1spiMlO+eBjZxGf4CwzFJPYmc=; b=NZIVbkVBkdqBDKCp/LA6V8Tf2EZ8rYwCjYiY85NpX7Pb20E5v1hMz493hiNUDIPnD4nmQhPyJBLq8YlKBZfqysHoOKwbyV/7g6MgFC7ySzFATOMGb0fmPS3t3JZnBpper/Rsk88lUmgXk3/eDK4KDe9jA7OOPBFPLt/wDKdb0FS9TzmhU7w3zADq4pg0Av5MxsoPK6xkCI8whej9u9iPsJMCI/VfNKyVbljPlWReOTXQlah5YIWXK2Paf3U0cfsl/Dt9DLbMfT+1/FKb91mx9QS35Lt0+c6n1+6py0PXogDEO0lsknjuANAHdCx8zMQtRngww46vinTFyuc6hmKJZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XAt+KvckIFt8gH4alJ1spiMlO+eBjZxGf4CwzFJPYmc=; b=VvkCUMw8miSdor2FnJRnkKuNYYF5H8arX4W1oaHB55PgvAPquWgE7y/XmZrW2gz0MvTtKsclEDJhzVWRFqWk2hXSilufet6eIuD7cpfsjWtUBEVFMbOcgSo94Zph2scqTUmn8KsqaWL98NsTgFnc/RknszEHeLk1j1IW/T+ZpCY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by DM5PR13MB1772.namprd13.prod.outlook.com (2603:10b6:3:135::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.15; Fri, 5 Aug 2022 06:33:15 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::402d:6abc:83a8:2431]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::402d:6abc:83a8:2431%5]) with mapi id 15.20.5504.014; Fri, 5 Aug 2022 06:33:14 +0000 From: Chaoyong He To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v5 07/12] net/nfp: add flower ctrl VNIC related logics Date: Fri, 5 Aug 2022 14:32:30 +0800 Message-Id: <1659681155-16525-8-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1659681155-16525-1-git-send-email-chaoyong.he@corigine.com> References: <1659681155-16525-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR04CA0157.apcprd04.prod.outlook.com (2603:1096:4::19) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 206605cd-55ff-441b-355b-08da76ac5fc9 X-MS-TrafficTypeDiagnostic: DM5PR13MB1772:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oZVKjSJo+9m4WHXmWl6l6DMAX1ygjv0MblQOvNS5fvHh3mrl8BbpbWJHnESb8cErpd7AQJpYeMbNDMSNcSo4a1opNCmMWnB99CyC3uM+KrDYmAVOw+oCJoUxM/NYL4T/rysFI7b0r6Ce52knGn0rxkoyYuRDSrdGrvXqv0VwCaC2OIIFlOnyL1WvvIpdrCT8SVdZBtI9RiaB2jf76nXiduyCPIACye3oqM8lYM5KtMl18ySt+9N4F6GC1a5nbWNOlXkr2wQv0e1sD2sltWyC3GKKOM8jc4GtlxpfVTgB0w0Zry2rgiAjXVdebK+/HJGJi7+PBeaJfr0cXxlNgSAK8uYDvmtMaOiFriKCZxN1RTBEh/V/5V35xYq538J8KlQSjrFzrXR6Gij+4AfdgTVOe0nF9yZAgJ4o/HtZJ2b9HZcYfZ3ohGtKWTmqVolR2/vk6EgsSvGqptqKdkCMMNgr7WmIIMNVStyzRzSD1bjNb+v1u53flPu0lIzXlTkDYY3ty+u0B3B5yI6JBf+SGdELzi2hlZCcu30zt2sevcw2zC+eNLmbLI8oKlAGqRGXmyxIYo4g6uDUJbIxsX32H6uSGVVklCdiH8CbVxZPD0yIF89KhLcmGaloDxLaXuAPp1hSCr/Y0qixrNBOiBBpMLmaOmenMW51MrJOTmeq2+3b0xJyaug2Tgr5NFrJ7RCAkj85DHdM9HGjvo3Z9dP3g1lj0cux4Oi2bcVUxNyPrZSprZ7zJHP65KAqB+AFAIOQLmZeeCYotkqsGf0+s2YEjmgenzM/uy3s3z2AmoJyNIWbUYI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(136003)(396003)(366004)(39840400004)(376002)(346002)(26005)(6512007)(6506007)(2616005)(66574015)(107886003)(5660300002)(52116002)(30864003)(36756003)(6486002)(44832011)(186003)(6666004)(41300700001)(478600001)(86362001)(38100700002)(38350700002)(83380400001)(66476007)(66556008)(66946007)(8936002)(316002)(2906002)(6916009)(4326008)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cTh3Tm15WXdkdlBDZGlmRmtkRnVuOGU3aEVxdlQwUUM1bmxjUGI5WFdkaUxo?= =?utf-8?B?Wnpud1p1b3FwUCtRMXY5L0hRVFZuWURuMmlpSXJ4SjBlMGI0V3Y0aDFYZDY0?= =?utf-8?B?WFc4cldnRTJYZGY5VWpYRzBveTN5Y0RDYWQzbmliNy80blZKbGpuU2tKTG9M?= =?utf-8?B?ek41UXZlQnI0SStPRUtoYUpqR2ZnajBhYTMza1NXWEpEUU9Mc200OFhTSDIx?= =?utf-8?B?VFpzdFE1YjRLUTAvN1pNY2creTVtTzNPcHFXMHg1eTFqR202V3ZsVTQwMi9j?= =?utf-8?B?OURTUElKOU9zVElXb0FUZzlIQ2NhNlJ2T1dINUdRUm9RMm5Cd05Ed1RGbFRv?= =?utf-8?B?LytKdldISzhyblVoR0RCMnNCbTIzM2daeEVNb2FJSDhManl1Mm1OMGVEMHBZ?= =?utf-8?B?Ynd4aGZTWVdXVWYxdXFQM0R2cUxnM0Ewb3V0Z1lQblJpNXVBUlpVZTJvYWlp?= =?utf-8?B?NUxFakcrK2FSRmpMLyt6djJnOUpzblBTN1g2N1NlUS8vd1F2SmMrL0x3SklO?= =?utf-8?B?QXUrRlFKMjRYL0x6VUk2VVVHaUVKSm52SlNVbS8vaDVZQ0RSRkFUY1M0elV2?= =?utf-8?B?L1ZraG9oVWhSQTd5UWVNcUZnRnpzS3VtbGFSeGJ2NjNhQWhNcGgwTis3M1Mw?= =?utf-8?B?UHNFYi9jOUVBSFdobWNGaEc1aThpZHcyVmZDS2xpOSt0SjNvMG11cUFFNkVV?= =?utf-8?B?ZWNNUFhzMis1MUNhY3dZcVhoN1NlRmY2K3IxeHNDMDJ5SUdBcmlZajJvWit0?= =?utf-8?B?NVlreHRxRzVLcXdGZFhhTmtjVnJNZ3RYNDQzMzRaWFZWTW0ybGVRb2l3Q3lw?= =?utf-8?B?QUZRakttMEloQzhzNkYyUy85eWdBTWNqVlh4NTMrc25VYkphTFgxaTQ2UU5x?= =?utf-8?B?aEYwQ1pFZlhGb2w2OHQvdERZOFVLRjZYdzZYNy94akNOZFZ0Z3I2V3Bsb0RE?= =?utf-8?B?K3F6SHBKakVSOXFBYk9pSGRISk8wZ2FEVHlLczFOWnRrQ1RYc2Q2U29XbFhl?= =?utf-8?B?YW04K2M2cGZZb0J1THBpYUwzMm5WdjAxZlZNSGZlZHZTRURTR25iT3BjYUYx?= =?utf-8?B?N3F2RUFFdE5GM0c5VWRXZlI5Nk9iTVZKaEdmOGRrdkROeW5RMXZXRU0xZFNF?= =?utf-8?B?Q0hGS3B4Q3FtMXIrSDlRTjBWR0tQRUdrMWhXVkgvdUl3cUkrOVl4WmRmK1gw?= =?utf-8?B?UGdUL2trK3l2eVU2Wk52UEYraVBrenFMV1RNRU0ybWpKSVMvS093djlXck9P?= =?utf-8?B?VU5JZnZGY2pYL2ZJRnMrNGo0YUZBQ0tPWjRIQlRUamF5MmxUVzBQeGVJSnNY?= =?utf-8?B?a3VvMUtkMFhLb2xUOE5ZY2hpbGhQaGJvK2d2UXh6cHpYSmhuTTVvMG9KdHZH?= =?utf-8?B?SXBnYW5oMVdERkR6UmUyZHFMT0Zmbmc4WHdLT2t0MFljWStmSlVkVmZDUmlt?= =?utf-8?B?Mk4yYzRHR3hoanlwS2dYWkhWRTdXQjlIZjA3WFQ2WmxodXF6ejljd3N0THVS?= =?utf-8?B?WnhRQjN6dkI1UUpTSXNCQXBIRUhOcU84bW82QnBrRTNJODhrdXhQbEhSS3VH?= =?utf-8?B?VExJaEhwZkEyeHFpUlR5bnl1VEZoNlB1N010YXI1MFRvY2tNYzVsOUtiNW5H?= =?utf-8?B?MWMxQmRabGJRQVhPUjc1bHRxU3d6MW80M1hzTFNBTzVHUFZGS29OaUhPRUF0?= =?utf-8?B?SHIwaENiV1JMckhPZllYK0o4eU83M1BNd1lHdVIzSENrYTFLRkdQbGlpNCtH?= =?utf-8?B?dEIyZG9uU0JiaW5WRUlqNmtUMEVsVnMvejdaQXlqK0V2WHNNM2RxbUZsSG95?= =?utf-8?B?YzFoV1U2TExmdmQxMittdzkzdnFhTUlCRzd2bG1NblBQY1VCUWdjOHRPZndY?= =?utf-8?B?UnRMbUNxM1E0WS9PMm9pOUVRMHV1VGNqQW9zMDFHZkUxYVpHcFI4NzYrYk9M?= =?utf-8?B?d3ZXWEtJVDdBU0ExbDJIY1ZEVkpOamRTbVZ0NzNXRWREYW1nSURVR0llQ0VI?= =?utf-8?B?S1Uwb1ZIRllRVFpFN0ZKTTRKMGwxKzlZR3d3bFZBc0ZiMS9YY3hjbFNNdExN?= =?utf-8?B?TmlpYzJXWTI2d0F3WWV6N0toc1BPZjFiTlhRS256clZpajEvR0o4VHZRREVv?= =?utf-8?B?QXpHRzBKRWp1MlZvbjdCVlhTMkptNzZtWVRFWnJ5eVhsbnhSQnVlL3ZNYWtJ?= =?utf-8?B?NUE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 206605cd-55ff-441b-355b-08da76ac5fc9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2022 06:33:14.1070 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: l3BKeelI+DHvNgt+SYRebVJImzxd8Uz3Gyo8iUDedl+JgTBJYQsA51b5QLWMo6QAPRP/JcNZ4WjS5w2PMZxzXs6zbNcL6tn1k5xuxEdflz0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR13MB1772 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 This commit adds the setup/start logic for the ctrl vNIC. This vNIC is used by the PMD and flower firmware as a communication channel between driver and firmware. In the case of OVS it is also used to communicate flow statistics from hardware to the driver. A rte_eth device is not exposed to DPDK for this vNIC as it is strictly used internally by flower logic. Rx and Tx logic will be added later for this vNIC. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 385 +++++++++++++++++++++++++++++++++++- drivers/net/nfp/flower/nfp_flower.h | 6 + 2 files changed, 388 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 2498020..51df504 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -26,6 +26,10 @@ #define MEMPOOL_CACHE_SIZE 512 #define DEFAULT_FLBUF_SIZE 9216 +#define CTRL_VNIC_NB_DESC 64 +#define CTRL_VNIC_RX_FREE_THRESH 32 +#define CTRL_VNIC_TX_FREE_THRESH 32 + /* * Simple dev ops functions for the flower PF. Because a rte_device is exposed * to DPDK the flower logic also makes use of helper functions like @@ -543,6 +547,302 @@ return ret; } +static void +nfp_flower_cleanup_ctrl_vnic(struct nfp_net_hw *hw) +{ + uint32_t i; + struct nfp_net_rxq *rxq; + struct nfp_net_txq *txq; + struct rte_eth_dev *eth_dev; + + eth_dev = hw->eth_dev; + + for (i = 0; i < hw->max_tx_queues; i++) { + txq = eth_dev->data->tx_queues[i]; + if (txq) { + rte_free(txq->txbufs); + rte_eth_dma_zone_free(eth_dev, "ctrl_tx_ring", i); + rte_free(txq); + } + } + + for (i = 0; i < hw->max_rx_queues; i++) { + rxq = eth_dev->data->rx_queues[i]; + if (rxq) { + rte_free(rxq->rxbufs); + rte_eth_dma_zone_free(eth_dev, "ctrl_rx_ring", i); + rte_free(rxq); + } + } + + rte_free(eth_dev->data->tx_queues); + rte_free(eth_dev->data->rx_queues); + rte_free(eth_dev->data); + rte_free(eth_dev); +} + +static int +nfp_flower_init_ctrl_vnic(struct nfp_net_hw *hw) +{ + uint32_t i; + int ret = 0; + uint16_t nb_desc; + unsigned int numa_node; + struct rte_mempool *mp; + uint16_t rx_free_thresh; + uint16_t tx_free_thresh; + struct nfp_net_rxq *rxq; + struct nfp_net_txq *txq; + struct nfp_pf_dev *pf_dev; + struct rte_eth_dev *eth_dev; + const struct rte_memzone *tz; + struct nfp_app_flower *app_flower; + + /* Hardcoded values for now */ + nb_desc = CTRL_VNIC_NB_DESC; + rx_free_thresh = CTRL_VNIC_RX_FREE_THRESH; + tx_free_thresh = CTRL_VNIC_TX_FREE_THRESH; + numa_node = rte_socket_id(); + + /* Set up some pointers here for ease of use */ + pf_dev = hw->pf_dev; + app_flower = NFP_APP_PRIV_TO_APP_FLOWER(pf_dev->app_priv); + + ret = nfp_flower_init_vnic_common(hw, "ctrl_vnic"); + if (ret) + goto done; + + /* Allocate memory for the eth_dev of the vNIC */ + hw->eth_dev = rte_zmalloc("ctrl_vnic_eth_dev", + sizeof(struct rte_eth_dev), RTE_CACHE_LINE_SIZE); + if (hw->eth_dev == NULL) { + ret = -ENOMEM; + goto done; + } + + /* Grab the pointer to the newly created rte_eth_dev here */ + eth_dev = hw->eth_dev; + + /* Also allocate memory for the data part of the eth_dev */ + eth_dev->data = rte_zmalloc("ctrl_vnic_eth_dev_data", + sizeof(struct rte_eth_dev_data), RTE_CACHE_LINE_SIZE); + if (eth_dev->data == NULL) { + ret = -ENOMEM; + goto eth_dev_cleanup; + } + + eth_dev->data->rx_queues = rte_zmalloc("ethdev->rx_queues", + sizeof(eth_dev->data->rx_queues[0]) * hw->max_rx_queues, + RTE_CACHE_LINE_SIZE); + if (eth_dev->data->rx_queues == NULL) { + PMD_INIT_LOG(ERR, "rte_zmalloc failed for ctrl vnic rx queues"); + ret = -ENOMEM; + goto dev_data_cleanup; + } + + eth_dev->data->tx_queues = rte_zmalloc("ethdev->tx_queues", + sizeof(eth_dev->data->tx_queues[0]) * hw->max_tx_queues, + RTE_CACHE_LINE_SIZE); + if (eth_dev->data->tx_queues == NULL) { + PMD_INIT_LOG(ERR, "rte_zmalloc failed for ctrl vnic tx queues"); + ret = -ENOMEM; + goto rx_queue_cleanup; + } + + eth_dev->device = &pf_dev->pci_dev->device; + eth_dev->data->nb_tx_queues = hw->max_tx_queues; + eth_dev->data->nb_rx_queues = hw->max_rx_queues; + eth_dev->data->dev_private = hw; + + /* Create a mbuf pool for the vNIC */ + app_flower->ctrl_pktmbuf_pool = rte_pktmbuf_pool_create("ctrl_mbuf_pool", + 4 * nb_desc, 64, 0, 9216, numa_node); + if (app_flower->ctrl_pktmbuf_pool == NULL) { + PMD_INIT_LOG(ERR, "create mbuf pool for ctrl vnic failed"); + ret = -ENOMEM; + goto tx_queue_cleanup; + } + + mp = app_flower->ctrl_pktmbuf_pool; + + /* Set up the Rx queues */ + PMD_INIT_LOG(INFO, "Configuring flower ctrl vNIC Rx queue"); + for (i = 0; i < hw->max_rx_queues; i++) { + /* Hardcoded number of desc to 64 */ + rxq = rte_zmalloc_socket("ethdev RX queue", + sizeof(struct nfp_net_rxq), RTE_CACHE_LINE_SIZE, + numa_node); + if (rxq == NULL) { + PMD_DRV_LOG(ERR, "Error allocating rxq"); + ret = -ENOMEM; + goto rx_queue_setup_cleanup; + } + + eth_dev->data->rx_queues[i] = rxq; + + /* Hw queues mapping based on firmware configuration */ + rxq->qidx = i; + rxq->fl_qcidx = i * hw->stride_rx; + rxq->rx_qcidx = rxq->fl_qcidx + (hw->stride_rx - 1); + rxq->qcp_fl = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->fl_qcidx); + rxq->qcp_rx = hw->rx_bar + NFP_QCP_QUEUE_OFF(rxq->rx_qcidx); + + /* + * Tracking mbuf size for detecting a potential mbuf overflow due to + * RX offset + */ + rxq->mem_pool = mp; + rxq->mbuf_size = rxq->mem_pool->elt_size; + rxq->mbuf_size -= (sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM); + hw->flbufsz = rxq->mbuf_size; + + rxq->rx_count = nb_desc; + rxq->rx_free_thresh = rx_free_thresh; + rxq->drop_en = 1; + + /* + * Allocate RX ring hardware descriptors. A memzone large enough to + * handle the maximum ring size is allocated in order to allow for + * resizing in later calls to the queue setup function. + */ + tz = rte_eth_dma_zone_reserve(eth_dev, "ctrl_rx_ring", i, + sizeof(struct nfp_net_rx_desc) * NFP_NET_MAX_RX_DESC, + NFP_MEMZONE_ALIGN, numa_node); + if (tz == NULL) { + PMD_DRV_LOG(ERR, "Error allocating rx dma"); + rte_free(rxq); + ret = -ENOMEM; + goto rx_queue_setup_cleanup; + } + + /* Saving physical and virtual addresses for the RX ring */ + rxq->dma = (uint64_t)tz->iova; + rxq->rxds = (struct nfp_net_rx_desc *)tz->addr; + + /* mbuf pointers array for referencing mbufs linked to RX descriptors */ + rxq->rxbufs = rte_zmalloc_socket("rxq->rxbufs", + sizeof(*rxq->rxbufs) * nb_desc, RTE_CACHE_LINE_SIZE, + numa_node); + if (rxq->rxbufs == NULL) { + rte_eth_dma_zone_free(eth_dev, "ctrl_rx_ring", i); + rte_free(rxq); + ret = -ENOMEM; + goto rx_queue_setup_cleanup; + } + + nfp_net_reset_rx_queue(rxq); + + rxq->hw = hw; + + /* + * Telling the HW about the physical address of the RX ring and number + * of descriptors in log2 format + */ + nn_cfg_writeq(hw, NFP_NET_CFG_RXR_ADDR(i), rxq->dma); + nn_cfg_writeb(hw, NFP_NET_CFG_RXR_SZ(i), rte_log2_u32(nb_desc)); + } + + /* Now the Tx queues */ + PMD_INIT_LOG(INFO, "Configuring flower ctrl vNIC Tx queue"); + for (i = 0; i < hw->max_tx_queues; i++) { + /* Hardcoded number of desc to 64 */ + /* Allocating tx queue data structure */ + txq = rte_zmalloc_socket("ethdev TX queue", + sizeof(struct nfp_net_txq), RTE_CACHE_LINE_SIZE, + numa_node); + if (txq == NULL) { + PMD_DRV_LOG(ERR, "Error allocating txq"); + ret = -ENOMEM; + goto tx_queue_setup_cleanup; + } + + eth_dev->data->tx_queues[i] = txq; + + /* + * Allocate TX ring hardware descriptors. A memzone large enough to + * handle the maximum ring size is allocated in order to allow for + * resizing in later calls to the queue setup function. + */ + tz = rte_eth_dma_zone_reserve(eth_dev, "ctrl_tx_ring", i, + sizeof(struct nfp_net_nfd3_tx_desc) * NFP_NET_MAX_TX_DESC, + NFP_MEMZONE_ALIGN, numa_node); + if (tz == NULL) { + PMD_DRV_LOG(ERR, "Error allocating tx dma"); + rte_free(txq); + ret = -ENOMEM; + goto tx_queue_setup_cleanup; + } + + txq->tx_count = nb_desc; + txq->tx_free_thresh = tx_free_thresh; + txq->tx_pthresh = DEFAULT_TX_PTHRESH; + txq->tx_hthresh = DEFAULT_TX_HTHRESH; + txq->tx_wthresh = DEFAULT_TX_WTHRESH; + + /* queue mapping based on firmware configuration */ + txq->qidx = i; + txq->tx_qcidx = i * hw->stride_tx; + txq->qcp_q = hw->tx_bar + NFP_QCP_QUEUE_OFF(txq->tx_qcidx); + + /* Saving physical and virtual addresses for the TX ring */ + txq->dma = (uint64_t)tz->iova; + txq->txds = (struct nfp_net_nfd3_tx_desc *)tz->addr; + + /* mbuf pointers array for referencing mbufs linked to TX descriptors */ + txq->txbufs = rte_zmalloc_socket("txq->txbufs", + sizeof(*txq->txbufs) * nb_desc, RTE_CACHE_LINE_SIZE, + numa_node); + if (txq->txbufs == NULL) { + rte_eth_dma_zone_free(eth_dev, "ctrl_tx_ring", i); + rte_free(txq); + ret = -ENOMEM; + goto tx_queue_setup_cleanup; + } + + nfp_net_reset_tx_queue(txq); + + txq->hw = hw; + + /* + * Telling the HW about the physical address of the TX ring and number + * of descriptors in log2 format + */ + nn_cfg_writeq(hw, NFP_NET_CFG_TXR_ADDR(i), txq->dma); + nn_cfg_writeb(hw, NFP_NET_CFG_TXR_SZ(i), rte_log2_u32(nb_desc)); + } + + return 0; + +tx_queue_setup_cleanup: + for (i = 0; i < hw->max_tx_queues; i++) { + txq = eth_dev->data->tx_queues[i]; + if (txq) { + rte_free(txq->txbufs); + rte_eth_dma_zone_free(eth_dev, "ctrl_tx_ring", i); + rte_free(txq); + } + } +rx_queue_setup_cleanup: + for (i = 0; i < hw->max_rx_queues; i++) { + rxq = eth_dev->data->rx_queues[i]; + if (rxq) { + rte_free(rxq->rxbufs); + rte_eth_dma_zone_free(eth_dev, "ctrl_rx_ring", i); + rte_free(rxq); + } + } +tx_queue_cleanup: + rte_free(eth_dev->data->tx_queues); +rx_queue_cleanup: + rte_free(eth_dev->data->rx_queues); +dev_data_cleanup: + rte_free(eth_dev->data); +eth_dev_cleanup: + rte_free(eth_dev); +done: + return ret; +} + static int nfp_flower_start_pf_vnic(struct nfp_net_hw *hw) { @@ -561,12 +861,57 @@ return 0; } +static int +nfp_flower_start_ctrl_vnic(struct nfp_net_hw *hw) +{ + int ret; + uint32_t update; + uint32_t new_ctrl; + struct rte_eth_dev *dev; + + dev = hw->eth_dev; + + /* Disabling queues just in case... */ + nfp_net_disable_queues(dev); + + /* Enabling the required queues in the device */ + nfp_net_enable_queues(dev); + + /* Writing configuration parameters in the device */ + nfp_net_params_setup(hw); + + new_ctrl = NFP_NET_CFG_CTRL_ENABLE; + update = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING | + NFP_NET_CFG_UPDATE_MSIX; + + rte_wmb(); + + /* If an error when reconfig we avoid to change hw state */ + ret = nfp_net_reconfig(hw, new_ctrl, update); + if (ret) { + PMD_INIT_LOG(ERR, "Failed to reconfig ctrl vnic"); + return -EIO; + } + + hw->ctrl = new_ctrl; + + /* Setup the freelist ring */ + ret = nfp_net_rx_freelist_setup(dev); + if (ret) { + PMD_INIT_LOG(ERR, "Error with flower ctrl vNIC freelist setup"); + return -EIO; + } + + return 0; +} + int nfp_init_app_flower(struct nfp_pf_dev *pf_dev) { int ret; unsigned int numa_node; struct nfp_net_hw *pf_hw; + struct nfp_net_hw *ctrl_hw; struct nfp_app_flower *app_flower; numa_node = rte_socket_id(); @@ -612,29 +957,63 @@ pf_hw->pf_dev = pf_dev; pf_hw->cpp = pf_dev->cpp; + /* The ctrl vNIC struct comes directly after the PF one */ + app_flower->ctrl_hw = pf_hw + 1; + ctrl_hw = app_flower->ctrl_hw; + + /* Map the ctrl vNIC ctrl bar */ + ctrl_hw->ctrl_bar = nfp_rtsym_map(pf_dev->sym_tbl, "_pf0_net_ctrl_bar", + 32768, &ctrl_hw->ctrl_area); + if (ctrl_hw->ctrl_bar == NULL) { + PMD_INIT_LOG(ERR, "Cloud not map the ctrl vNIC ctrl bar"); + ret = -ENODEV; + goto pf_cpp_area_cleanup; + } + + /* Now populate the ctrl vNIC */ + ctrl_hw->pf_dev = pf_dev; + ctrl_hw->cpp = pf_dev->cpp; + ret = nfp_flower_init_pf_vnic(app_flower->pf_hw); if (ret) { PMD_INIT_LOG(ERR, "Could not initialize flower PF vNIC"); - goto pf_cpp_area_cleanup; + goto ctrl_cpp_area_cleanup; + } + + ret = nfp_flower_init_ctrl_vnic(app_flower->ctrl_hw); + if (ret) { + PMD_INIT_LOG(ERR, "Could not initialize flower ctrl vNIC"); + goto pf_vnic_cleanup; } /* Start the PF vNIC */ ret = nfp_flower_start_pf_vnic(app_flower->pf_hw); if (ret) { PMD_INIT_LOG(ERR, "Could not start flower PF vNIC"); - goto pf_vnic_cleanup; + goto ctrl_vnic_cleanup; + } + + /* Start the ctrl vNIC */ + ret = nfp_flower_start_ctrl_vnic(app_flower->ctrl_hw); + if (ret) { + PMD_INIT_LOG(ERR, "Could not start flower ctrl vNIC"); + goto ctrl_vnic_cleanup; } /* Start up flower services */ if (nfp_flower_enable_services(app_flower)) { ret = -ESRCH; - goto pf_vnic_cleanup; + goto ctrl_vnic_cleanup; } return 0; +ctrl_vnic_cleanup: + nfp_flower_cleanup_ctrl_vnic(app_flower->ctrl_hw); pf_vnic_cleanup: nfp_flower_cleanup_pf_vnic(app_flower->pf_hw); +ctrl_cpp_area_cleanup: + nfp_cpp_area_free(ctrl_hw->ctrl_area); pf_cpp_area_cleanup: nfp_cpp_area_free(pf_dev->ctrl_area); eth_tbl_cleanup: diff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h index f6fd4eb..f11ef6d 100644 --- a/drivers/net/nfp/flower/nfp_flower.h +++ b/drivers/net/nfp/flower/nfp_flower.h @@ -21,6 +21,12 @@ struct nfp_app_flower { /* Pointer to the PF vNIC */ struct nfp_net_hw *pf_hw; + /* Pointer to a mempool for the ctrlvNIC */ + struct rte_mempool *ctrl_pktmbuf_pool; + + /* Pointer to the ctrl vNIC */ + struct nfp_net_hw *ctrl_hw; + /* the eth table as reported by firmware */ struct nfp_eth_table *nfp_eth_table; }; -- 1.8.3.1