d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vfio: fix namespace prefix of newly exposed functions

Browse Source 
Exposed VFIO functions simply uses a "vfio" prefix.
Use the proper "rte_vfio" prefix for those symbols.

Fixes: 279b581c897d ("vfio: expose functions")

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
This commit is contained in:
Gaetan Rivet 2017-11-06 17:08:58 +01:00 committed by Thomas Monjalon
parent 6fb00f8bae
commit 77dad68c20
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bus/pci/linux/pci.c
View File

@ -594,7 +594,7 @@ rte_pci_get_iommu_class(void)
has_iova_va = pci_one_device_has_iova_va(); has_iova_va = pci_one_device_has_iova_va();
is_bound_uio = pci_one_device_bound_uio(); is_bound_uio = pci_one_device_bound_uio();
#ifdef VFIO_PRESENT #ifdef VFIO_PRESENT
is_vfio_noiommu_enabled = vfio_noiommu_is_enabled() == true ? is_vfio_noiommu_enabled = rte_vfio_noiommu_is_enabled() == true ?
true : false; true : false;
#endif #endif

12
drivers/bus/pci/linux/pci_vfio.c
View File

@ -325,7 +325,7 @@ pci_vfio_is_ioport_bar(int vfio_dev_fd, int bar_index)
} }
static int static int
pci_vfio_setup_device(struct rte_pci_device *dev, int vfio_dev_fd) pci_rte_vfio_setup_device(struct rte_pci_device *dev, int vfio_dev_fd)
{ {
if (pci_vfio_setup_interrupts(dev, vfio_dev_fd) != 0) { if (pci_vfio_setup_interrupts(dev, vfio_dev_fd) != 0) {
RTE_LOG(ERR, EAL, "Error setting up interrupts!\n"); RTE_LOG(ERR, EAL, "Error setting up interrupts!\n");
@ -465,7 +465,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT, snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
loc->domain, loc->bus, loc->devid, loc->function); loc->domain, loc->bus, loc->devid, loc->function);
ret = vfio_setup_device(pci_get_sysfs_path(), pci_addr, ret = rte_vfio_setup_device(pci_get_sysfs_path(), pci_addr,
&vfio_dev_fd, &device_info); &vfio_dev_fd, &device_info);
if (ret) if (ret)
return ret; return ret;
@ -546,7 +546,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
dev->mem_resource[i].addr = maps[i].addr; dev->mem_resource[i].addr = maps[i].addr;
} }
if (pci_vfio_setup_device(dev, vfio_dev_fd) < 0) { if (pci_rte_vfio_setup_device(dev, vfio_dev_fd) < 0) {
RTE_LOG(ERR, EAL, " %s setup device failed\n", pci_addr); RTE_LOG(ERR, EAL, " %s setup device failed\n", pci_addr);
goto err_vfio_res; goto err_vfio_res;
} }
@ -582,7 +582,7 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)
snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT, snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT,
loc->domain, loc->bus, loc->devid, loc->function); loc->domain, loc->bus, loc->devid, loc->function);
ret = vfio_setup_device(pci_get_sysfs_path(), pci_addr, ret = rte_vfio_setup_device(pci_get_sysfs_path(), pci_addr,
&vfio_dev_fd, &device_info); &vfio_dev_fd, &device_info);
if (ret) if (ret)
return ret; return ret;
@ -662,7 +662,7 @@ pci_vfio_unmap_resource(struct rte_pci_device *dev)
return -1; return -1;
} }
ret = vfio_release_device(pci_get_sysfs_path(), pci_addr, ret = rte_vfio_release_device(pci_get_sysfs_path(), pci_addr,
dev->intr_handle.vfio_dev_fd); dev->intr_handle.vfio_dev_fd);
if (ret < 0) { if (ret < 0) {
RTE_LOG(ERR, EAL, RTE_LOG(ERR, EAL,
@ -758,6 +758,6 @@ pci_vfio_ioport_unmap(struct rte_pci_ioport *p)
int int
pci_vfio_is_enabled(void) pci_vfio_is_enabled(void)
{ {
return vfio_is_enabled("vfio_pci"); return rte_vfio_is_enabled("vfio_pci");
} }
#endif #endif

20
lib/librte_eal/bsdapp/eal/eal.c
View File

@ -743,14 +743,14 @@ rte_eal_vfio_intr_mode(void)
struct vfio_device_info; struct vfio_device_info;
/* dummy prototypes. */ /* dummy prototypes. */
int vfio_setup_device(const char *sysfs_base, const char *dev_addr, int rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,
int *vfio_dev_fd, struct vfio_device_info *device_info); int *vfio_dev_fd, struct vfio_device_info *device_info);
int vfio_release_device(const char *sysfs_base, const char *dev_addr, int fd); int rte_vfio_release_device(const char *sysfs_base, const char *dev_addr, int fd);
int vfio_enable(const char *modname); int rte_vfio_enable(const char *modname);
int vfio_is_enabled(const char *modname); int rte_vfio_is_enabled(const char *modname);
int vfio_noiommu_is_enabled(void); int rte_vfio_noiommu_is_enabled(void);
int vfio_setup_device(__rte_unused const char *sysfs_base, int rte_vfio_setup_device(__rte_unused const char *sysfs_base,
__rte_unused const char *dev_addr, __rte_unused const char *dev_addr,
__rte_unused int *vfio_dev_fd, __rte_unused int *vfio_dev_fd,
__rte_unused struct vfio_device_info *device_info) __rte_unused struct vfio_device_info *device_info)
@ -758,24 +758,24 @@ int vfio_setup_device(__rte_unused const char *sysfs_base,
return -1; return -1;
} }
int vfio_release_device(__rte_unused const char *sysfs_base, int rte_vfio_release_device(__rte_unused const char *sysfs_base,
__rte_unused const char *dev_addr, __rte_unused const char *dev_addr,
__rte_unused int fd) __rte_unused int fd)
{ {
return -1; return -1;
} }
int vfio_enable(__rte_unused const char *modname) int rte_vfio_enable(__rte_unused const char *modname)
{ {
return -1; return -1;
} }
int vfio_is_enabled(__rte_unused const char *modname) int rte_vfio_is_enabled(__rte_unused const char *modname)
{ {
return 0; return 0;
} }
int vfio_noiommu_is_enabled(void) int rte_vfio_noiommu_is_enabled(void)
{ {
return 0; return 0;
} }

10
lib/librte_eal/common/include/rte_vfio.h
View File

@ -82,7 +82,7 @@
* <0 on failure. * <0 on failure.
* >1 if the device cannot be managed this way. * >1 if the device cannot be managed this way.
*/ */
int vfio_setup_device(const char *sysfs_base, const char *dev_addr, int rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,
int *vfio_dev_fd, struct vfio_device_info *device_info); int *vfio_dev_fd, struct vfio_device_info *device_info);
/** /**
@ -104,7 +104,7 @@ int vfio_setup_device(const char *sysfs_base, const char *dev_addr,
* 0 on success. * 0 on success.
* <0 on failure. * <0 on failure.
*/ */
int vfio_release_device(const char *sysfs_base, const char *dev_addr, int fd); int rte_vfio_release_device(const char *sysfs_base, const char *dev_addr, int fd);
/** /**
* Enable a VFIO-related kmod. * Enable a VFIO-related kmod.
@ -119,7 +119,7 @@ int vfio_release_device(const char *sysfs_base, const char *dev_addr, int fd);
* 0 on success. * 0 on success.
* <0 on failure. * <0 on failure.
*/ */
int vfio_enable(const char *modname); int rte_vfio_enable(const char *modname);
/** /**
* Check whether a VFIO-related kmod is enabled. * Check whether a VFIO-related kmod is enabled.
@ -134,7 +134,7 @@ int vfio_enable(const char *modname);
* !0 if true. * !0 if true.
* 0 otherwise. * 0 otherwise.
*/ */
int vfio_is_enabled(const char *modname); int rte_vfio_is_enabled(const char *modname);
/** /**
* Whether VFIO NOIOMMU mode is enabled. * Whether VFIO NOIOMMU mode is enabled.
@ -146,7 +146,7 @@ int vfio_is_enabled(const char *modname);
* !0 if true. * !0 if true.
* 0 otherwise. * 0 otherwise.
*/ */
int vfio_noiommu_is_enabled(void); int rte_vfio_noiommu_is_enabled(void);
#endif /* VFIO_PRESENT */ #endif /* VFIO_PRESENT */

4
lib/librte_eal/linuxapp/eal/eal.c
View File

@ -710,9 +710,9 @@ static int rte_eal_vfio_setup(void)
{ {
int vfio_enabled = 0; int vfio_enabled = 0;
if (vfio_enable("vfio")) if (rte_vfio_enable("vfio"))
return -1; return -1;
vfio_enabled = vfio_is_enabled("vfio"); vfio_enabled = rte_vfio_is_enabled("vfio");
if (vfio_enabled) { if (vfio_enabled) {

10
lib/librte_eal/linuxapp/eal/eal_vfio.c
View File

@ -284,7 +284,7 @@ clear_group(int vfio_group_fd)
} }
int int
vfio_setup_device(const char *sysfs_base, const char *dev_addr, rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,
int *vfio_dev_fd, struct vfio_device_info *device_info) int *vfio_dev_fd, struct vfio_device_info *device_info)
{ {
struct vfio_group_status group_status = { struct vfio_group_status group_status = {
@ -416,7 +416,7 @@ vfio_setup_device(const char *sysfs_base, const char *dev_addr,
} }
int int
vfio_release_device(const char *sysfs_base, const char *dev_addr, rte_vfio_release_device(const char *sysfs_base, const char *dev_addr,
int vfio_dev_fd) int vfio_dev_fd)
{ {
struct vfio_group_status group_status = { struct vfio_group_status group_status = {
@ -478,7 +478,7 @@ vfio_release_device(const char *sysfs_base, const char *dev_addr,
} }
int int
vfio_enable(const char *modname) rte_vfio_enable(const char *modname)
{ {
/* initialize group list */ /* initialize group list */
int i; int i;
@ -523,7 +523,7 @@ vfio_enable(const char *modname)
} }
int int
vfio_is_enabled(const char *modname) rte_vfio_is_enabled(const char *modname)
{ {
const int mod_available = rte_eal_check_module(modname); const int mod_available = rte_eal_check_module(modname);
return vfio_cfg.vfio_enabled && mod_available; return vfio_cfg.vfio_enabled && mod_available;
@ -841,7 +841,7 @@ vfio_noiommu_dma_map(int __rte_unused vfio_container_fd)
} }
int int
vfio_noiommu_is_enabled(void) rte_vfio_noiommu_is_enabled(void)
{ {
int fd, ret, cnt __rte_unused; int fd, ret, cnt __rte_unused;
char c; char c;

10
lib/librte_eal/rte_eal_version.map
View File

@ -235,10 +235,10 @@ DPDK_17.11 {
rte_eal_vfio_intr_mode; rte_eal_vfio_intr_mode;
rte_lcore_has_role; rte_lcore_has_role;
rte_memcpy_ptr; rte_memcpy_ptr;
vfio_enable; rte_vfio_enable;
vfio_is_enabled; rte_vfio_is_enabled;
vfio_noiommu_is_enabled; rte_vfio_noiommu_is_enabled;
vfio_release_device; rte_vfio_release_device;
vfio_setup_device; rte_vfio_setup_device;
} DPDK_17.08; } DPDK_17.08;