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 697164560F; Fri, 12 Jul 2024 11:49:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABA1342EB5; Fri, 12 Jul 2024 11:48:50 +0200 (CEST) Received: from egress-ip11b.ess.de.barracuda.com (egress-ip11b.ess.de.barracuda.com [18.185.115.215]) by mails.dpdk.org (Postfix) with ESMTP id 6F0EF42EA3 for ; Fri, 12 Jul 2024 11:48:45 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2111.outbound.protection.outlook.com [104.47.18.111]) by mx-outbound23-2.eu-central-1b.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 12 Jul 2024 09:48:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i2UDY+oa7A3ryWtFnfoBa572LaydQ9byCeezdX22qtcUegYyfrUhbP4c3FGTRNgBVivu6FSL2cZD99hZipVQWUVAkb4KuUv+Ubg2eoADBhVayrvQ7XPgRaN7Vn+FsM0cjr44BxpMTGhV/Iho78s/68/P2vW0O+BApo9f7XvDFsXE4EM5YfN6zQ/rvpgQwDeCx0nrIjU7Z4zX0lDLl4jhH63HhOOvSWBH3oJ62MDIichU6Fi9vypuuDO+/U7UCVjpvVwBfyhsn2I4Rds4SfXgGOHoUVPCS2ymu2GV5kkbZCpUF+aVLdBqu9iO2Fz0e3Y22MWM+18VEqH8hW6lT0/ZQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Z+B8cePTgMsBLW+s0VzhFuWzgDIHhP/lGe7o8C34pZ4=; b=lo6ay2FAAlbfe3xjLj5Aunka4luFk8AatTy5RhqL0+zA6k+FNIZLr0BPhrS1CvITgmBaL5N27Vdso6z7ozHLbPOoOKfwGOiKMlNPqElXJs62opWHY9O1lNmYVb6nb80D7S0K67QocUIervtYpWIAb5JTy1OYZBELwYAt+gBSNLLJ4UZuKBnblA6zTbvJ9BYZYwWkmee5g4NLbWig4nwmQ+UZthVHBwqg8LYjBXaC57RJWoDfDIebVSgaMsI3LPeYNqHsUsQLXDC4cdAeurfs613GuZUK9aCUx4bzG2S4A7X0WRKyrjsfF3h0/LY5Udfu6PussLUrtDE3ELRH6VWesQ== 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=Z+B8cePTgMsBLW+s0VzhFuWzgDIHhP/lGe7o8C34pZ4=; b=T8Et9pPAHsupq8DL+jh1k0n5gDTiHXFDTJdr7PT3gdGWzZTa/P6/zq40VeCTd+EqaAtNkvBWIr4HPlpzwxHYWwvYqgo+wpJaWrNyXUxeX9KyiTIzpN+2W5o26msmViB6me7xmGK7ajdA4Jzs7P7uv+XEKfDbE3hUd/BQLpFP+ME= Received: from AS9PR06CA0514.eurprd06.prod.outlook.com (2603:10a6:20b:49d::9) by GV1P190MB1948.EURP190.PROD.OUTLOOK.COM (2603:10a6:150:57::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 09:48:39 +0000 Received: from AM1PEPF000252DD.eurprd07.prod.outlook.com (2603:10a6:20b:49d:cafe::a8) by AS9PR06CA0514.outlook.office365.com (2603:10a6:20b:49d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22 via Frontend Transport; Fri, 12 Jul 2024 09:48:39 +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 AM1PEPF000252DD.mail.protection.outlook.com (10.167.16.55) with Microsoft SMTP Server id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 09:48:39 +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 v7 06/21] net/ntnic: add basic eth dev ops to ntnic Date: Fri, 12 Jul 2024 11:48:11 +0200 Message-ID: <20240712094831.861260-6-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240712094831.861260-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240712094831.861260-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM1PEPF000252DD:EE_|GV1P190MB1948:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: b999f355-8220-4d4a-bc90-08dca257cef3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EHrhHvrnAD+eZs9aBRM7PYh3bcRMHYFvaCwqXapcKMhe05tbppH/a+/yLWII?= =?us-ascii?Q?FCxvODJB0xCJqbdmj+A9QGPe9Bp8AjOg7P+c9PCM82HDUpR2Eqy6dNdn7b3+?= =?us-ascii?Q?gpvHQm0T0NEZiXzxHoz5l/BGpzgGM0WJ7XZfBhO1I+S3ikU4A2XGNFHl4zKu?= =?us-ascii?Q?EH0h6kzovRdL854tH6wxpKFHQXbznML0qDSv0GqorLQY7MYpn75Hjdw5njrb?= =?us-ascii?Q?QJceHmeLFAeGBc1G+neAGVUdOGShq1nYadMZ19QTZjaHujyf9mr25JMn+MGq?= =?us-ascii?Q?jY0pfG06+65oWuJMo0ZbcdMdmpaGXJpseORf5mk8oQHw2MBZ2KiGajMEwNtn?= =?us-ascii?Q?0KwiHmCBGzWFG3R4HGXdftYFD7ofUbCTG8OJgeO8GtPEKHzAEpUKt7ik3uwk?= =?us-ascii?Q?TXdKEYcD1QTyN3DZ1EktVsHxnx90x43cGw/4sQtbT5ZvRArcJOGTTTKZMbps?= =?us-ascii?Q?m6WZYbyi48ubZKgry1fcK8nQBPVErbnzeLaO6udxVLprrJCTtNkyc20dFrvn?= =?us-ascii?Q?OQGID5rF8tf+pZ8KOjtjVy7jB55dI0u3z7q4M3sq09WHz95d/11DyUWl+VT6?= =?us-ascii?Q?4k7g1iA8z/V+mYfaJQ23zMb0oNnQgOLFqQQV7B7trYjYRMjWLOtdSpUkAGcC?= =?us-ascii?Q?lBVWnxTEmv32seriEU92xjZkYI4eurKR7xQDj3H7JPI9vpjMy1oehekv0hXs?= =?us-ascii?Q?OcRoFQu8tce2kmXFRMUKIlaFVhnYCntt5O1iXnLFJ2v/nOxNXQqnBeqSuSLc?= =?us-ascii?Q?gDCBPXF0Cf+Pq/PavocbKRmQjY4zCGvk+XS0hrxgDQbqt6mk7jVrDBWLr6pY?= =?us-ascii?Q?tW8vMdzvMAsmlOa9kuTlkU8LxJWyaKdzcqkaXdJG4P3VsJ8JuntQeL278vPO?= =?us-ascii?Q?eB5bwpPFjjLxy/qo3niWJdutoeR+4PByz+4VpnBTq5coc0/ZGXTQuIeSPCQ0?= =?us-ascii?Q?rA16VZ6zrug+5pISwxVg5D+IREC7tilXD6q35xy9+qHi6vtlLnUQFfjlbtE7?= =?us-ascii?Q?Mv1IPDugX29PzcfqpE3EaR4etA35ia7Y/oikBAgHgclUM5MeoqhS1edDu7t4?= =?us-ascii?Q?xFaiJ61WX5P92KKrXzRCYD3v6gClpI69DMrHQ+rMWtti/zmhSvLyDtNDzoyh?= =?us-ascii?Q?wmJRt8+9eLqn/m7jYrQsahUnSDoRAWW5oW+Tv0491ls4KR8S+M6JGMAwHCdD?= =?us-ascii?Q?r1uXfps//qgbGzxHQy3GlJIG6Cpl0wuyepDg5uqkFwinuJeLCRP/O2+2U0PY?= =?us-ascii?Q?oLFpFcafvBF7DDujoZasfKC+Bd1cet4GR3P92aJPRAm5TPDfVoalILJYyF+N?= =?us-ascii?Q?V/OLnrrGHd2pXBb3pshslPn9Wb/JyKYw9FAEtho2BwJqUcKMq/RIb7HfpIBr?= =?us-ascii?Q?7Sh41bPwbJ15or30pksGGfgFXdUVo1MhVfweBGNBojEGoFMgY2jMfKs5RUi9?= =?us-ascii?Q?ZDQdxG05zQ64nDpdxsls7OWgcv7sA/tK?= 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:(13230040)(82310400026)(1800799024)(376014)(36860700013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: V0M3F0rmcipzd0Bh7K/Bdb8KhrKbP7JKuWs+CqtpifO8zGyHEos6jVCPZh7DyQWCV/QFfltBJ+lNn7JM8cnY7QRyidw05lzXEYE1Z7cJFOkK0aqL3S8zWqCsRDSFRWRw7HmrZFQlIs+ikwS/sEe92nbpx25Ckx4nf1tK9koaLz/8ZSz+96dmfT4NleSZou37ZhORPgE8qRBpSz+qygFCurTIwGpiNe3sY46ni+Q+ZDdEKhJnrPjT7JsNEfDGXRQH6WujaLi0ZoFnOtP7P1aWlJn0AJfHm6zci4uvxHDmugRRfJTqeFzdMLsQ++7+6bejbMX/6G0gWvfbbfiLmsDqMo/LeU0Lf6aXlyhYmIm7cgWvY1mR/Q65yacypoesT/6szh9sr/g+aZmaGOK3J9XqMED5PF84yjr2R0Pa/wRU228jUgwWh4KwUr3u2FLC5gtsPqA1UALUQ7sE60+2pr4JP1DEEoJ7P3T3/EWbUGiC5cJHjUv1nzFFYRp8KM2T32pKt+mLz0BH/xcrwisIWav0WZJUJ9HaR1GzKv85NqUggZTvdA3BcZKkE83xPSDf06E0zZxmotE7q2EuNkmh/OYj58P0iyY0Kpg/RPWin2tdIyHhWoeOgfF5NHohrKstgipXPGFVaMxBQmxDWIDJSX0LZw== X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 09:48:39.5514 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b999f355-8220-4d4a-bc90-08dca257cef3 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: AM1PEPF000252DD.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P190MB1948 X-BESS-ID: 1720777724-305890-12646-7789-1 X-BESS-VER: 2019.1_20240702.1505 X-BESS-Apparent-Source-IP: 104.47.18.111 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVoYGliZmQGYGUDQlNSU1ySAt0T jJKDnFPCkpOcnC0NjUxNIkzcDMwsjYXKk2FgBi7AaTQgAAAA== X-BESS-Outbound-Spam-Score: 0.50 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257571 [from cloudscan9-207.eu-central-1a.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.50 BSF_RULE7568M META: Custom Rule 7568M 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.50 using account:ESS113687 scores of KILL_LEVEL=7.0 tests=BSF_RULE7568M, 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 Adds support for eth_dev configure, start, stop, close, and infos_get. The internal structs of ntnic is also added and initialized. Signed-off-by: Serhii Iliushyk --- drivers/net/ntnic/include/ntdrv_4ga.h | 17 ++ drivers/net/ntnic/include/ntos_drv.h | 32 ++++ drivers/net/ntnic/include/ntos_system.h | 19 ++ drivers/net/ntnic/meson.build | 1 + drivers/net/ntnic/ntnic_ethdev.c | 232 +++++++++++++++++++++++- 5 files changed, 299 insertions(+), 2 deletions(-) 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..fa12d8f328 --- /dev/null +++ b/drivers/net/ntnic/include/ntos_drv.h @@ -0,0 +1,32 @@ +/* + * 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; + 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..01f1dc65f4 --- /dev/null +++ b/drivers/net/ntnic/include/ntos_system.h @@ -0,0 +1,19 @@ +/* + * 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; +}; + +#endif /* __NTOS_SYSTEM_H__ */ diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build index bf86a0a098..f372b0c3cf 100644 --- a/drivers/net/ntnic/meson.build +++ b/drivers/net/ntnic/meson.build @@ -10,6 +10,7 @@ endif # includes includes = [ include_directories('.'), + include_directories('include'), include_directories('ntlog'), include_directories('ntutil'), ] diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index 184bb43d92..2a73162d6c 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -15,6 +15,9 @@ #include "ntlog.h" +#include "ntdrv_4ga.h" +#include "ntos_drv.h" +#include "ntos_system.h" #include "ntnic_vfio.h" #include "nt_util.h" @@ -26,30 +29,221 @@ static const struct rte_pci_id nthw_pci_id_map[] = { }, /* sentinel */ }; +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->n_intf_no; + dev_info->driver_name = internals->name; + + return 0; +} + +static int +eth_dev_configure(struct rte_eth_dev *eth_dev) +{ + NT_LOG_DBGX(DEBUG, NTNIC, "Called for eth_dev %p\n", eth_dev); + + /* 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\n", internals->n_intf_no); + + 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->n_intf_no); + + 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 termination. + */ + 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_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]; @@ -58,6 +252,31 @@ 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; + + /* 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); if (!eth_dev) { @@ -66,9 +285,14 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) return -1; } - NT_LOG_DBGX(DEBUG, NTNIC, "eth_dev %p, port_id %u, if_index %u\n", + NT_LOG_DBGX(DEBUG, NTNIC, "eth_dev %p, port_id %u, n_intf_no %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; @@ -78,7 +302,8 @@ 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->dev_ops = NULL; + eth_dev->dev_ops = &nthw_eth_dev_ops; + eth_dev_pci_specific_init(eth_dev, pci_dev); rte_eth_dev_probing_finish(eth_dev); @@ -162,6 +387,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