From patchwork Tue Apr 3 08:28:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 36912 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D77E71B686; Tue, 3 Apr 2018 10:30:13 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0073.outbound.protection.outlook.com [104.47.2.73]) by dpdk.org (Postfix) with ESMTP id D27AEAAEC for ; Tue, 3 Apr 2018 10:30:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=GTLDvX8zrwUl7ddHfFL4W199oP1n3xcz3adguk9ZbJk=; b=bmSxiiSbAZEZ9799xItJU3x4MuqUzc4xvkeOwbNGyK/UTmpgrrI5+mj8vnfFKYvG2CQWs1G/UzSCL7zbCoyDAaQZLtve+FwrOZ8rx3R/KD8QroEPQa9i7BOOscy72hsjUFAMKcmemgvru7zWjnVDcsgYzeXzoDnV7dg57pi/EB4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by AM2PR04MB0753.eurprd04.prod.outlook.com (2a01:111:e400:8411::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.10; Tue, 3 Apr 2018 08:30:06 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: anatoly.burakov@intel.com, thomas@monjalon.net Date: Tue, 3 Apr 2018 13:58:06 +0530 Message-Id: <1522744086-31507-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522744086-31507-1-git-send-email-hemant.agrawal@nxp.com> References: <1522658173-13955-1-git-send-email-hemant.agrawal@nxp.com> <1522744086-31507-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BMXPR01CA0041.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::27) To AM2PR04MB0753.eurprd04.prod.outlook.com (2a01:111:e400:8411::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0db974c1-9e3c-4215-81ed-08d5993d1b3c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM2PR04MB0753; X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0753; 3:M0dLdAkCCJjmTqCE0auZ/DSI6dX9OUN2dwV3avffJh0VuXbQr5/5tSXrEmGbzLM1SycnCXu4CAb+F7XqkwsVOryvplf/yt+TCq37oHLvvlwEbiDJKgWHWgw/z3PNUOfY1HPo8fX3SziMgeYf7WeXHTCF67LFrwa5Q6nrQ2lWXOxN1I1lB8avcfi1U8noboiaJQCUKsAJdE42wy4k/AaDrZGUmGp8BfdPZ1lOnc4kDrzR5tEX8Dek/TbC1yjQu4of; 25:LU6QZKOX/KxaJoP5gUFbcUE8iITceUw/O4sUbKdRQVx6eQwKuiM3F0TncvwV9Jm8xfITSWGUVCmC3+9L8m1Ze0i6vDTsDPoOtBL2rBCV6cA/668WKfsQrijaF92ruiNuWuJJxDnVfk3Mqf87R/eamyS+yycVVg6K3feRIUICUQMMJhucDMv6zVbjUPSEYC51lV5/fluf2+S2pfFwllLVjFwzwMLvb0k/Tgf0I3W+KdUm4KUzgu37XMhJpU4whEyMBpj+Q6zcV/xWPiX3PmBnw5g0gZTWS4vFFxKvx8DMErGLgz4kQk9QVwsrOddR1n9UYl9VQtpG0ECElkxE4F8DVA==; 31:20OceCKFpKBtVLEAA4g79yAx9pU/dpgQp7sH1rCRjTyB853NEEN8I5jRUnLFAQ4VBua8r3/Egop9opsfyfUv444HjHZitNQ6w1Oczh1EOX6RXdh6/gx3rx/e+5HTVGOs5AHPKs6T4pBbgZHZjso8kuL9gVmIt7AVM/nOnwOaF90L198P/GSPXovG7pNEQJjxKYBSKnClZa3m29VB8Af5fgHt5vPZJKqcgAtF3biFplY= X-MS-TrafficTypeDiagnostic: AM2PR04MB0753: X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0753; 20:IsDAz03lyU0PV2Ki8YPvyxajsndjwtyLCPBLv+eSSIyJuCpVGKjLGdsDHV61vQ23SAWEc/6ARF0Lqd8z/TfocRLNyesvB8WFgUTQc7oEXGdCf+JWqVHeGT02SQFSq43vF8xQiHHLu/Yo69gQUqn9G2P30I/YOO1q4HOB6P9DM1YsFpx84EX33mpB45e97BFxMHFyX3H2QjcuX5nO34D+haocMJji/uES6Cp8jUTZDU+L9lMwgdJ13hsD2lch/rDfJEsEh0L7n7zffSFRxNmuIHoexfsoHE6jeZprugU8h7MnjR0VQtdwRWfUbXCjDTMueYJdC+wF2OITV+bR3JlcdY2nN7B5WN6KRBdLsSkV2qhhQgdqwaOIvlaVJH7HsIYEVuqfTWqAWQOX2SZslt2S+GGOobKWNBqDHel6GsV2OcWLXmYJiWwdhUPtzs6nz0HZri2ecIQ28kF1IjecVd4MTxrfnPGLv/ncV9QoUF3S66edd54Oke5d9yzG7LU85sxv; 4:J7KwPVpZljw37kj+0K9nVvhw0bYiLsc6jdXSXhfJ/Q+hM2N+TDWf6IWifz2keWjd9enOlspr/rjChzXnMFTC9xpnguAcQ4266Nq7qBIdOSTj8nYx4BK3LCed6ADRLqdPqnu9ttI0WHDn4n+1ovhSJeNrmhgjpJNSd8VgYnPdwJJLgtHxmUHZBFR4hYVpCgcC7/O/vEQWc2lWYqLrR5NSQVTspYpEgpVx4pcgNvABpPaT25Dc8IxL+a2E8HRtX2qfB4peuzRQH6DmrRB9hbN7auIQC+wTO56J3FX+hfOc+rCigBB5S0Ekx4czPjpV6nmS5gnG5cUeRnFhM4OMF0+Y3qKCsrZ5mcBLn8Wr9rRXQPQZcNZa9qePkhT0CuP/Z+Fr X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:AM2PR04MB0753; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0753; X-Forefront-PRVS: 0631F0BC3D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(39380400002)(396003)(39860400002)(189003)(199004)(66066001)(47776003)(26005)(6506007)(106356001)(76176011)(68736007)(50466002)(16526019)(486005)(2616005)(3846002)(6116002)(59450400001)(55236004)(11346002)(48376002)(5009440100003)(305945005)(316002)(476003)(446003)(105586002)(7736002)(956004)(2351001)(6512007)(16586007)(186003)(486005)(6916009)(386003)(53936002)(5660300001)(478600001)(4326008)(2361001)(86362001)(2906002)(36756003)(8676002)(50226002)(81156014)(81166006)(8936002)(51416003)(6486002)(97736004)(25786009)(52116002)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0753; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0753; 23:6z8GPwPlEVNRIDRUA0J6fFjg6fKuLcDbD9+lwZZ2d?= 89Kjk2n43Bmg7nCY8RCZz+8urkUcCGSuyKrPY4TK6/RyXesIPipecV01u1xbplb61MZ+PlNcuTXSaUT+xHvWGjYtdV8Dh589qP4MeJN2p0omG/Lvr0BN1zeVljWmW5hW4x/vd2KN/EFO+sIwRMld4ZAVZCVtuUU/G/oDEtER9IO9QIASnbB09woW0Xn0HTTS/ok7UgCoiresaZjJryMOl6L7QVR9zVu6mYSNnAWlvRnLXxfqbHqZ8+Y2/ONncpCwpUUWjf0TisKs92TtFY02r8mLI8JYQiZSCpbu8cqQCt90M2tSP0FOOJPHP1WDzGVpQEbSiZVzTLFFuSKSJzuDMR8ymBlNzGjiFsTbiyOnU+5ajkfuo8O8jYP5lkNOuPVZgmY+DjXO4Knhx+Ib6uYDLMSFqDYpCxwviUefoqiW5Ab99eEIOvRfMEp5pNQK0/v1PToKuWuYfK0l87Hfh4qwpfaCox69HGH6sEjOPJkzHKxT1M939++glMMDnIdtd4dOg04BIPYSEcx++nrWjacMV+l8hvKOlYoFdubynjPEycWBg5rFpYu0120UkIWcsmXZ3dea150EHcVs1Ei9BDxbn39yafug8f6JU9vigsAb5MiVtTyqw3MgxpYvVsubKOXeEerM0RG2/Lewv1bX1Sfra66Q2zXR7y9QGoY24uEwQfW7RB8PPp7qydSDaouLK/fAgammkf6Uiqx0WpHWDg1CV2I2f3V1akhyMBjH71ftIez9F5AR/3taGf80gyDkJchenFkcNQ13lIwL/ytLKROabhk1oDTx+zNaCyw7PCH5a7aGwfUFvtIdGmEqEP2k9VuFjskpKSPeWwHIE7SvEJcKJ4iao0XvsK1TCGnOi/Sv30s9FcSahvJ+Y9WLjkXouie4JmKNzy0TvZgbFeKLlW35YG8Us6H+bc1aNf9nLxO7PVm2hxw61ufI0OGRt52m8bwG5sDLdxxwImMAU0U5/kdaxwQ41Zn+3FpFaJK+wfRq3AxfuamCZ3/wHC4Lo/Ct3z8EqGTr1BNi8ppxhA0dInNQ81RsVKXy9yGlI0ZJ3TzoPg2QhQNEH6aRo+CJTzjuYRqdXAGBGmhrt5NOf/8BVbe6Udh4az0D3OIqOrOmUZnRcJJSbqCfTPHD6VEi4di25bna1JaCK5uwPexwSBnLObto/+WgbQmpJlsIZGjHhHtRQOiPtUziFo3gyBlAiXH3lvUalOj2w3l3yHOOPEwr6TY3T21VUKjfi+LYiJzikGS/RYhgKskXYZ9jh0d+5b+U70y+SQ= X-Microsoft-Antispam-Message-Info: 5f56tEhpJt0fd25oBRSrLBqBQdIG/MJbG79ojYT4WluTZRaeJ5LuyPTNxPN/fo3oL+O/FmyQ297NMDqQtKejvnp4TCxbngB9FoCENe8u9gGB6sg93Uru4gAtInwxsKel9VHe+rbkWd3UiEmM9lJUHoZbrwCZYqzeY+27jcTscIGVQfg0jDN/l14+M9utWpfC X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0753; 6:Fgi+dVBj+M6TRBbCg8h9cPuvpvg6nteSQKT18nMgSVZuOvgxxMs4ImaueHX6+y9gi6SN64dbiXA318IC93hAp4TAS03ZVKqmaz23J2XIrRl6nq8Cj+J38thQV0CYhy8zNeY4FP+/28zchrHYsYlzkDHbJqMTevdF5/t7XNbPgKdtHlx9Ygjy40zgeebqc486DrAjlewZzkTJW/jSbTGt4yyZf1F/mJiUseKvMgCOdNqYpDiIeHh8zAXszV/CI88q7LUMwUJQacs4Toby11aXCjckO4Uj11fbiNROAsoC8Pb6NcF0dZoH94NzS8mpmKiyXEnsHXVrl2Qe0ceCnPhDqnDt51uAAKPxD578w6QY0CKt7AmKXl/UxLYqiT6tBEbzMGUmRI3uBqXWTsNZoOg6Khd5Z9V6mN+EPSbzAiKHKn+pYLixwyCPN79W3zjRX7wA9op5OL7A3Z3IYytnx7eTaA==; 5:JMecFISxKdL3U5HCVN91NDLqUPGTdKibfRXsHqihlDLWYvEgtGvtQjMizqb3wzhUW05hzvHMgn7/B/XX5TuwqL6b32nHcKB+lkY6G/z0dBhWIvKdl81dRa3OIaUkahFhfFUgbdHrRz2Ws7SNy0n5BM3a+2ZNWQy5SIS9AQG9O54=; 24:4tyGBW1/axl13GLg78EgEug5ZiW4jQtwmFzEJRuVOZuQmJ599JrgnK+qeoYGZk+80TYvl7U37KXAI8bcktfwyvVVF0tgEEyNUmWmpxMi4sE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0753; 7:mCgWusbPtbX9JZqeJZci1TUgWMyiYgkBGKbEmpVlhF464Mp/ZzVv8KapgYB9ybb0+GiNiGh2cD94bd5xJgYoKGXleI6wYn7lAT4L84SZxSABG8EEp9HwSR1MJjk6pKLF1WMJ1VtrhAUY0peRUtQKYFTBHcsYuCVoAuUEOixwd96Wd9BXY8bGJoNrA9F/eh73qlz+6UdwnkX+rJlV3PkvDzaTBzgEp0p80g2c47HKBTUUNu/gAv9E/NLcFHGEuPoJ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2018 08:30:06.2831 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0db974c1-9e3c-4215-81ed-08d5993d1b3c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0753 Subject: [dpdk-dev] [PATCH v3 2/2] eal/vfio: export internal vfio functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch moves some of the internal vfio functions from eal_vfio.h to rte_vfio.h for common uses with "rte_" prefix. This patch also change the FSLMC bus usages from the internal VFIO functions to external ones with "rte_" prefix Signed-off-by: Hemant Agrawal Acked-by: Anatoly Burakov --- drivers/bus/fslmc/Makefile | 1 - drivers/bus/fslmc/fslmc_vfio.c | 7 +-- drivers/bus/fslmc/fslmc_vfio.h | 2 - drivers/bus/fslmc/meson.build | 1 - lib/librte_eal/bsdapp/eal/eal.c | 20 +++++++ lib/librte_eal/common/include/rte_vfio.h | 75 +++++++++++++++++++++++++- lib/librte_eal/linuxapp/eal/eal_vfio.c | 38 ++++++------- lib/librte_eal/linuxapp/eal/eal_vfio.h | 21 -------- lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c | 4 +- lib/librte_eal/rte_eal_version.map | 3 ++ 10 files changed, 122 insertions(+), 50 deletions(-) diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile index 93870ba..3aa34e2 100644 --- a/drivers/bus/fslmc/Makefile +++ b/drivers/bus/fslmc/Makefile @@ -16,7 +16,6 @@ CFLAGS += $(WERROR_FLAGS) CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 62499de..f3b2960 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -91,7 +91,8 @@ fslmc_get_container_group(int *groupid) } /* get group number */ - ret = vfio_get_group_no(SYSFS_FSL_MC_DEVICES, g_container, groupid); + ret = rte_vfio_get_group_num(SYSFS_FSL_MC_DEVICES, + g_container, groupid); if (ret <= 0) { DPAA2_BUS_ERR("Unable to find %s IOMMU group", g_container); return -1; @@ -124,7 +125,7 @@ vfio_connect_container(void) } /* Opens main vfio file descriptor which represents the "container" */ - fd = vfio_get_container_fd(); + fd = rte_vfio_get_container_fd(); if (fd < 0) { DPAA2_BUS_ERR("Failed to open VFIO container"); return -errno; @@ -620,7 +621,7 @@ fslmc_vfio_setup_group(void) } /* Get the actual group fd */ - ret = vfio_get_group_fd(groupid); + ret = rte_vfio_get_group_fd(groupid); if (ret < 0) return ret; vfio_group.fd = ret; diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h index e8fb344..9e2c4fe 100644 --- a/drivers/bus/fslmc/fslmc_vfio.h +++ b/drivers/bus/fslmc/fslmc_vfio.h @@ -10,8 +10,6 @@ #include -#include "eal_vfio.h" - #define DPAA2_MC_DPNI_DEVID 7 #define DPAA2_MC_DPSECI_DEVID 3 #define DPAA2_MC_DPCON_DEVID 5 diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build index e94340e..78f9d92 100644 --- a/drivers/bus/fslmc/meson.build +++ b/drivers/bus/fslmc/meson.build @@ -22,6 +22,5 @@ sources = files('fslmc_bus.c', allow_experimental_apis = true -includes += include_directories('../../../lib/librte_eal/linuxapp/eal') includes += include_directories('mc', 'qbman/include', 'portal') cflags += ['-D_GNU_SOURCE'] diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index 4eafcb5..ac23db5 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -781,3 +781,23 @@ int rte_vfio_clear_group(__rte_unused int vfio_group_fd) { return 0; } + +int __rte_experimental +rte_vfio_get_group_num(__rte_unused const char *sysfs_base, + __rte_unused const char *dev_addr, + __rte_unused int *iommu_group_num) +{ + return -1; +} + +int __rte_experimental +rte_vfio_get_container_fd(void) +{ + return -1; +} + +int __rte_experimental +rte_vfio_get_group_fd(__rte_unused int iommu_group_num) +{ + return -1; +} diff --git a/lib/librte_eal/common/include/rte_vfio.h b/lib/librte_eal/common/include/rte_vfio.h index 9b7b983..9369b42 100644 --- a/lib/librte_eal/common/include/rte_vfio.h +++ b/lib/librte_eal/common/include/rte_vfio.h @@ -37,6 +37,13 @@ extern "C" { #endif +/* NOIOMMU is defined from kernel version 4.5 onwards */ +#ifdef VFIO_NOIOMMU_IOMMU +#define RTE_VFIO_NOIOMMU VFIO_NOIOMMU_IOMMU +#else +#define RTE_VFIO_NOIOMMU 8 +#endif + /** * Setup vfio_cfg for the device identified by its address. * It discovers the configured I/O MMU groups or sets a new one for the device. @@ -128,10 +135,76 @@ int rte_vfio_is_enabled(const char *modname); */ int rte_vfio_noiommu_is_enabled(void); -/* remove group fd from internal VFIO group fd array */ +/** + * Remove group fd from internal VFIO group fd array/ + * + * This function is only relevant to linux and will return + * an error on BSD. + * + * @param vfio_group_fd + * VFIO Grouup FD. + * + * @return + * 0 on success. + * <0 on failure. + */ int rte_vfio_clear_group(int vfio_group_fd); +/** + * Parse IOMMU group number for a device + * + * This function is only relevant to linux and will return + * an error on BSD. + * + * @param sysfs_base + * sysfs path prefix. + * + * @param dev_addr + * device location. + * + * @param iommu_group_num + * iommu group number + * + * @return + * >0 on success + * 0 for non-existent group or VFIO + * <0 for errors + */ +int __rte_experimental +rte_vfio_get_group_num(const char *sysfs_base, + const char *dev_addr, + int *iommu_group_num); + +/** + * Open VFIO container fd or get an existing one + * + * This function is only relevant to linux and will return + * an error on BSD. + * + * @return + * > 0 container fd + * < 0 for errors + */ +int __rte_experimental +rte_vfio_get_container_fd(void); + +/** + * Open VFIO group fd or get an existing one + * + * This function is only relevant to linux and will return + * an error on BSD. + * + * @param iommu_group_num + * iommu group number + * + * @return + * > 0 group fd + * < 0 for errors + */ +int __rte_experimental +rte_vfio_get_group_fd(int iommu_group_num); + #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c index e44ae4d..9f75417 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c @@ -36,7 +36,7 @@ static const struct vfio_iommu_type iommu_types[] = { }; int -vfio_get_group_fd(int iommu_group_no) +rte_vfio_get_group_fd(int iommu_group_num) { int i; int vfio_group_fd; @@ -45,7 +45,7 @@ vfio_get_group_fd(int iommu_group_no) /* check if we already have the group descriptor open */ for (i = 0; i < VFIO_MAX_GROUPS; i++) - if (vfio_cfg.vfio_groups[i].group_no == iommu_group_no) + if (vfio_cfg.vfio_groups[i].group_no == iommu_group_num) return vfio_cfg.vfio_groups[i].fd; /* Lets see first if there is room for a new group */ @@ -70,7 +70,7 @@ vfio_get_group_fd(int iommu_group_no) if (internal_config.process_type == RTE_PROC_PRIMARY) { /* try regular group format */ snprintf(filename, sizeof(filename), - VFIO_GROUP_FMT, iommu_group_no); + VFIO_GROUP_FMT, iommu_group_num); vfio_group_fd = open(filename, O_RDWR); if (vfio_group_fd < 0) { /* if file not found, it's not an error */ @@ -82,7 +82,7 @@ vfio_get_group_fd(int iommu_group_no) /* special case: try no-IOMMU path as well */ snprintf(filename, sizeof(filename), - VFIO_NOIOMMU_GROUP_FMT, iommu_group_no); + VFIO_NOIOMMU_GROUP_FMT, iommu_group_num); vfio_group_fd = open(filename, O_RDWR); if (vfio_group_fd < 0) { if (errno != ENOENT) { @@ -95,7 +95,7 @@ vfio_get_group_fd(int iommu_group_no) /* noiommu group found */ } - cur_grp->group_no = iommu_group_no; + cur_grp->group_no = iommu_group_num; cur_grp->fd = vfio_group_fd; vfio_cfg.vfio_active_groups++; return vfio_group_fd; @@ -117,7 +117,7 @@ vfio_get_group_fd(int iommu_group_no) close(socket_fd); return -1; } - if (vfio_mp_sync_send_request(socket_fd, iommu_group_no) < 0) { + if (vfio_mp_sync_send_request(socket_fd, iommu_group_num) < 0) { RTE_LOG(ERR, EAL, " cannot send group number!\n"); close(socket_fd); return -1; @@ -132,7 +132,7 @@ vfio_get_group_fd(int iommu_group_no) /* if we got the fd, store it and return it */ if (vfio_group_fd > 0) { close(socket_fd); - cur_grp->group_no = iommu_group_no; + cur_grp->group_no = iommu_group_num; cur_grp->fd = vfio_group_fd; vfio_cfg.vfio_active_groups++; return vfio_group_fd; @@ -262,11 +262,11 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr, .argsz = sizeof(group_status) }; int vfio_group_fd; - int iommu_group_no; + int iommu_group_num; int ret; /* get group number */ - ret = vfio_get_group_no(sysfs_base, dev_addr, &iommu_group_no); + ret = rte_vfio_get_group_num(sysfs_base, dev_addr, &iommu_group_num); if (ret == 0) { RTE_LOG(WARNING, EAL, " %s not managed by VFIO driver, skipping\n", dev_addr); @@ -278,7 +278,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr, return -1; /* get the actual group fd */ - vfio_group_fd = vfio_get_group_fd(iommu_group_no); + vfio_group_fd = rte_vfio_get_group_fd(iommu_group_num); if (vfio_group_fd < 0) return -1; @@ -394,11 +394,11 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr, .argsz = sizeof(group_status) }; int vfio_group_fd; - int iommu_group_no; + int iommu_group_num; int ret; /* get group number */ - ret = vfio_get_group_no(sysfs_base, dev_addr, &iommu_group_no); + ret = rte_vfio_get_group_num(sysfs_base, dev_addr, &iommu_group_num); if (ret <= 0) { RTE_LOG(WARNING, EAL, " %s not managed by VFIO driver\n", dev_addr); @@ -407,9 +407,9 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr, } /* get the actual group fd */ - vfio_group_fd = vfio_get_group_fd(iommu_group_no); + vfio_group_fd = rte_vfio_get_group_fd(iommu_group_num); if (vfio_group_fd <= 0) { - RTE_LOG(INFO, EAL, "vfio_get_group_fd failed for %s\n", + RTE_LOG(INFO, EAL, "rte_vfio_get_group_fd failed for %s\n", dev_addr); return -1; } @@ -480,7 +480,7 @@ rte_vfio_enable(const char *modname) return 0; } - vfio_cfg.vfio_container_fd = vfio_get_container_fd(); + vfio_cfg.vfio_container_fd = rte_vfio_get_container_fd(); /* check if we have VFIO driver enabled */ if (vfio_cfg.vfio_container_fd != -1) { @@ -558,7 +558,7 @@ vfio_has_supported_extensions(int vfio_container_fd) } int -vfio_get_container_fd(void) +rte_vfio_get_container_fd(void) { int ret, vfio_container_fd; @@ -622,8 +622,8 @@ vfio_get_container_fd(void) } int -vfio_get_group_no(const char *sysfs_base, - const char *dev_addr, int *iommu_group_no) +rte_vfio_get_group_num(const char *sysfs_base, + const char *dev_addr, int *iommu_group_num) { char linkname[PATH_MAX]; char filename[PATH_MAX]; @@ -655,7 +655,7 @@ vfio_get_group_no(const char *sysfs_base, errno = 0; group_tok = tok[ret - 1]; end = group_tok; - *iommu_group_no = strtol(group_tok, &end, 10); + *iommu_group_num = strtol(group_tok, &end, 10); if ((end != group_tok && *end != '\0') || errno != 0) { RTE_LOG(ERR, EAL, " %s error parsing IOMMU number!\n", dev_addr); return -1; diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.h b/lib/librte_eal/linuxapp/eal/eal_vfio.h index 8059577..c72b76c 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.h +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.h @@ -79,12 +79,6 @@ struct vfio_iommu_spapr_tce_info { #define RTE_VFIO_SPAPR VFIO_SPAPR_TCE_v2_IOMMU #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) -#define RTE_VFIO_NOIOMMU 8 -#else -#define RTE_VFIO_NOIOMMU VFIO_NOIOMMU_IOMMU -#endif - #define VFIO_MAX_GROUPS RTE_MAX_VFIO_GROUPS /* @@ -133,21 +127,6 @@ vfio_set_iommu_type(int vfio_container_fd); int vfio_has_supported_extensions(int vfio_container_fd); -/* open container fd or get an existing one */ -int -vfio_get_container_fd(void); - -/* parse IOMMU group number for a device - * returns 1 on success, -1 for errors, 0 for non-existent group - */ -int -vfio_get_group_no(const char *sysfs_base, - const char *dev_addr, int *iommu_group_no); - -/* open group fd or get an existing one */ -int -vfio_get_group_fd(int iommu_group_no); - int vfio_mp_sync_setup(void); #define SOCKET_REQ_CONTAINER 0x100 diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c index 7cc3c15..e19b571 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c @@ -267,7 +267,7 @@ vfio_mp_sync_thread(void __rte_unused * arg) switch (ret) { case SOCKET_REQ_CONTAINER: - fd = vfio_get_container_fd(); + fd = rte_vfio_get_container_fd(); if (fd < 0) vfio_mp_sync_send_request(conn_sock, SOCKET_ERR); else @@ -283,7 +283,7 @@ vfio_mp_sync_thread(void __rte_unused * arg) continue; } - fd = vfio_get_group_fd(vfio_data); + fd = rte_vfio_get_group_fd(vfio_data); if (fd < 0) vfio_mp_sync_send_request(conn_sock, SOCKET_ERR); diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index f331f54..f663b8b 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -255,5 +255,8 @@ EXPERIMENTAL { rte_service_set_runstate_mapped_check; rte_service_set_stats_enable; rte_service_start_with_defaults; + rte_vfio_get_group_num; + rte_vfio_get_container_fd; + rte_vfio_get_group_fd; } DPDK_18.02;