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

eal: enable port hotplug as default for linux and bsd

Browse Source 
This patch removes CONFIG_RTE_LIBRTE_EAL_HOTPLUG option, and enables it
as default in both Linux and BSD.
Also, to support port hotplug, rte_eal_pci_scan() and below missing
symbols should be exported to ethdev library.
 - rte_eal_parse_devargs_str()
 - rte_eal_pci_close_one()
 - rte_eal_pci_probe_one()
 - rte_eal_pci_scan()
 - rte_eal_vdev_init()
 - rte_eal_vdev_uninit()

Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
This commit is contained in:
Tetsuya Mukawa 2015-06-30 17:26:51 +09:00 committed by Thomas Monjalon
parent 4d4ebca430
commit 390cb6b89c
10 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/common_bsdapp
View File

@ -120,12 +120,6 @@ CONFIG_RTE_LIBRTE_EAL_BSDAPP=y
#
CONFIG_RTE_LIBRTE_EAL_LINUXAPP=n
#
# Compile Environment Abstraction Layer to support hotplug
# So far, Hotplug functions only support linux
#
CONFIG_RTE_LIBRTE_EAL_HOTPLUG=n
#
# Compile Environment Abstraction Layer to support Vmware TSC map
#

5
config/common_linuxapp
View File

@ -118,11 +118,6 @@ CONFIG_RTE_PCI_MAX_READ_REQUEST_SIZE=0
#
CONFIG_RTE_LIBRTE_EAL_LINUXAPP=y
#
# Compile Environment Abstraction Layer to support hotplug
#
CONFIG_RTE_LIBRTE_EAL_HOTPLUG=y
#
# Compile Environment Abstraction Layer to support Vmware TSC map
#

6
lib/librte_eal/bsdapp/eal/eal_pci.c
View File

@ -312,8 +312,8 @@ skipdev:
* Scan the content of the PCI bus, and add the devices in the devices
* list. Call pci_scan_one() for each pci entry found.
*/
static int
pci_scan(void)
int
rte_eal_pci_scan(void)
{
int fd;
unsigned dev_count = 0;
@ -369,7 +369,7 @@ rte_eal_pci_init(void)
if (internal_config.no_pci)
return 0;
if (pci_scan() < 0) {
if (rte_eal_pci_scan() < 0) {
RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__);
return -1;
}

6
lib/librte_eal/bsdapp/eal/rte_eal_version.map
View File

@ -37,14 +37,20 @@ DPDK_2.0 {
rte_eal_lcore_role;
rte_eal_mp_remote_launch;
rte_eal_mp_wait_lcore;
rte_eal_parse_devargs_str;
rte_eal_pci_close_one;
rte_eal_pci_dump;
rte_eal_pci_probe;
rte_eal_pci_probe_one;
rte_eal_pci_register;
rte_eal_pci_scan;
rte_eal_pci_unregister;
rte_eal_process_type;
rte_eal_remote_launch;
rte_eal_tailq_lookup;
rte_eal_tailq_register;
rte_eal_vdev_init;
rte_eal_vdev_uninit;
rte_eal_wait_lcore;
rte_exit;
rte_get_hpet_cycles;

2
lib/librte_eal/common/eal_common_dev.c
View File

@ -125,7 +125,6 @@ rte_eal_dev_init(void)
return 0;
}
#ifdef RTE_LIBRTE_EAL_HOTPLUG
int
rte_eal_vdev_uninit(const char *name)
{
@ -151,4 +150,3 @@ rte_eal_vdev_uninit(const char *name)
RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
return -EINVAL;
}
#endif /* RTE_LIBRTE_EAL_HOTPLUG */

6
lib/librte_eal/common/eal_common_pci.c
View File

@ -167,7 +167,6 @@ pci_map_device(struct rte_pci_device *dev)
return ret;
}
#ifdef RTE_LIBRTE_EAL_HOTPLUG
/* Unmap pci device */
static void
pci_unmap_device(struct rte_pci_device *dev)
@ -192,7 +191,6 @@ pci_unmap_device(struct rte_pci_device *dev)
break;
}
}
#endif /* RTE_LIBRTE_EAL_HOTPLUG */
/*
* If vendor/device ID match, call the devinit() function of the
@ -265,7 +263,6 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
return 1;
}
#ifdef RTE_LIBRTE_EAL_HOTPLUG
/*
* If vendor/device ID match, call the devuninit() function of the
* driver.
@ -321,7 +318,6 @@ rte_eal_pci_close_one_driver(struct rte_pci_driver *dr,
/* return positive value if driver is not found */
return 1;
}
#endif /* RTE_LIBRTE_EAL_HOTPLUG */
/*
* If vendor/device ID match, call the devinit() function of all
@ -350,7 +346,6 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
return 1;
}
#ifdef RTE_LIBRTE_EAL_HOTPLUG
/*
* If vendor/device ID match, call the devuninit() function of all
* registered driver for the given device. Return -1 if initialization
@ -441,7 +436,6 @@ err_return:
dev->addr.devid, dev->addr.function);
return -1;
}
#endif /* RTE_LIBRTE_EAL_HOTPLUG */
/*
* Scan the content of the PCI bus, and call the devinit() function for

2
lib/librte_eal/common/eal_common_pci_uio.c
View File

@ -148,7 +148,6 @@ error:
return -1;
}
#ifdef RTE_LIBRTE_EAL_HOTPLUG
static void
pci_uio_unmap(struct mapped_pci_resource *uio_res)
{
@ -221,4 +220,3 @@ pci_uio_unmap_resource(struct rte_pci_device *dev)
dev->intr_handle.fd = -1;
dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
}
#endif /* RTE_LIBRTE_EAL_HOTPLUG */

2
lib/librte_eal/common/eal_private.h
View File

@ -174,14 +174,12 @@ int pci_unbind_kernel_driver(struct rte_pci_device *dev);
*/
int pci_uio_map_resource(struct rte_pci_device *dev);
#ifdef RTE_LIBRTE_EAL_HOTPLUG
/**
* Unmap the PCI resource of a PCI device
*
* This function is private to EAL.
*/
void pci_uio_unmap_resource(struct rte_pci_device *dev);
#endif /* RTE_LIBRTE_EAL_HOTPLUG */
/**
* Allocate uio resource for PCI device

2
lib/librte_eal/common/include/rte_pci.h
View File

@ -397,7 +397,6 @@ void *pci_map_resource(void *requested_addr, int fd, off_t offset,
*/
void pci_unmap_resource(void *requested_addr, size_t size);
#ifdef RTE_LIBRTE_EAL_HOTPLUG
/**
* Probe the single PCI device.
*
@ -427,7 +426,6 @@ int rte_eal_pci_probe_one(const struct rte_pci_addr *addr);
* - Negative on error.
*/
int rte_eal_pci_close_one(const struct rte_pci_addr *addr);
#endif /* RTE_LIBRTE_EAL_HOTPLUG */
/**
* Dump the content of the PCI bus.

21
lib/librte_ether/rte_ethdev.c
View File

@ -443,9 +443,6 @@ rte_eth_dev_count(void)
return nb_ports;
}
/* So far, DPDK hotplug function only supports linux */
#ifdef RTE_LIBRTE_EAL_HOTPLUG
static enum rte_eth_dev_type
rte_eth_dev_get_device_type(uint8_t port_id)
{
@ -720,24 +717,6 @@ rte_eth_dev_detach(uint8_t port_id, char *name)
} else
return rte_eth_dev_detach_vdev(port_id, name);
}
#else /* RTE_LIBRTE_EAL_HOTPLUG */
int
rte_eth_dev_attach(const char *devargs __rte_unused,
uint8_t *port_id __rte_unused)
{
RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n");
return -1;
}
/* detach the device, then store the name of the device */
int
rte_eth_dev_detach(uint8_t port_id __rte_unused,
char *name __rte_unused)
{
RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n");
return -1;
}
#endif /* RTE_LIBRTE_EAL_HOTPLUG */
static int
rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)