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 6D560455F3; Thu, 11 Jul 2024 14:08:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 243F942E5A; Thu, 11 Jul 2024 14:07:57 +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 EF37442E5A for ; Thu, 11 Jul 2024 14:07:53 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2104.outbound.protection.outlook.com [104.47.17.104]) by mx-outbound41-230.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 11 Jul 2024 12:07:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gwgzuYAFLw4/rVbMS84dQf3ONxvKcqRW39Px4MrnvDAgtJNfnagObgsWwnz8t1MBEGO2HhlyUr6MUBqGmOj8nWdmJ/uAeeWd++8TGMyHwaXUwQ/r3/9PAisHjHol2DDnYIoDoKPdI6hwUY+ijHXzKCK0j9Ki9j4qnkTwg2njR4a6GnXvFAaaqKVBqlRQ52Y90A0I8WCR4Qpyk81iIgGdf5syvRFUPsGB53HR1/pD1UnlNLnxW6DfRY6+2/o1xtqVwTpc7VFFEt1+XJeQhz3KT/eYl0br5zDtjmSnyKIz+1uZ6sCisBS4QDK7DgDuVSwzZDsQlH69QsPxUf86Ce0pNg== 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=Q/GDHnPIgKGUE2u1gYyI6r6H0jG3S2SEkX5vaXGPaPg=; b=ubXn0F8WpKoS7JM1TyZdty/l9QiHPbWGCm+4nUblsZe5+Xzi+2X25ZJkwr1+F247df1DHbPP5hTZDoEQKOi+0hrfjAMVdBMYKC+vvDm0r+94FMo9QlItgRuS1GJUpjJsmY91b9+R2ApN5zUffmnbGgX4OHIix8FM1dzIildgZWv/8vxkCgHxYmzBdMMQg0DGWlnZ6dgt6hcsGYyhb09KYIvVsNGm8HDDGw551LYqXUGOrr/CP+UekRJ9vGXFbx4usXkUPgXFiZSgWmdJaHmRrmueDbc6KMizVfc7QqjD15NE/TSfKp8mApDhrDYbDP49Y8ijpWZ0GG2iz//ZsMAipw== 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=Q/GDHnPIgKGUE2u1gYyI6r6H0jG3S2SEkX5vaXGPaPg=; b=pyyN5Za7kkHhpRQ2aAJRKlxlFbgM5SZRMMRjuqBTKNHfr8HcHStxeCJTzGpXAdcVQQd6snhP5rfeJcAQNL6wKAXfHiWn7xag9jj/vwQ0p5ThzAkefDm1FUloPQ5wRZL/QjYxzeACGnKXL6kNiE08eNSZCZFlZapEeaoHKj3ClE4= Received: from AS9PR04CA0093.eurprd04.prod.outlook.com (2603:10a6:20b:50e::21) by AM0P190MB0658.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:192::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.20; Thu, 11 Jul 2024 12:07:50 +0000 Received: from AMS0EPF0000019F.eurprd05.prod.outlook.com (2603:10a6:20b:50e:cafe::f) by AS9PR04CA0093.outlook.office365.com (2603:10a6:20b:50e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.20 via Frontend Transport; Thu, 11 Jul 2024 12:07:50 +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 AMS0EPF0000019F.mail.protection.outlook.com (10.167.16.251) with Microsoft SMTP Server id 15.20.7762.17 via Frontend Transport; Thu, 11 Jul 2024 12:07:50 +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 v6 05/21] net/ntnic: add VFIO module Date: Thu, 11 Jul 2024 14:07:16 +0200 Message-ID: <20240711120737.698176-5-sil-plv@napatech.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240711120737.698176-1-sil-plv@napatech.com> References: <20240530144929.4127931-1-sil-plv@napatech.com> <20240711120737.698176-1-sil-plv@napatech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF0000019F:EE_|AM0P190MB0658:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: b0cbcb16-182c-4730-c829-08dca1a215eb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6iJ8XmHsTrdGRL5hJWvMNEX/oNrdUcU4FQ1UMg+9+gtFTSUOIia9vkhVk8uH?= =?us-ascii?Q?h3MBNQVUWxKCdd4MyL+NH9Bu0RpOJARmpEpb+nBNlCDH6hYsqGnHlpOpT6CE?= =?us-ascii?Q?3Cl2mCCqZjiJASTKk47F8hi2uMcJdc/bUg5hpnpFiCEd0MSGuvpu5IeuRfyo?= =?us-ascii?Q?McSdI2TW/L9WD0XWteDp3LlxqlpAnP9pcwSaBbki/WdsO9on7G+5GMymZx5I?= =?us-ascii?Q?tUQpKhALqztJa29PgzcMYK/FEdVUj5bcELWSrIpSyTySVclnbi/xotLTrwJI?= =?us-ascii?Q?HoZNhY66v1JXID+2/ebVfw7vuuFFxLKJ/0IevHL0amrjgZtH4PjHkHAsFTwk?= =?us-ascii?Q?gBoDHh7KTPf8WW2ChZ+tcvLzZNa1InXL5waKIpIERAtofwN1bVAWERJW56R5?= =?us-ascii?Q?TSpb49Hjz45WeendWELeVcBT1qm2mT9oKF+0C6GmXijJ6bm2+OkY44ZQku8q?= =?us-ascii?Q?HlzEVKgu+X9Jxium+mpakvwFgF4dvo5y45zz0YVDlAYLMVOGiFxquFgY5Z85?= =?us-ascii?Q?G+CoXbtCshR73yDwSydo9fbt1rkTOp9oJWXG5sDPGwUgL+i8uINqbupI+FXM?= =?us-ascii?Q?TCVSL5wia1N3lyLy3eQ9b52OY+cyB201FYqrRuZEXkGXtS71Juo29Yk96TcK?= =?us-ascii?Q?LD3W5zZYd8jv2vp6mtxygxqm5j+iFbn1w9+ksj/mW/b+yrRqFgh1j4/FWjro?= =?us-ascii?Q?ntsv7TVTyxRmibh0uHOe3XiWgPz97ujtzmYwkpKYfZvCrCR3fvm3EqPGANY6?= =?us-ascii?Q?OlHaXxL7G37KNeXKEj4RAE4xSDmKJ9n0Q5/tpuy9xzsTH64qZ9IIPuqeTlaE?= =?us-ascii?Q?8E52UPHTO+je2doQhfN8Dr+jyd6pmDr7Jgopvq8hkYaSf5IuPX11cu/eyhjY?= =?us-ascii?Q?SjufYFUOMmV2/Lym1u7nZ9Pw4GcKkNP8evO5cpfuPw15Xio6eIZxDzojBYpm?= =?us-ascii?Q?y+55voE/rLHZHyW5kRRe2Z7cqeSKZ3wgZaHzuxQNKe/as6KdFWRUjqAd3fYl?= =?us-ascii?Q?jRHNOwagVxf/HU4zK3vsT21DIYujgtsnwyOLm7mg5Fj07fuGSKay8nJtj/9A?= =?us-ascii?Q?ul2e57Y3DHWgghgsba61lDdpr43fo2ulEAjiFPvxyGGxJAR9PrqN5lAjg//N?= =?us-ascii?Q?ewpppytluZrwQW3cWAO3tpxP6zMNwrsl1OB4bfqsqB0Opwd1zRXLdWrWndP1?= =?us-ascii?Q?dr3Dkipuzw/Rmo7qIdHwy98UxDAnNsYLD41NZMyLnMc2Bs+ZA4qwfqVDas36?= =?us-ascii?Q?CKDze0spRxwVh5eDq2QObkYX3jT2pSMlGb6LEiP5ARVIwTxMVKgFmtj0zKl5?= =?us-ascii?Q?p2ADbLza7iMrXrXU2rHze4wy/wkPzWbK0MIvp55ySxIeA+oAhSZCKxb6GElw?= =?us-ascii?Q?xFmE+9j4sOfC8ToNpecreFLdM+sl41Cb1ShsIKkbCzg1UR3EDo5VFPQIwU10?= =?us-ascii?Q?EQsN9mjdD1+r4wnheKPxjh7HqKE7NWLL?= 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)(36860700013)(1800799024)(376014)(82310400026); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: qbDY5gXOxWF/oIP5Lk9YFtbwiJz2IJV9vGQ6ZCnL4KTPVXC60FPsdj5zZRSGoPtTVhgdF4EyI9Rfgt27b2v+hFfvNqYyvg21G5huuSokT4LTRpVddTubCQ0q1utOWtRbKuBVkX/ou/Q0lAxmTFuEjQ6oeHbRvzxtUwEOE8YFphEugxamo5Ywwlq3PW7BSYpC2hB9GQyrmUt2sKxCumqHbS9RJ/wRRV+/G9Vf8c4sTOr5EYG3RnP4ltYVW+MmDH7m4+pbMfKzPYjAP7q+NfaaNa4cbJLFYjcSbPH78w8b/xnoG397lxnhn+PVviNgXcXb6MfQk7K6MRpEE1IIsZ4l8T71uLIe2dh4HTpAMSppt/s56qZXjcugV0khZRFUcvY0Y7KmQAebj8M4AmTZU4o/Akz8jgVq7T1wXWsSzmpObAT8f1YOVH/E6ecE/wSQVS/Ho1Hbcu/x6ge95hNWEIfi3xG9pzQfnBHEKY6Yv5SRyEI/p8qi1KF803Dd/dZdWbB1BADJEJqVmCtttIw3s+dAcKyLMS1oenyL5EHGXObQ1LLD6F6r2X63bkgSEHUO9/5l2/RFGf31dK24HYebdNTuO9x8HU3Cx7zJZFUdkrtNRYW7iIy4rMlmVo2QH2BGMehpfNJd4TsHxIOSBejij/0l/GZuLGGCFYd6s438vm97lcA= X-OriginatorOrg: napatech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 12:07:50.2909 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0cbcb16-182c-4730-c829-08dca1a215eb 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: AMS0EPF0000019F.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0P190MB0658 X-BESS-ID: 1720699672-310726-12654-23689-1 X-BESS-VER: 2019.1_20240702.1505 X-BESS-Apparent-Source-IP: 104.47.17.104 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVoaGBkbGQGYGUDQ5NS3RzDTJxN jI0sLIzMDQLCk1LcncMs3YwMLU2NjCVKk2FgDLrVYUQgAAAA== X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.257551 [from cloudscan11-141.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 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 | 23 +++ 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, 353 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 26700eba6c..184bb43d92 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -8,10 +8,18 @@ #include #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 +29,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++) { @@ -86,6 +106,8 @@ nthw_pci_dev_deinit(struct rte_eth_dev *eth_dev __rte_unused) continue; /* port already released */ rte_eth_dev_release_port(eth_dev); } + + nt_vfio_remove(EXCEPTION_PATH_HID); return 0; } @@ -150,3 +172,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