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 B6A2945509; Thu, 27 Jun 2024 09:39:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDA5C40B99; Thu, 27 Jun 2024 09:39:34 +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 414DB40697 for ; Thu, 27 Jun 2024 09:39:29 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2104.outbound.protection.outlook.com [104.47.17.104]) by mx-outbound22-108.eu-central-1b.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 27 Jun 2024 07:39:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pp3N+nqTJTOoMw7uFDroJUJ+mbMRG20vprId4Xj117wjOTMHvustmGiJ2w+ZpF7IWo136scWSq3trgWNrMOc4UOV5ZNMeCNFtaPx1qP8SiLFE5ceDSTLaPi+hJraH3F10KTjkCRfVw5nTybWta/O6FRZ0hWsPv5AGK8EuIBKGOliRSEDq8oDJU9iOR1sNmByLrRTJyHyH1r2M2LOxGu31FXiGGAmOvbYCZ67rxLUh3PSfowGZkVSc1eRShe7BkXgkslJH1B0kU2cFTqY5okdpXtNWpYQyRjn6ky6LfT4jHZYmu7P5nhJ9p0+fPWKjctMGDQ1lnSIbC1CmiaU1ldAzQ== 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=wVSImpkEG0L+LbsjKneTELaHwV9f+uASfpK0h4SHQNE=; b=Qk7BQZAhWFp7d3BoD7T3c9Evyu5V4I5BpWNR/IJRfXU2ATLcbMv7z9GQjGD0vQ/Bg73KG7JjMz29QhjaW83RJ4PMgh8XdkRgn5EWpypQUPkWt0iEuKxC6fNLFkb70g3RpjdvjesKyEUjwH8GAOpKGA/1++f9xLImENBUT23FxVXcr5LxKd83hiT5unqk5D8Tm+5FbwWIwT0nt3IgQFUcCz3SKSUAU6dwboM6ravSlMG3tUXD6Qc3p22Ld4r9oOfS9h36RWQxqPYgDOKpIFndpgCvunpf3SNw89jw4flSeUd+Aw5b/xBpOS1HdgfsmcDbWDjB6sBg81s4vUekEcK2GQ== 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=wVSImpkEG0L+LbsjKneTELaHwV9f+uASfpK0h4SHQNE=; b=OFS9cckdENNull3tEz0hKwy+BAVpTH3vZhOXowR+/GHP31r5rcRCP4BdQmcwJp1Bdf0VDx0belKqMISeadMSaXVaQ9fMs2R9CKnrr5Slzpus9Kxxk1xv8JxE6FAnGE8U3yfP/Gyt29AH/jRSPudy/pVx/PNDCGPj8xZ3IFy4oV4= Received: from DUZPR01CA0337.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b8::10) by PA2P190MB2132.EURP190.PROD.OUTLOOK.COM (2603:10a6:102:41d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.35; Thu, 27 Jun 2024 07:39:26 +0000 Received: from DB1PEPF000509E2.eurprd03.prod.outlook.com (2603:10a6:10:4b8:cafe::91) by DUZPR01CA0337.outlook.office365.com (2603:10a6:10:4b8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.25 via Frontend Transport; Thu, 27 Jun 2024 07:39:26 +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 DB1PEPF000509E2.mail.protection.outlook.com (10.167.242.52) with Microsoft SMTP Server id 15.20.7677.15 via Frontend Transport; Thu, 27 Jun 2024 07:39:25 +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 v5 05/23] net/ntnic: add VFIO module Date: Thu, 27 Jun 2024 09:38:46 +0200 Message-ID: <20240627073918.2039719-5-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240627073918.2039719-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240627073918.2039719-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF000509E2:EE_|PA2P190MB2132:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 9d7ea500-1051-4f1b-9183-08dc967c4543 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?QHJ1B37A4odWiLIukorRqCnLi1BFeNgF2Dw7GhyqpU14Gvd037AwWGt36oo0?= =?us-ascii?Q?Bj8Dpl2Ed6tghqG4YM9U2jOatQaZY2y8kPmpkIsp2Detqci0tLATVXMcwWiH?= =?us-ascii?Q?XgX7I677zd70xbDZMnXpFEshSHHqNXPJYCOEXLNo8Wx1862Amwbi97DxOoNU?= =?us-ascii?Q?xntT6EIg7VqXbNpKpmnkXZRn+0OgJ14DU4YF2NHe76NXAaZV1ezS0dz1UmP2?= =?us-ascii?Q?Ud04GiKMO9C8AkYKS/27Xgp9JMSrFaHCXGCjkZdv08I8yGRt1nIxT4tr0HCS?= =?us-ascii?Q?9CzdCZItj8rvNRPM/cmKTnifngq/zRgGriilkKqpD+qqx07UaA5wgxTaO6UN?= =?us-ascii?Q?HHU+0iEIbB6riFoMQnlE0nw9+Vr9MmBMkD4S1keMZD2DC3swNehEyQ4YR7Mm?= =?us-ascii?Q?bnkIO2a8NL+cvetggh02d+LdK0r/Qt5LLAUO9DPJkOkTVtN6f8QZOV43KIcj?= =?us-ascii?Q?iYsiQxY4DSy5Ej6try2SQEkv3A4BSd0ODVPeRBecoo8xoqm4NsFOKwLJg0Wt?= =?us-ascii?Q?sL9GM920X1uGjL0ry+BOR2zXF3CwYhAP7qOwMJRtEKbCTMSAzMEiufIDrMOt?= =?us-ascii?Q?67LSK4ZrB3HR23JMAHB+QY/qgxlV3E2TxHcabw2Kk9ljQVR7FtuATEcKDOF1?= =?us-ascii?Q?egJ3ocElyTibwXVwC61HaL/zDAYz4j1UuyILbCfANqvPeRqh+SrLs4Y2KYwf?= =?us-ascii?Q?dS/IRO6qc1wspxYpMRgIvbDf3DXpkrSu6XyZxFSPfu5YSejzh66pPAkOGmJl?= =?us-ascii?Q?6lfdxMoX/aKI5vmJMXxrpjP9xRS6SX9gnDNYg/JzodCrsqD7tqsyc9zGJyZ7?= =?us-ascii?Q?xNr5t55BDI/l19aUbl0xHK3ikC6z9p+PKF4j46+lbFyqaulK1X37LvDGmLSw?= =?us-ascii?Q?bXPF72hUc2Hnc0+oJsh5swYZotSN49qkcOXtTG+7RDEUd3rvlP613rJJQcnu?= =?us-ascii?Q?X7arHg/MA2FrdKa8YdagMPOtj09AsZIc3gBV+TWhF1BWJ5hUKk5Cosrr1faA?= =?us-ascii?Q?nKsMa7mE1f/nFGpafiK6ekP3inv6eKwP6s301WzXC1wPnUQPdmjKbiD0cuTS?= =?us-ascii?Q?d6Br+tITZu8C4AwDpco4zNzsDRMQagyp+db7thb/3iI6wMfChYDBimZ2didI?= =?us-ascii?Q?FGDyM/KVASd2SbAAmJbgTF/OWkL+NHwMPRbRzCzRM5Fh7Qd4TvM4pajIJU34?= =?us-ascii?Q?fWouLa0fiEn2x8Y5io160KHnRnKv8QexN6vx/n/6gJHCZusbiVxMnz52QZ9J?= =?us-ascii?Q?PDSQI9SeKcGh7SKqkLO8ZaCTqwb89QIbKdoXVrxTGZZ3jw3zOdVRcWYvcDsh?= =?us-ascii?Q?D0qtwHNoc6mtQerrxH/QS9gws6scvvjrtgll++btZi/hIXir7cmJnXZP4P4f?= =?us-ascii?Q?T3Uqm/qk4c2DHOZslztmOgysvV7APqNlHh+9gd/cC5MMcUWG1HHlYevOjpMf?= =?us-ascii?Q?HZ2OVs6GBH37XjW1fsL/8GVCRevILVYW?= 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)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: RqeAit7kJEY82kmBAZEMqRcWqPkeNaiHr/2CiuHYoo0K2UQMuaY6L86InlKsAMhPPZvOJ0mAM75nwE07ZuefbHAS83l7Rgg3udXIr8pobYW4xzxC3/sZoELJ0Ax0Bv84C9egTr1iplV6+RWrqoL25kvWCZYn9KdISBsTRQ7I5NXniKsCONTU+cm/rzEKxM0VxHvpARNIlqT12NQKUpoChWWkJOZt1TxJQN2ues5yDPXgzAwYmXePTA/0QDsXAgM4q2qXM1fUqwaRxciYjAkf6MazvPQ06s5+GM+N7uKKi8xm1CZZ/ygmf0Sz4PolKwgd4I+uSU/m9lrMEg8fdPNB9sUyrO75vOPj+KDn0aSxAXbL/J1I6N1Fd9tiWNr84kwA857C0kAXcRTG0K0sn4HymwmrbY55DA/2APx0NbCAGOLaYe7SHK0vYNwpc1LqyPAhXUgifMEC/hALo/2DPHOiN8E+hHy8AUJPs+gT8dl2sbhetZfhurBmY69RD1t0YSvFc9tCl83ErP/PKn3hEc6O13ExmCh9p9Ri6Pjo0UR31kORV9cepDf/zeiblfpuugsO8a7rl8xdCcyyvxrOWGKf88FQDvR6p6PEyDTFXQmaXo8BRQ85AMj6WJapcQfk14W5ss1xQOgbX8Of1D5eZ7fyvQ== X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2024 07:39:25.9122 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9d7ea500-1051-4f1b-9183-08dc967c4543 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: DB1PEPF000509E2.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA2P190MB2132 X-BESS-ID: 1719473967-305740-12657-2601-1 X-BESS-VER: 2019.1_20240620.2317 X-BESS-Apparent-Source-IP: 104.47.17.104 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVoaG5qbGQGYGUNQiNS0tzdDYwD Q1yTDJKCUtKTXJPDXZIs3cyMzI3DzVVKk2FgA+8zMaQgAAAA== X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257231 [from cloudscan18-141.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 Add ntnic VFIO functionality. Signed-off-by: Serhii Iliushyk --- drivers/net/ntnic/meson.build | 1 + drivers/net/ntnic/ntnic_ethdev.c | 20 +- drivers/net/ntnic/ntnic_vfio.c | 235 +++++++++++++++++++++ drivers/net/ntnic/ntnic_vfio.h | 29 +++ drivers/net/ntnic/ntutil/include/nt_util.h | 15 ++ drivers/net/ntnic/ntutil/nt_util.c | 65 ++++++ 6 files changed, 362 insertions(+), 3 deletions(-) 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 d364cf8621..145f586a92 100644 --- a/drivers/net/ntnic/meson.build +++ b/drivers/net/ntnic/meson.build @@ -23,6 +23,7 @@ includes = [ sources = files( 'ntlog/ntlog.c', 'ntutil/nt_util.c', + 'ntnic_vfio.c', 'ntnic_ethdev.c', ) # END diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index c9726343a1..a4e32c30fa 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -8,25 +8,37 @@ #include #include #include -#include -#include -#include #include "ntlog.h" +#include "ntnic_vfio.h" #include "nt_util.h" +#define EXCEPTION_PATH_HID 0 + /* Global static variables: */ 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++) { @@ -76,6 +88,7 @@ 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; } @@ -157,3 +170,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/include/nt_util.h b/drivers/net/ntnic/ntutil/include/nt_util.h index 3c7b6cfce4..6dfd7428e1 100644 --- a/drivers/net/ntnic/ntutil/include/nt_util.h +++ b/drivers/net/ntnic/ntutil/include/nt_util.h @@ -24,5 +24,20 @@ void nt_os_wait_usec(int val); uint64_t nt_util_align_size(uint64_t size); +struct nt_dma_s { + uint64_t iova; + uint64_t addr; + uint64_t size; +}; + +struct nt_dma_s *nt_dma_alloc(uint64_t size, uint64_t align, int numa); +void nt_dma_free(struct nt_dma_s *vfio_addr); + +struct nt_util_vfio_impl { + int (*vfio_dma_map)(int vf_num, void *virt_addr, uint64_t *iova_addr, uint64_t size); + int (*vfio_dma_unmap)(int vf_num, void *virt_addr, uint64_t iova_addr, uint64_t size); +}; + +void nt_util_vfio_init(struct nt_util_vfio_impl *impl); #endif /* NTOSS_SYSTEM_NT_UTIL_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