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 D45A145501; Wed, 26 Jun 2024 21:56:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6031240687; Wed, 26 Jun 2024 21:56:10 +0200 (CEST) Received: from egress-ip42a.ess.de.barracuda.com (egress-ip42a.ess.de.barracuda.com [18.185.115.201]) by mails.dpdk.org (Postfix) with ESMTP id 630694064F for ; Wed, 26 Jun 2024 21:56:05 +0200 (CEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2168.outbound.protection.outlook.com [104.47.17.168]) by mx-outbound42-4.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 26 Jun 2024 19:56:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hhRiS5RVxGxZ8o022N4yNbBOwOzL/3oUmtmavUH+ZL54asm9FvXjly1xRjNj4corTAn4hFhPRrUock9i6Z57JwlA6iSmrnqlhxBVNdWqPDiAPSavgIOIoCq+l045MJaKA91QPsgTEqW19LT8ykwnNbMFvMBn+r7WR58qr8vUGFjw5VY+7ilczlxF3HEp4SqC/IY7KwMOJCaApeKwlxFIQBwCfRV9rbsgOZmbaTWwfz2rTPKGLkWgt/w6sRV1HmBtxFRyOjrBamoXq7qKZ2yghRvt4/NNjh+OSiFq1WkxKAkzk5/F7+W0uEhmSKYj1DJjjE+qb/JQDMiMAYQl3W9oKg== 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=3R5BFEYij5G8jaVMm/2QSxsjnagOMn2TjnU9pQxXFhM=; b=b0cJrSg0QYd6Q8TlnKCbIcgUaG92gLzpVAa1g4PgkXEUNv4XX9MgO04cGsp1bCukGZCW6ie+p+3NRy+1xNAvbe8atnOP3fwV1PqSp5kW3vAWqrhS1HhdDvMvK67K9+uQZtuBe/83WvM9TIEvTVsg24DQUgwQEuilRadlZ2Rt1Imum/VtvxIB3O2qref6z3H5ctNl3UvTAR8aqigjjVwIf7dJFwx20k/689pGiDpIAb7GmhRBQWWWLsk4IKvyRHgz86xwbHo4TRsvaokqSgN9W8rmnqEBKvs8rSxdRaO9VC5JjpF6d8silJNxGVPM7AvKc8EoDzrFAxWEcgywahSOQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 178.72.21.4) smtp.rcpttodomain=dpdk.org smtp.mailfrom=napatech.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=napatech.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=napatech.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3R5BFEYij5G8jaVMm/2QSxsjnagOMn2TjnU9pQxXFhM=; b=Wizj9poduHqrZB/Zn3IyYDJUYk/eumms7bj0qYnosdtsORFwP/msvF5tCGiYW/GuqFYvGEFKKB2Vj9Zh5RPaF9JABer96EqTz9SVqyz7y7TfYWLeufTiWadGVN3c8HqnoxaxcmBpavLRMpLRJLNnKVR9PlSvRfaIzQRk+OGMS/8= Received: from AS4P250CA0030.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:5e3::20) by DU4P190MB2198.EURP190.PROD.OUTLOOK.COM (2603:10a6:10:56f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Wed, 26 Jun 2024 19:56:02 +0000 Received: from AMS0EPF000001AC.eurprd05.prod.outlook.com (2603:10a6:20b:5e3:cafe::2e) by AS4P250CA0030.outlook.office365.com (2603:10a6:20b:5e3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.25 via Frontend Transport; Wed, 26 Jun 2024 19:56:02 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 178.72.21.4) smtp.mailfrom=napatech.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=napatech.com; Received-SPF: Fail (protection.outlook.com: domain of napatech.com does not designate 178.72.21.4 as permitted sender) receiver=protection.outlook.com; client-ip=178.72.21.4; helo=localhost.localdomain; Received: from localhost.localdomain (178.72.21.4) by AMS0EPF000001AC.mail.protection.outlook.com (10.167.16.152) with Microsoft SMTP Server id 15.20.7677.15 via Frontend Transport; Wed, 26 Jun 2024 19:56:01 +0000 From: Serhii Iliushyk To: dev@dpdk.org Cc: mko-plv@napatech.com, sil-plv@napatech.com, ckm@napatech.com, andrew.rybchenko@oktetlabs.ru, ferruh.yigit@amd.com Subject: [PATCH v4 06/23] net/ntnic: add NT NIC driver dependencies Date: Wed, 26 Jun 2024 21:55:16 +0200 Message-ID: <20240626195545.1793419-6-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240626195545.1793419-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240626195545.1793419-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001AC:EE_|DU4P190MB2198:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 1b7259a5-da3d-496e-728a-08dc961a019b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230038|376012|1800799022|36860700011|82310400024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XxSDNQxHfm/r+C7ZFZAgmUPxfDLEeWIG8KkKI7p+dzCw7zttKIAXdkuSgWuD?= =?us-ascii?Q?NrAzUTc9S4Yp3tmFxZl5RZOfGqPJ1nsGCiobhxytmFKd5qPVJLRaPGDbsc+1?= =?us-ascii?Q?F7PvJe50oIwnZGxQr1/1+ermNavXLHt4CiVySBeOAmaEsI8LIpbgvEwuXdLH?= =?us-ascii?Q?gowpxJEJS5aBLgwmynDzCQ6L2sFVeYMcmCYjapEGvcvCe+jRUCRtHLLOyhfx?= =?us-ascii?Q?Sc78kLNXq1QQ131M6/JYxJs7PMSeurufujmps/u9o6CGDQJZ3gHbM4aHjoGm?= =?us-ascii?Q?lKGztbK8aoAN9TFEFAn7EyjWTbc1suK0PWskUS8o9GtpN05P03DCXXejclC0?= =?us-ascii?Q?oBcw0zElD56UIFkZSu3S5T+kJaY+foZ+mxE6LBgxaRTygZ6V3rY1OQXUibUw?= =?us-ascii?Q?gnkMb4qwYD0j3ep0juvVEo/E2VndmhHP1jGd8/Pq7TwSa/woLJT+az+ibvze?= =?us-ascii?Q?ymqUTQ8UpkT2Up6Mw2zCImYoY9elb4nldeGmVyCg2YQrOrb87khv6eKV21Qq?= =?us-ascii?Q?ssjYtuGwsWYrXUwZVBa9bZyobUkbvcZubLfCZGoggrEmenp4O9w4Gkh5W9JP?= =?us-ascii?Q?rQnsBzuMc10rupA8CHdyzehqwlrxaQbeV3e1yxUJ5ZoMf06r/tVSVdzgdh3E?= =?us-ascii?Q?ByGZGegLT5LyYwAdedNXptwLC+jY6BxsjkWxA8GgiZCYj7YTxgkkub5vErOW?= =?us-ascii?Q?js/3wg0388M6G3V4N0HswhnCwTLkWgBx6Lz3rLG0cuXHQlvggahLkY8/K+yh?= =?us-ascii?Q?lQY0+Yodc10t9S1lfNv2+YPDuv2ckPJpJXK60CrEs9ly5tQDuCPG966RxTa4?= =?us-ascii?Q?O+lHhZUaj7jz96MvczNkhlj67x5+n6VCC21x27wDtBY4Nwojy3HRk0ziKzpi?= =?us-ascii?Q?CJUYiRmpwWfe8qFwjw/RxYHOpcgqHqeCMYAc8Ws6kpaNoT09boWKB/ZJXfD/?= =?us-ascii?Q?Er+DAOLJjQosj6Fj2ekluphU7M5p1tH5zDVMlgRKQHKxQ/eGh9UXHht6s2Qu?= =?us-ascii?Q?xHgj17RDPbarRwf4HRPT9guiPg6vKEnb0NGPxkRj+ppzyhWAfoa3F8z7ucx9?= =?us-ascii?Q?rAKvZ5HbKxMYdjRDhb1ssyAgdKPeiYwYe3d2P98hHBaYXx5O14H+WjIfIFNc?= =?us-ascii?Q?I4rUoKzwy/G7h3jVQpIWUztNS8jFzFD/ojIfvhXckKF+sOwTTRSABKoDqimf?= =?us-ascii?Q?WzLjWt6bGNTEzBH9vo9VIU27L9+neEdp96XUZo7dK+Q5EmYK4KPpxwzug2Lc?= =?us-ascii?Q?06VLhlbT6JDG2wpsFaqGnD/bBratbh7hpOy6DNbz+NlcZZWVubTbQpWnrblA?= =?us-ascii?Q?PxF2cSfJOttLFMIjBIWdB4heRXXOYpT3CrGiA+D9espcbGwpna9CFJ5XblJH?= =?us-ascii?Q?Geu5CbZLsbjXhJrF0MJUrPOalp4GvO58BSxA7dANDVBmoDYDZA=3D=3D?= X-Forefront-Antispam-Report: CIP:178.72.21.4; CTRY:DK; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:localhost.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230038)(376012)(1800799022)(36860700011)(82310400024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: loyXoOihgZqgPoucaacsv2kTZHAAuPVpmoBpucGfKYDCi+hPaP8wFSpHIm2UUBlQmBTr1+xXFIVAFIWRWie2Xy0R4chmTIEfdRVv+GWulzTJsguqqSAyJRBeNSQZIINjH5egiEu/vkXV8Al1xuP5wAtXc7gSnSZSfXrBIa0tl8dH1oRkfWnvPciRUA3n2c1OhAPt+go6aiiw2MVQWgUXdMqB48ckUIiEzBl9Nq5Xpo4hFt85QtNe5+ddghh4ZitxyYaW7q5ukS1s2jVoEGBaZD7WxKO2T6dJ+AAlFgbbN+CUFB3z+njFz5ZY9JNg2eAlEvMPwgDGZ7y6oWQnfPl/0EjQ11+lEOgq1wEH1WKnfBm9zB9byZnrTxje+JqXwzuJYJ+975Qs5C7zBJ3Nr41eZ6D3bik5yRvHJ+CBDAdW8ltb8nmFYUVgMRndFaQsZeyWzfBbBUW9RiT+wp40YjOMa2dEv1i/I5HbqNYnLgMnRPTlSyV4n8JitBB3PG9uTOMXdmUlG8KnYN94YtIJrWI0y5frrbl/ClIb4uy5lCnFxBYJ1pjl++yYfgddHtc7ui6Zg8e8p2ca8SSE4RYgUjSazoi0EVOd4azez1Yg5adxM0OSVCx0yR7PRuNo5HJRSvSmId60dKVclHwQE63SzqAanA== X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2024 19:56:01.8486 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1b7259a5-da3d-496e-728a-08dc961a019b X-MS-Exchange-CrossTenant-Id: c4540d0b-728a-4233-9da5-9ea30c7ec3ed X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=c4540d0b-728a-4233-9da5-9ea30c7ec3ed; Ip=[178.72.21.4]; Helo=[localhost.localdomain] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001AC.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4P190MB2198 X-BESS-ID: 1719431764-310756-20319-6567-1 X-BESS-VER: 2019.1_20240620.2317 X-BESS-Apparent-Source-IP: 104.47.17.168 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVoaGJpbGQGYGUNQ4yTAlNdnMzM LCxNjY0iDZ0DTJ0tDYyDQpySjFOCXJUqk2FgDLX1krQgAAAA== X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257218 [from cloudscan11-42.eu-central-1a.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS113687 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 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 structures and interfaces specific for NT smartNiC Signed-off-by: Serhii Iliushyk --- drivers/net/ntnic/include/ntdrv_4ga.h | 17 ++ drivers/net/ntnic/include/ntos_drv.h | 33 ++++ drivers/net/ntnic/include/ntos_system.h | 21 ++ drivers/net/ntnic/meson.build | 1 + drivers/net/ntnic/ntnic_ethdev.c | 243 +++++++++++++++++++++++- 5 files changed, 314 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ntnic/include/ntdrv_4ga.h create mode 100644 drivers/net/ntnic/include/ntos_drv.h create mode 100644 drivers/net/ntnic/include/ntos_system.h diff --git a/drivers/net/ntnic/include/ntdrv_4ga.h b/drivers/net/ntnic/include/ntdrv_4ga.h new file mode 100644 index 0000000000..bcb7ddc242 --- /dev/null +++ b/drivers/net/ntnic/include/ntdrv_4ga.h @@ -0,0 +1,17 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Napatech A/S + */ + +#ifndef __NTDRV_4GA_H__ +#define __NTDRV_4GA_H__ + + +typedef struct ntdrv_4ga_s { + uint32_t pciident; + char *p_drv_name; + + volatile bool b_shutdown; +} ntdrv_4ga_t; + +#endif /* __NTDRV_4GA_H__ */ diff --git a/drivers/net/ntnic/include/ntos_drv.h b/drivers/net/ntnic/include/ntos_drv.h new file mode 100644 index 0000000000..aed9e83c8d --- /dev/null +++ b/drivers/net/ntnic/include/ntos_drv.h @@ -0,0 +1,33 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Napatech A/S + */ + +#ifndef __NTOS_DRV_H__ +#define __NTOS_DRV_H__ + +#include +#include +#include +#include + +#include + +#define NUM_MAC_ADDRS_PER_PORT (16U) +#define NUM_MULTICAST_ADDRS_PER_PORT (16U) + +#define NUM_ADAPTER_MAX (8) +#define NUM_ADAPTER_PORTS_MAX (128) + +struct pmd_internals { + const struct rte_pci_device *pci_dev; + char name[20]; + int n_intf_no; + int if_index; + uint32_t port; + uint32_t port_id; + struct drv_s *p_drv; + struct pmd_internals *next; +}; + +#endif /* __NTOS_DRV_H__ */ diff --git a/drivers/net/ntnic/include/ntos_system.h b/drivers/net/ntnic/include/ntos_system.h new file mode 100644 index 0000000000..74d7edf313 --- /dev/null +++ b/drivers/net/ntnic/include/ntos_system.h @@ -0,0 +1,21 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Napatech A/S + */ + +#ifndef __NTOS_SYSTEM_H__ +#define __NTOS_SYSTEM_H__ + +#include "ntdrv_4ga.h" + +struct drv_s { + int adapter_no; + struct rte_pci_device *p_dev; + struct ntdrv_4ga_s ntdrv; + + int n_eth_dev_init_count; + int probe_finished; + int setup_finished; +}; + +#endif /* __NTOS_SYSTEM_H__ */ diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build index 145f586a92..ff5dd81a37 100644 --- a/drivers/net/ntnic/meson.build +++ b/drivers/net/ntnic/meson.build @@ -15,6 +15,7 @@ cflags += [ # includes includes = [ include_directories('.'), + include_directories('include'), include_directories('ntlog/include'), include_directories('ntutil/include'), ] diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index a4e32c30fa..7571fce12e 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -11,37 +11,240 @@ #include "ntlog.h" +#include "ntdrv_4ga.h" +#include "ntos_drv.h" +#include "ntos_system.h" #include "ntnic_vfio.h" #include "nt_util.h" #define EXCEPTION_PATH_HID 0 /* Global static variables: */ +static rte_spinlock_t hwlock = RTE_SPINLOCK_INITIALIZER; + +/* + * Store and get adapter info + */ + +static struct drv_s *_g_p_drv[NUM_ADAPTER_MAX] = { NULL }; + +static void +store_pdrv(struct drv_s *p_drv) +{ + if (p_drv->adapter_no > NUM_ADAPTER_MAX) { + NT_LOG(ERR, NTNIC, + "Internal error adapter number %u out of range. Max number of adapters: %u\n", + p_drv->adapter_no, NUM_ADAPTER_MAX); + return; + } + + if (_g_p_drv[p_drv->adapter_no] != 0) { + NT_LOG(WRN, NTNIC, + "Overwriting adapter structure for PCI " PCIIDENT_PRINT_STR + " with adapter structure for PCI " PCIIDENT_PRINT_STR "\n", + PCIIDENT_TO_DOMAIN(_g_p_drv[p_drv->adapter_no]->ntdrv.pciident), + PCIIDENT_TO_BUSNR(_g_p_drv[p_drv->adapter_no]->ntdrv.pciident), + PCIIDENT_TO_DEVNR(_g_p_drv[p_drv->adapter_no]->ntdrv.pciident), + PCIIDENT_TO_FUNCNR(_g_p_drv[p_drv->adapter_no]->ntdrv.pciident), + PCIIDENT_TO_DOMAIN(p_drv->ntdrv.pciident), + PCIIDENT_TO_BUSNR(p_drv->ntdrv.pciident), + PCIIDENT_TO_DEVNR(p_drv->ntdrv.pciident), + PCIIDENT_TO_FUNCNR(p_drv->ntdrv.pciident)); + } + + rte_spinlock_lock(&hwlock); + _g_p_drv[p_drv->adapter_no] = p_drv; + rte_spinlock_unlock(&hwlock); +} + +static void +clear_pdrv(struct drv_s *p_drv) +{ + if (p_drv->adapter_no > NUM_ADAPTER_MAX) + return; + + rte_spinlock_lock(&hwlock); + _g_p_drv[p_drv->adapter_no] = NULL; + rte_spinlock_unlock(&hwlock); +} + +static struct drv_s * +get_pdrv_from_pci(struct rte_pci_addr addr) +{ + int i; + struct drv_s *p_drv = NULL; + rte_spinlock_lock(&hwlock); + + for (i = 0; i < NUM_ADAPTER_MAX; i++) { + if (_g_p_drv[i]) { + if (PCIIDENT_TO_DOMAIN(_g_p_drv[i]->ntdrv.pciident) == addr.domain && + PCIIDENT_TO_BUSNR(_g_p_drv[i]->ntdrv.pciident) == addr.bus) { + p_drv = _g_p_drv[i]; + break; + } + } + } + + rte_spinlock_unlock(&hwlock); + return p_drv; +} + +static int +eth_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *dev_info) +{ + struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + + dev_info->if_index = internals->if_index; + dev_info->driver_name = internals->name; + + return 0; +} + +static int +eth_dev_configure(struct rte_eth_dev *eth_dev) +{ + struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + struct drv_s *p_drv = internals->p_drv; + + NT_LOG_DBGX(DEBUG, NTNIC, "Called for eth_dev %p\n", eth_dev); + + p_drv->probe_finished = 1; + + /* The device is ALWAYS running promiscuous mode. */ + eth_dev->data->promiscuous ^= ~eth_dev->data->promiscuous; + return 0; +} + +static int +eth_dev_start(struct rte_eth_dev *eth_dev) +{ + struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + + NT_LOG_DBGX(DEBUG, NTNIC, "Port %u, %u\n", internals->n_intf_no, internals->if_index); + + return 0; +} + +static int +eth_dev_stop(struct rte_eth_dev *eth_dev) +{ + struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + + NT_LOG_DBGX(DEBUG, NTNIC, "Port %u, %u\n", + internals->n_intf_no, internals->if_index); + + eth_dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN; + return 0; +} + +static void +drv_deinit(struct drv_s *p_drv) +{ + if (p_drv == NULL) + return; + /* + * Mark the global pdrv for cleared. Used by some threads to terminate. + * 1 second to give the threads a chance to see the termonation. + */ + clear_pdrv(p_drv); + nt_os_wait_usec(1000000); + + /* clean memory */ + rte_free(p_drv); + p_drv = NULL; +} + +static int +eth_dev_close(struct rte_eth_dev *eth_dev) +{ + struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private; + struct drv_s *p_drv = internals->p_drv; + + internals->p_drv = NULL; + + rte_free(internals); + internals = NULL; + eth_dev->data->dev_private = NULL; + eth_dev->data->mac_addrs = NULL; + + rte_eth_dev_release_port(eth_dev); + + /* decrease initialized ethernet devices */ + p_drv->n_eth_dev_init_count--; + + /* + * rte_pci_dev has no private member for p_drv + * wait until all rte_eth_dev's are closed - then close adapters via p_drv + */ + if (!p_drv->n_eth_dev_init_count && p_drv) + drv_deinit(p_drv); + + return 0; +} + +static struct eth_dev_ops nthw_eth_dev_ops = { + .dev_configure = eth_dev_configure, + .dev_start = eth_dev_start, + .dev_stop = eth_dev_stop, + .dev_close = eth_dev_close, + .dev_infos_get = eth_dev_infos_get, +}; static int nthw_pci_dev_init(struct rte_pci_device *pci_dev) { nt_vfio_init(); + struct drv_s *p_drv; + ntdrv_4ga_t *p_nt_drv; uint32_t n_port_mask = -1; /* All ports enabled by default */ + uint32_t nb_rx_queues = 1; + uint32_t nb_tx_queues = 1; int n_phy_ports; NT_LOG_DBGX(DEBUG, NTNIC, "Dev %s PF #%i Init : %02x:%02x:%i\n", pci_dev->name, pci_dev->addr.function, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); + /* alloc */ + p_drv = rte_zmalloc_socket(pci_dev->name, sizeof(struct drv_s), RTE_CACHE_LINE_SIZE, + pci_dev->device.numa_node); + + if (!p_drv) { + NT_LOG_DBGX(ERR, NTNIC, "%s: error %d\n", + (pci_dev->name[0] ? pci_dev->name : "NA"), -1); + return -1; + } + /* Setup VFIO context */ int vfio = nt_vfio_setup(pci_dev); if (vfio < 0) { NT_LOG_DBGX(ERR, TNIC, "%s: vfio_setup error %d\n", (pci_dev->name[0] ? pci_dev->name : "NA"), -1); + rte_free(p_drv); return -1; } + /* context */ + p_nt_drv = &p_drv->ntdrv; + + p_drv->p_dev = pci_dev; + + /* Set context for NtDrv */ + p_nt_drv->pciident = BDF_TO_PCIIDENT(pci_dev->addr.domain, pci_dev->addr.bus, + pci_dev->addr.devid, pci_dev->addr.function); + + + p_nt_drv->b_shutdown = false; + + /* store context */ + store_pdrv(p_drv); + n_phy_ports = 0; for (int n_intf_no = 0; n_intf_no < n_phy_ports; n_intf_no++) { + struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; char name[32]; @@ -50,6 +253,33 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) snprintf(name, sizeof(name), "ntnic%d", n_intf_no); + internals = rte_zmalloc_socket(name, sizeof(struct pmd_internals), + RTE_CACHE_LINE_SIZE, pci_dev->device.numa_node); + + if (!internals) { + NT_LOG_DBGX(ERR, NTNIC, "%s: %s: error=%d\n", + (pci_dev->name[0] ? pci_dev->name : "NA"), name, -1); + return -1; + } + + internals->pci_dev = pci_dev; + internals->n_intf_no = n_intf_no; + internals->if_index = n_intf_no; + + + /* Setup queue_ids */ + if (nb_rx_queues > 1) { + NT_LOG(DBG, NTNIC, + "(%i) NTNIC configured with Rx multi queues. %i queues\n", + 0 /*port*/, nb_rx_queues); + } + + if (nb_tx_queues > 1) { + NT_LOG(DBG, NTNIC, + "(%i) NTNIC configured with Tx multi queues. %i queues\n", + 0 /*port*/, nb_tx_queues); + } + eth_dev = rte_eth_dev_allocate(name); /* TODO: name */ if (!eth_dev) { @@ -61,6 +291,11 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) NT_LOG_DBGX(DEBUG, NTNIC, "eth_dev %p, port_id %u, if_index %u\n", eth_dev, eth_dev->data->port_id, n_intf_no); + /* connect structs */ + internals->p_drv = p_drv; + eth_dev->data->dev_private = internals; + + internals->port_id = eth_dev->data->port_id; struct rte_eth_link pmd_link; pmd_link.link_speed = RTE_ETH_SPEED_NUM_NONE; @@ -71,7 +306,7 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) eth_dev->device = &pci_dev->device; eth_dev->data->dev_link = pmd_link; eth_dev->data->numa_node = pci_dev->device.numa_node; - eth_dev->dev_ops = NULL; + eth_dev->dev_ops = &nthw_eth_dev_ops; eth_dev->state = RTE_ETH_DEV_ATTACHED; rte_eth_copy_pci_info(eth_dev, pci_dev); @@ -79,8 +314,11 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) eth_dev_pci_specific_init(eth_dev, pci_dev); /* increase initialized ethernet devices - PF */ + p_drv->n_eth_dev_init_count++; } + p_drv->setup_finished = 1; + return 0; } @@ -156,6 +394,9 @@ nthw_pci_remove(struct rte_pci_device *pci_dev) { NT_LOG_DBGX(DEBUG, NTNIC); + struct drv_s *p_drv = get_pdrv_from_pci(pci_dev->addr); + drv_deinit(p_drv); + return rte_eth_dev_pci_generic_remove(pci_dev, nthw_pci_dev_deinit); } -- 2.45.0