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 1396845628; Tue, 16 Jul 2024 14:03:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E3CF4331E; Tue, 16 Jul 2024 14:02:36 +0200 (CEST) Received: from egress-ip11a.ess.de.barracuda.com (egress-ip11a.ess.de.barracuda.com [18.184.203.234]) by mails.dpdk.org (Postfix) with ESMTP id D6F09432F4 for ; Tue, 16 Jul 2024 14:02:29 +0200 (CEST) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02lp2240.outbound.protection.outlook.com [104.47.11.240]) by mx-outbound46-60.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 16 Jul 2024 12:02:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jdW5KxFxSpEh81qEtxhe+qRHcWJ8iB1URNOLen9ag+C7lLO1VP10oBRK3TXrXX7tv11R6mASZFKCXiJ4wEmA6VMAvuGFV7dj9Bymse5lAeuAnlzQmQwU4mM+UkIxnqZxETVRyuznxtvuAxJKBo5vmugCNPGsIWxL6hp2PrMsKFELYm1l+6Qzzuol88Qc4X2lFefCxMp70DpSXwKNCa0PMLBB8AT54AQhYRdBt7ywsOdcGFRfIpP2CmlYZJbd3beiwGIoW0XAQtlVBzkIPkqevdAwaEQQF86P4rp0LwDyjs3QV+B0GS0M8/H7g5/ULq54WH+PECVpblltqFSzLmNDJw== 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=DbGr1OVASP9dvfKNmfir8IyHvTeVfvN1kTTx6VOBsWI=; b=lrh2xJWAQjnQw6XCV97gy3dWMLYS/ktecwIF0r+vLgcCQmNDWrTEfrGGCqqvs8OhYTWPoXiho5F6S7FguDsQDnmnbUK7c2k1KdIjWgiSUKQ7S4eFtKbMJfQozykaBXHH05xgPFVGm3N26+603anRSLAGOENtmf7wiKAJs8CP2K1lWrOCMjRYHzXU/EUJ/DBgY0kKXBzqswrlY+ryINgGazWA7cPcfPsT9ptjILqOCKY26e+SWS+EUpWqZdjn2Z0Cb936Iij1j7fPajgxBrwTvTEs+/fHn7C1Sr800As5NQzWESeoC+tHYP4V52KJwCjS0dHB4KwPs9yvSWSsQK+ycQ== 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=DbGr1OVASP9dvfKNmfir8IyHvTeVfvN1kTTx6VOBsWI=; b=b5c47Xx5vc4CC4pUikpJCe2GaEF1UTyBjkbm5MIVno5yCvYkEE+yc2mHVjv5dsmOjdtWDg1hyAHpX+bcOo8uW3n8H15lxcgKgiKaJcDQv1N7TjJfHCq9qYFpiKhBB5N2IbEsPshZlVqeuDABn6xDdI3jJOUH38GSHXQcfwMLtd0= Received: from DU7P195CA0028.EURP195.PROD.OUTLOOK.COM (2603:10a6:10:54d::28) by PA4P190MB1325.EURP190.PROD.OUTLOOK.COM (2603:10a6:102:108::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.28; Tue, 16 Jul 2024 12:02:23 +0000 Received: from DU6PEPF0000A7DD.eurprd02.prod.outlook.com (2603:10a6:10:54d:cafe::4b) by DU7P195CA0028.outlook.office365.com (2603:10a6:10:54d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.14 via Frontend Transport; Tue, 16 Jul 2024 12:02:23 +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 DU6PEPF0000A7DD.mail.protection.outlook.com (10.167.8.37) with Microsoft SMTP Server id 15.20.7784.11 via Frontend Transport; Tue, 16 Jul 2024 12:02:23 +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 v9 05/21] net/ntnic: add VFIO module Date: Tue, 16 Jul 2024 14:01:54 +0200 Message-ID: <20240716120216.3032484-5-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240716120216.3032484-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240716120216.3032484-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU6PEPF0000A7DD:EE_|PA4P190MB1325:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: a75226fb-f04a-4fb8-42a3-08dca58f271b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+80S+YlYt5LaBfPE46ynaOI3iD3yXl+7wStDG9Gvd5VazmXFEO74cQ+loPlr?= =?us-ascii?Q?g/L/wknRxYwsyvOqpVv/1v/9ZrdHuEeuvzXwrcJhDQdsdE21nf/gEzxP/clG?= =?us-ascii?Q?n9uv/uLnSoiOp9iADdOjuTJpfe3wcRDWeVU0/EH5/P/2wgpCF8gZJluV3C4e?= =?us-ascii?Q?G7V7EiTrRDdok2dqBrpS91jXwr+GjCufE0Z7pXk0qU+xyiYo76bYDitbJdo2?= =?us-ascii?Q?T/HjOppd39CIAGbn5nmU3O5m4L6LQb9UhrBftcW1+j0bD6lHFJw7kl+jXYkt?= =?us-ascii?Q?0PtPlVn9zz2zUwy1ZAqxcCMjmq30DTWciB5q+lHF0QGdLUI53gY+QLBiZVaS?= =?us-ascii?Q?BlKQADBYaxaHvHFPnqvYxB5ispGVoPudaxPkANTK8iPyjP/aiBmv8nGGIYRJ?= =?us-ascii?Q?QufR3/SdiYgFDDZwxTl0zf/Xt7k55/jOMpFGdjM53+cWQPf2hiUzd98uNHOd?= =?us-ascii?Q?TQa52Q2h+006DZx76AhVE8XSHFMm/VfloBnWS3+9w5EwfdfU1NV6L9HFwnVN?= =?us-ascii?Q?AffcBXY9vRKmcHRgRKhpPYqZQaxxW2bAJvY2mbxE908Syi4zOx+FEVyrxDw0?= =?us-ascii?Q?s/ABY3RqtROlo4RRMw1Efj35h2gMW0Sk9205OlFLYBYmYTejTmnXdhmsVK0U?= =?us-ascii?Q?OTPgNyZXTIiImAV3B9B3uW4gqxKDm21UdhjFOZEPv4UPhFC+WuXxvlacCa1h?= =?us-ascii?Q?4itRkDeUfYNB45xzPe5mDfy060r+WVpuGfbPtoRh556nmxiqQCsfHROXRnG2?= =?us-ascii?Q?IVJRVbfyJdWPMzHfZV7/Lsl0w5I62hMXW4nLs8HJl0OcAFAZmf+R6clLRX6k?= =?us-ascii?Q?0f3cGPwrNCW4P1OYCEnFHtN7XAjDcQFWbat0Gz0kgXiA0oQfRsld8oaJ25/r?= =?us-ascii?Q?ILS2qRbjfOiSMJGW/0+6g35w+L3JllseI/us+qYtTN58nU2MPjgubZBsDQY3?= =?us-ascii?Q?JDMDlxnEC03Cy/sLEJ8iYcWKOXPaQhR3Riy97Ej3R1Qz/3amJM5DQnG/2Jn+?= =?us-ascii?Q?qFW7/jWx5Z0Phkto72et+44z/X6s9dinlWDg7eGinhGGAEASIsE5Epp9dgAD?= =?us-ascii?Q?0riTMg89hLDOJ0vzDQQJNKiF3lTfnAfe3NixiTN4VwbAQkl63dvUJGebWTLt?= =?us-ascii?Q?/ET6MJTGwUF2n9LQr15MlP73ZM4aS0f+mtBc+MzBZYFoNvt/uvsdWT4DVLLx?= =?us-ascii?Q?+Hijip7L2seY/+M01r1L/LenufR9jfy2o1Z/6jdaOGncqKAOFKp19Yw5PXkd?= =?us-ascii?Q?P8mQerWhfHRxbRMHeFD3i0QnQmB5Klbzjb7iw/R7GW7uF/7y8iFUeUkaE/7k?= =?us-ascii?Q?0kx5TOe0drmjaUcITVFnyUlafqqC2d86f8zuv2foPzg4UOQRh1xTDhvkGQAz?= =?us-ascii?Q?z2N9pX/ZynzIuxih7S7A65HekQGVgvZzSvW7EmWWgyqgw8w/SIFC+IN5xTqT?= =?us-ascii?Q?AuIK6y+9LNIcxKd41Kaxe3iC9N3PtxRI?= 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)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DU7chRhtYOIjj7u36YjOIF4be/1cMptQpkNOtMe9aJTFDaEMKKeApaUaz/+dEWIaPSoi9Wf2/PGjKSRwTVFPo3B6ZltUs4DFdWdkID5zYtQN7zGdXBxVVCGZCdda8Z9vnXI2y1LLr03nN/CHJp+cNgPdoTE95bivwM9g9UQYpo+cbl6XU7s6kFHCgRtsNR2glokc8fG7DkTdHyfc54klc3DgJgmoxgCntW5uXW6c7YfunZn3zHUG+dqsca7hs5JIfymbTGbRW7ByBa89fUMKNRXh+5SJUUpt2Ra68RhbxlBe7VT0jksm4LFOYcWZjKIRF5qffG2S7DEa+ZPSAlBQs6DFAIr5NcmJp2VxlQsSW9QHBxc23+oU0zrv+Vxdso2QoplWQSrXEIuHI5nrMCSODgAkE7a3iB2F5Ej7pE9Xx6MV/DskwvSZwqEBNhCYhcj1jyfcIKe8XUiE5FwQJ1mhJ/EVnaUnG3yu/NEA5GxaOYiOH1VktV0c4puRNGeSOHbIofVhm+hv07C/iogP9dVHf3OyKwH6BDNyhjvDbY7Dg3Mv6ZBMfikaQt2vwsoi/0KCIM//nPnd80krbqo5rCkad7laQ2yZCU8u5vDIF50kAx2QH1xGoMUJt3t7Egl8Sx6J79ERQ13YwYFFO7xSQgo/iDZoFgkyv4UVFqhq9h4EGQM= X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2024 12:02:23.1959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a75226fb-f04a-4fb8-42a3-08dca58f271b 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: DU6PEPF0000A7DD.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4P190MB1325 X-BESS-ID: 1721131344-311836-12657-23654-2 X-BESS-VER: 2019.1_20240702.1505 X-BESS-Apparent-Source-IP: 104.47.11.240 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVoYGlhamQGYGUDTV0jTZwiw1Nd nSwsDcPM3S3MjcOM3QMinR3NTCwtjURKk2FgBuv1QqQgAAAA== X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257662 [from cloudscan23-76.eu-central-1b.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 Adds VFIO functionality and the DMA it requires. The VFIO context is initialized during ntnic ethdev startup. Signed-off-by: Serhii Iliushyk --- drivers/net/ntnic/meson.build | 1 + drivers/net/ntnic/ntnic_ethdev.c | 22 +++ drivers/net/ntnic/ntnic_vfio.c | 235 +++++++++++++++++++++++++++++ drivers/net/ntnic/ntnic_vfio.h | 29 ++++ drivers/net/ntnic/ntutil/nt_util.c | 65 ++++++++ 5 files changed, 352 insertions(+) create mode 100644 drivers/net/ntnic/ntnic_vfio.c create mode 100644 drivers/net/ntnic/ntnic_vfio.h diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build index c7f5a4efc7..bf86a0a098 100644 --- a/drivers/net/ntnic/meson.build +++ b/drivers/net/ntnic/meson.build @@ -18,5 +18,6 @@ includes = [ sources = files( 'ntlog/ntlog.c', 'ntutil/nt_util.c', + 'ntnic_vfio.c', 'ntnic_ethdev.c', ) diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index 02b55e2780..b838eb4d7a 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -8,10 +8,17 @@ #include #include +#include +#include +#include + #include "ntlog.h" +#include "ntnic_vfio.h" #include "nt_util.h" +#define EXCEPTION_PATH_HID 0 + static const struct rte_pci_id nthw_pci_id_map[] = { { .vendor_id = 0, @@ -21,12 +28,24 @@ static const struct rte_pci_id nthw_pci_id_map[] = { static int nthw_pci_dev_init(struct rte_pci_device *pci_dev) { + nt_vfio_init(); + uint32_t n_port_mask = -1; /* All ports enabled by default */ 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); + + /* 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); + return -1; + } + n_phy_ports = 0; for (int n_intf_no = 0; n_intf_no < n_phy_ports; n_intf_no++) { @@ -67,6 +86,8 @@ static int nthw_pci_dev_deinit(struct rte_eth_dev *eth_dev __rte_unused) { NT_LOG_DBGX(DEBUG, NTNIC, "PCI device deinitialization\n"); + + nt_vfio_remove(EXCEPTION_PATH_HID); return 0; } @@ -131,3 +152,4 @@ static struct rte_pci_driver rte_nthw_pmd = { }; RTE_PMD_REGISTER_PCI(net_ntnic, rte_nthw_pmd); +RTE_PMD_REGISTER_KMOD_DEP(net_ntnic, "* vfio-pci"); diff --git a/drivers/net/ntnic/ntnic_vfio.c b/drivers/net/ntnic/ntnic_vfio.c new file mode 100644 index 0000000000..f4433152b7 --- /dev/null +++ b/drivers/net/ntnic/ntnic_vfio.c @@ -0,0 +1,235 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Napatech A/S + */ + +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include "ntnic_vfio.h" + +#define ONE_G_SIZE 0x40000000 +#define ONE_G_MASK (ONE_G_SIZE - 1) +#define START_VF_IOVA 0x220000000000 + +int +nt_vfio_vf_num(const struct rte_pci_device *pdev) +{ + return ((pdev->addr.devid & 0x1f) << 3) + ((pdev->addr.function) & 0x7); +} + +/* Internal API */ +struct vfio_dev { + int container_fd; + int group_fd; + int dev_fd; + uint64_t iova_addr; +}; + +static struct vfio_dev vfio_list[256]; + +static struct vfio_dev * +vfio_get(int vf_num) +{ + if (vf_num < 0 || vf_num > 255) + return NULL; + + return &vfio_list[vf_num]; +} + +/* External API */ +int +nt_vfio_setup(struct rte_pci_device *dev) +{ + char devname[RTE_DEV_NAME_MAX_LEN] = { 0 }; + int iommu_group_num; + int vf_num; + struct vfio_dev *vfio; + + NT_LOG(INF, NTNIC, "NT VFIO device setup %s\n", dev->name); + + vf_num = nt_vfio_vf_num(dev); + + vfio = vfio_get(vf_num); + + if (vfio == NULL) { + NT_LOG(ERR, NTNIC, "VFIO device setup failed. Illegal device id\n"); + return -1; + } + + vfio->dev_fd = -1; + vfio->group_fd = -1; + vfio->container_fd = -1; + vfio->iova_addr = START_VF_IOVA; + + rte_pci_device_name(&dev->addr, devname, RTE_DEV_NAME_MAX_LEN); + rte_vfio_get_group_num(rte_pci_get_sysfs_path(), devname, &iommu_group_num); + + if (vf_num == 0) { + /* use default container for pf0 */ + vfio->container_fd = RTE_VFIO_DEFAULT_CONTAINER_FD; + + } else { + vfio->container_fd = rte_vfio_container_create(); + + if (vfio->container_fd < 0) { + NT_LOG(ERR, NTNIC, + "VFIO device setup failed. VFIO container creation failed.\n"); + return -1; + } + } + + vfio->group_fd = rte_vfio_container_group_bind(vfio->container_fd, iommu_group_num); + + if (vfio->group_fd < 0) { + NT_LOG(ERR, NTNIC, + "VFIO device setup failed. VFIO container group bind failed.\n"); + goto err; + } + + if (vf_num > 0) { + if (rte_pci_map_device(dev)) { + NT_LOG(ERR, NTNIC, + "Map VFIO device failed. is the vfio-pci driver loaded?\n"); + goto err; + } + } + + vfio->dev_fd = rte_intr_dev_fd_get(dev->intr_handle); + + NT_LOG(DBG, NTNIC, + "%s: VFIO id=%d, dev_fd=%d, container_fd=%d, group_fd=%d, iommu_group_num=%d\n", + dev->name, vf_num, vfio->dev_fd, vfio->container_fd, vfio->group_fd, + iommu_group_num); + + return vf_num; + +err: + + if (vfio->container_fd != RTE_VFIO_DEFAULT_CONTAINER_FD) + rte_vfio_container_destroy(vfio->container_fd); + + return -1; +} + +int +nt_vfio_remove(int vf_num) +{ + struct vfio_dev *vfio; + + NT_LOG(DBG, NTNIC, "NT VFIO device remove VF=%d\n", vf_num); + + vfio = vfio_get(vf_num); + + if (!vfio) { + NT_LOG(ERR, NTNIC, "VFIO device remove failed. Illegal device id\n"); + return -1; + } + + rte_vfio_container_destroy(vfio->container_fd); + return 0; +} + +int +nt_vfio_dma_map(int vf_num, void *virt_addr, uint64_t *iova_addr, uint64_t size) +{ + uint64_t gp_virt_base; + uint64_t gp_offset; + + if (size == ONE_G_SIZE) { + gp_virt_base = (uint64_t)virt_addr & ~ONE_G_MASK; + gp_offset = (uint64_t)virt_addr & ONE_G_MASK; + + } else { + gp_virt_base = (uint64_t)virt_addr; + gp_offset = 0; + } + + struct vfio_dev *vfio; + + vfio = vfio_get(vf_num); + + if (vfio == NULL) { + NT_LOG(ERR, NTNIC, "VFIO MAP: VF number %d invalid\n", vf_num); + return -1; + } + + NT_LOG(DBG, NTNIC, + "VFIO MMAP VF=%d VirtAddr=%p HPA=%" PRIX64 " VirtBase=%" PRIX64 + " IOVA Addr=%" PRIX64 " size=%" PRIX64 "\n", + vf_num, virt_addr, rte_malloc_virt2iova(virt_addr), gp_virt_base, vfio->iova_addr, + size); + + int res = rte_vfio_container_dma_map(vfio->container_fd, gp_virt_base, vfio->iova_addr, + size); + + NT_LOG(DBG, NTNIC, "VFIO MMAP res %i, container_fd %i, vf_num %i\n", res, + vfio->container_fd, vf_num); + + if (res) { + NT_LOG(ERR, NTNIC, "rte_vfio_container_dma_map failed: res %d\n", res); + return -1; + } + + *iova_addr = vfio->iova_addr + gp_offset; + + vfio->iova_addr += ONE_G_SIZE; + + return 0; +} + +int +nt_vfio_dma_unmap(int vf_num, void *virt_addr, uint64_t iova_addr, uint64_t size) +{ + uint64_t gp_virt_base; + struct vfio_dev *vfio; + + if (size == ONE_G_SIZE) { + uint64_t gp_offset; + gp_virt_base = (uint64_t)virt_addr & ~ONE_G_MASK; + gp_offset = (uint64_t)virt_addr & ONE_G_MASK; + iova_addr -= gp_offset; + + } else { + gp_virt_base = (uint64_t)virt_addr; + } + + vfio = vfio_get(vf_num); + + if (vfio == NULL) { + NT_LOG(ERR, NTNIC, "VFIO UNMAP: VF number %d invalid\n", vf_num); + return -1; + } + + if (vfio->container_fd == -1) + return 0; + + int res = rte_vfio_container_dma_unmap(vfio->container_fd, gp_virt_base, iova_addr, size); + + if (res != 0) { + NT_LOG(ERR, NTNIC, + "VFIO UNMMAP FAILED! res %i, container_fd %i, vf_num %i, virt_base=%" PRIX64 + ", IOVA=%" PRIX64 ", size=%" PRIX64 "\n", + res, vfio->container_fd, vf_num, gp_virt_base, iova_addr, size); + return -1; + } + + return 0; +} + +void +nt_vfio_init(void) +{ + struct nt_util_vfio_impl s = { .vfio_dma_map = nt_vfio_dma_map, + .vfio_dma_unmap = nt_vfio_dma_unmap + }; + nt_util_vfio_init(&s); +} diff --git a/drivers/net/ntnic/ntnic_vfio.h b/drivers/net/ntnic/ntnic_vfio.h new file mode 100644 index 0000000000..69fef7923d --- /dev/null +++ b/drivers/net/ntnic/ntnic_vfio.h @@ -0,0 +1,29 @@ +/* + * SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Napatech A/S + */ + +#ifndef _NTNIC_VFIO_H_ +#define _NTNIC_VFIO_H_ + +#include +#include +#include + +void +nt_vfio_init(void); + +int +nt_vfio_setup(struct rte_pci_device *dev); +int +nt_vfio_remove(int vf_num); + +int +nt_vfio_dma_map(int vf_num, void *virt_addr, uint64_t *iova_addr, uint64_t size); +int +nt_vfio_dma_unmap(int vf_num, void *virt_addr, uint64_t iova_addr, uint64_t size); + +/* Find device (PF/VF) number from device address */ +int +nt_vfio_vf_num(const struct rte_pci_device *dev); +#endif /* _NTNIC_VFIO_H_ */ diff --git a/drivers/net/ntnic/ntutil/nt_util.c b/drivers/net/ntnic/ntutil/nt_util.c index 5395bf6993..53c39ef112 100644 --- a/drivers/net/ntnic/ntutil/nt_util.c +++ b/drivers/net/ntnic/ntutil/nt_util.c @@ -15,6 +15,8 @@ #include "ntlog.h" #include "nt_util.h" +static struct nt_util_vfio_impl vfio_cb; + /* uses usleep which schedules out the calling thread */ void nt_os_wait_usec(int val) { @@ -31,3 +33,66 @@ uint64_t nt_util_align_size(uint64_t size) { return 1 << rte_log2_u64(size); } + +void nt_util_vfio_init(struct nt_util_vfio_impl *impl) +{ + vfio_cb = *impl; +} + +struct nt_dma_s *nt_dma_alloc(uint64_t size, uint64_t align, int numa) +{ + int res; + struct nt_dma_s *vfio_addr; + + vfio_addr = rte_malloc(NULL, sizeof(struct nt_dma_s), 0); + + if (!vfio_addr) { + NT_LOG(ERR, GENERAL, "VFIO rte_malloc failed\n"); + return NULL; + } + + void *addr = rte_malloc_socket(NULL, size, align, numa); + + if (!addr) { + rte_free(vfio_addr); + NT_LOG(ERR, GENERAL, "VFIO rte_malloc_socket failed\n"); + return NULL; + } + + res = vfio_cb.vfio_dma_map(0, addr, &vfio_addr->iova, nt_util_align_size(size)); + + if (res != 0) { + rte_free(addr); + rte_free(vfio_addr); + NT_LOG(ERR, GENERAL, "VFIO nt_dma_map failed\n"); + return NULL; + } + + vfio_addr->addr = (uint64_t)addr; + vfio_addr->size = nt_util_align_size(size); + + NT_LOG(DBG, GENERAL, + "VFIO DMA alloc addr=%" PRIX64 ", iova=%" PRIX64 + ", size=%" PRIX64 "align=0x%" PRIX64 "\n", + vfio_addr->addr, vfio_addr->iova, vfio_addr->size, align); + + return vfio_addr; +} + +void nt_dma_free(struct nt_dma_s *vfio_addr) +{ + NT_LOG(DBG, GENERAL, "VFIO DMA free addr=%" PRIX64 ", iova=%" PRIX64 ", size=%" PRIX64 "\n", + vfio_addr->addr, vfio_addr->iova, vfio_addr->size); + + int res = vfio_cb.vfio_dma_unmap(0, (void *)vfio_addr->addr, vfio_addr->iova, + vfio_addr->size); + + if (res != 0) { + NT_LOG(WRN, GENERAL, + "VFIO DMA free FAILED addr=%" PRIX64 ", iova=%" PRIX64 ", size=%" PRIX64 "\n", + vfio_addr->addr, vfio_addr->iova, vfio_addr->size); + } + + rte_free((void *)(vfio_addr->addr)); + rte_free(vfio_addr); +} -- 2.45.0