Secondary process doesn't properly attach to the rte_eth_device
initialized by the primary process.
Accessing device from secondary process (e.g. via rte_eth_rx_burst),
causes process to crash. because rte_eth_dev_data is not properly set.
The issue was flood by
'commit 7f95f78a8aea ("ethdev: clear data when allocating device")'
which now clears rte_eth_dev_data entry.
So, most of the rte_eth_dev_data fields are not initialized.
For pci devices these fields are initialized by rte_eth_dev_pci_probe
->eth_dev_attach_secondary().
However, for virtio-user virtio_user_pmd_probe() is called instead of
rte_eth_dev_pci_probe().
To fix it: Allow non-pci drivers call to dev_attach_secondary() and
call it (for secondary process) from virtio_user_pmd_probe.
---
v2:
* Fix coding style issues.
Signed-off-by: Ami Sabo <[email protected]>
---
drivers/net/virtio/virtio_user_ethdev.c | 38 ++++++++++++++++-----------------
lib/librte_ether/rte_ethdev.h | 4 ++--
lib/librte_ether/rte_ether_version.map | 2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/net/virtio/virtio_user_ethdev.c
b/drivers/net/virtio/virtio_user_ethdev.c
index 5291294..9b3c266 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -418,25 +418,25 @@ virtio_user_pmd_probe(const char *name, const char
*params)
goto end;
}
- if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- eth_dev = virtio_user_eth_dev_alloc(name);
- if (!eth_dev) {
- PMD_INIT_LOG(ERR, "virtio_user fails to alloc device");
- goto end;
- }
- hw = eth_dev->data->dev_private;
- if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
- queue_size,
mac_addr) < 0) {
- PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
- virtio_user_eth_dev_free(eth_dev);
- goto end;
- }
- } else {
- eth_dev = rte_eth_dev_attach_secondary(name);
- if (!eth_dev) {
- goto end;
- }
- }
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ eth_dev = virtio_user_eth_dev_alloc(name);
+ if (!eth_dev) {
+ PMD_INIT_LOG(ERR, "virtio_user fails to alloc device");
+ goto end;
+ }
+ hw = eth_dev->data->dev_private;
+ if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
+ queue_size, mac_addr) < 0) {
+ PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
+ virtio_user_eth_dev_free(eth_dev);
+ goto end;
+ }
+ } else {
+ eth_dev = rte_eth_dev_attach_secondary(name);
+ if (!eth_dev) {
+ goto end;
+ }
+ }
/* previously called by rte_eal_pci_probe() for physical dev */
if (eth_virtio_dev_init(eth_dev) < 0) {
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index b30829f..3281205 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1762,8 +1762,8 @@ struct rte_eth_dev *rte_eth_dev_allocate(const char
*name);
/**
* @internal
- * Attach to the ethdev already initialized by the primary
- * process.
+ * Attach to the ethdev already initialized by the primary
+ * process.
*
* @param name Ethernet device's name.
@return
diff --git a/lib/librte_ether/rte_ether_version.map
b/lib/librte_ether/rte_ether_version.map
index ed4917c..f8bf2ee 100644
--- a/lib/librte_ether/rte_ether_version.map
+++ b/lib/librte_ether/rte_ether_version.map
@@ -152,6 +152,6 @@ DPDK_17.02 {
rte_flow_flush;
rte_flow_query;
rte_flow_validate;
- rte_eth_dev_attach_secondary;
+ rte_eth_dev_attach_secondary;
} DPDK_16.11;
--
2.7.4
