summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Hemminger <stephen@networkplumber.org>2018-10-11 17:04:13 -0700
committerDamjan Marion <dmarion@me.com>2018-10-15 11:29:17 +0000
commit3901a038edf47a35665c57961e6620efdd01dbbd (patch)
tree080e2cfd4a3390c37551b05cb46242191003ac04 /src
parent59a829533c1345945dc1b6decc3afe29494e85cd (diff)
dpdk: only look at PCI information on PCI devices
The rte_device is use as a base type of all DPDK devices. It is not valid to use container_of to find PCI information unless the bus of the rte_device is pci. Otherwise, the pointer is looking at some other data, which may or may not be zero. This change introduces a helper function to get rte_pci_device pointer. If device is on PCI bus it returns pointer to rte_pci_device info, otherwise it returns NULL. Change-Id: Ia7446006bb93a7a54844969f3b3dd3b918890dfd Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/dpdk/device/cli.c8
-rw-r--r--src/plugins/dpdk/device/common.c13
-rw-r--r--src/plugins/dpdk/device/dpdk.h3
-rw-r--r--src/plugins/dpdk/device/format.c7
-rw-r--r--src/plugins/dpdk/device/init.c3
5 files changed, 26 insertions, 8 deletions
diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c
index 7e168afb64e..7e20f565a8c 100644
--- a/src/plugins/dpdk/device/cli.c
+++ b/src/plugins/dpdk/device/cli.c
@@ -68,10 +68,10 @@ get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd,
rte_eth_dev_info_get ((*xd)->port_id, &dev_info);
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
+ pci_dev = dpdk_get_pci_device (&dev_info);
if (pci_dev)
- { /* bonded interface has no pci info */
+ {
vlib_pci_addr_t pci_addr;
pci_addr.domain = pci_dev->addr.domain;
@@ -1286,7 +1286,7 @@ set_dpdk_if_hqos_pktfield (vlib_main_t * vm, unformat_input_t * input,
rte_eth_dev_info_get (xd->port_id, &dev_info);
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
+ pci_dev = dpdk_get_pci_device (&dev_info);
if (pci_dev)
{ /* bonded interface has no pci info */
@@ -1481,7 +1481,7 @@ show_dpdk_if_hqos (vlib_main_t * vm, unformat_input_t * input,
rte_eth_dev_info_get (xd->port_id, &dev_info);
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
+ pci_dev = dpdk_get_pci_device (&dev_info);
if (pci_dev)
{ /* bonded interface has no pci info */
diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c
index 8699dc8689b..b9ba161423b 100644
--- a/src/plugins/dpdk/device/common.c
+++ b/src/plugins/dpdk/device/common.c
@@ -345,6 +345,19 @@ dpdk_port_state_callback (dpdk_portid_t port_id,
return dpdk_port_state_callback_inline (port_id, type, param);
}
+/* If this device is PCI return pointer to info, otherwise NULL */
+struct rte_pci_device *
+dpdk_get_pci_device (const struct rte_eth_dev_info *info)
+{
+ const struct rte_bus *bus;
+
+ bus = rte_bus_find_by_device (info->device);
+ if (bus && !strcmp (bus->name, "pci"))
+ return RTE_DEV_TO_PCI (info->device);
+ else
+ return NULL;
+}
+
/*
* fd.io coding-style-patch-verification: ON
*
diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h
index 680425bc861..cc9b644d23c 100644
--- a/src/plugins/dpdk/device/dpdk.h
+++ b/src/plugins/dpdk/device/dpdk.h
@@ -531,6 +531,9 @@ clib_error_t *dpdk_pool_create (vlib_main_t * vm, u8 * pool_name,
clib_error_t *dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
unsigned socket_id);
+struct rte_pci_device *dpdk_get_pci_device (const struct rte_eth_dev_info
+ *info);
+
#if CLI_DEBUG
int dpdk_buffer_validate_trajectory_all (u32 * uninitialized);
void dpdk_buffer_poison_trajectory_all (void);
diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c
index a5c8daaa3d2..28e8f0a445c 100644
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -273,9 +273,9 @@ format_dpdk_device_name (u8 * s, va_list * args)
}
rte_eth_dev_info_get (i, &dev_info);
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
+ pci_dev = dpdk_get_pci_device (&dev_info);
- if (pci_dev && dm->devices[i].port_type != VNET_DPDK_PORT_TYPE_FAILSAFE)
+ if (pci_dev)
ret = format (s, devname_format, device_name, pci_dev->addr.bus,
pci_dev->addr.devid, pci_dev->addr.function);
else
@@ -575,7 +575,8 @@ format_dpdk_device (u8 * s, va_list * args)
retval = rte_eth_dev_rss_hash_conf_get (xd->port_id, &rss_conf);
if (retval < 0)
clib_warning ("rte_eth_dev_rss_hash_conf_get returned %d", retval);
- pci = RTE_DEV_TO_PCI (di.device);
+
+ pci = dpdk_get_pci_device (&di);
if (pci)
{
diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index 5479f81f281..086d322db18 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -278,7 +278,8 @@ dpdk_lib_init (dpdk_main_t * dm)
dev_info.driver_name);
continue;
}
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
+
+ pci_dev = dpdk_get_pci_device (&dev_info);
if (pci_dev) /* bonded interface has no pci info */
{