Skip to contentSkip to conversation

net/virtio-user: fix multi-process issue

PATCH In review Ami Sabo 2 participants 4 messages Feb 22, 2017 – Feb 23, 2017 1 message not in the archive Network drivers

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Ami Sabo

author
#1 lore raw

PATCH v2 1/1 net/virtio-user: fix multi-process issue

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.

---
 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(-)
drivers/net/virtio/virtio_user_ethdev.c +19 -19
index 5291294..9b3c266 100644
@@ -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) {
lib/librte_ether/rte_ethdev.h +2 -2
index b30829f..3281205 100644
@@ -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
lib/librte_ether/rte_ether_version.map +1 -1
index ed4917c..f8bf2ee 100644
@@ -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;
Signature · 1 line
2.7.4
#2 lore raw
Quoted 17 lines · Ami Sabo
drivers/net/virtio/virtio_user_ethdev.c +0 -9
index 5291294..9b3c266 100644
@@ -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) {

drivers/net/virtio/virtio_user_ethdev.c virtio_user_pmd_probe(const char *name, const char *params) · line 439

Quoted 10 lines
drivers/net/virtio/virtio_user_ethdev.c +0 -10
-                        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;
-                }
-        }

Were you making the patch based on some internal code base? The latest virtio code doesn't have the above code.

Quoted 5 lines
drivers/net/virtio/virtio_user_ethdev.c +5 -0
+	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;

drivers/net/virtio/virtio_user_ethdev.c virtio_user_pmd_probe(const char *name, const char *params) · line 435

Quoted 10 lines
drivers/net/virtio/virtio_user_ethdev.c +10 -0
+		}
+		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);

We also don't have rte_eth_dev_attach_secondary exported, neither.

	--yliu
author
#3 lore raw

Mistakenly sent only partial diff.
Resent the all patch (from the original code base) as a reply to the first message in the thread.

-- Ami

-----Original Message-----
From: Yuanhan Liu [mailto:[email protected]]
Sent: Thursday, February 23, 2017 4:55 AM
To: Ami Sabo
Cc: [email protected]
Subject: Re: [PATCH v2] net/virtio-user: fix multi-process issue

Quoted 18 lines · Ami Sabo
drivers/net/virtio/virtio_user_ethdev.c +0 -9
index 5291294..9b3c266 100644
@@ -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) {

drivers/net/virtio/virtio_user_ethdev.c virtio_user_pmd_probe(const char *name, const char *params) · line 439

Quoted 10 lines
drivers/net/virtio/virtio_user_ethdev.c +0 -10
-                        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;
-                }
-        }

Were you making the patch based on some internal code base? The latest virtio code doesn't have the above code.

Quoted 5 lines
drivers/net/virtio/virtio_user_ethdev.c +5 -0
+	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;

drivers/net/virtio/virtio_user_ethdev.c virtio_user_pmd_probe(const char *name, const char *params) · line 435

Quoted 10 lines
drivers/net/virtio/virtio_user_ethdev.c +10 -0
+		}
+		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);

We also don't have rte_eth_dev_attach_secondary exported, neither.

	--yliu
author
#4 lore raw

PATCH 1/1 Signed-off-by: Ami Sabo <[email protected]>

In reply to Ami Sabo

net/virtio-user: fix multi-process issue

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.

---
 drivers/net/virtio/virtio_user_ethdev.c | 29 +++++++++++++++++------------
 lib/librte_ether/rte_ethdev.c           |  6 +++---
 lib/librte_ether/rte_ethdev.h           | 11 +++++++++++
 lib/librte_ether/rte_ether_version.map  |  1 +
 4 files changed, 32 insertions(+), 15 deletions(-)
drivers/net/virtio/virtio_user_ethdev.c +17 -12
index e544acc..d388b92 100644
@@ -418,18 +418,23 @@ virtio_user_pmd_probe(const char *name, const char *params)
 		goto end;
 	}
 
-	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;
+	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 */
lib/librte_ether/rte_ethdev.c +3 -3
index 61f44e2..ea4f76c 100644
@@ -239,8 +239,8 @@ rte_eth_dev_allocate(const char *name)
  * makes sure that the same device would have the same port id both
  * in the primary and secondary process.
  */
-static struct rte_eth_dev *
-eth_dev_attach_secondary(const char *name)
+struct rte_eth_dev *
+rte_eth_dev_attach_secondary(const char *name)
 {
 	uint8_t i;
 	struct rte_eth_dev *eth_dev;
@@ -302,7 +302,7 @@ rte_eth_dev_pci_probe(struct rte_pci_driver *pci_drv,
 		if (eth_dev->data->dev_private == NULL)
 			rte_panic("Cannot allocate memzone for private port data\n");
 	} else {
-		eth_dev = eth_dev_attach_secondary(ethdev_name);
+		eth_dev = rte_eth_dev_attach_secondary(ethdev_name);
 		if (eth_dev == NULL) {
 			/*
 			 * if we failed to attach a device, it means the
lib/librte_ether/rte_ethdev.h +11 -0
index c17bbda..3281205 100644
@@ -1762,6 +1762,17 @@ struct rte_eth_dev *rte_eth_dev_allocate(const char *name);
 
 /**
  * @internal
+ * Attach to the ethdev already initialized by the primary
+ * process.
+ *
+ * @param	name	Ethernet device's name.
+  @return
+ *   - Slot in the rte_dev_devices array for attached device;
+ */
+struct rte_eth_dev *rte_eth_dev_attach_secondary(const char *name);
+
+/**
+ * @internal
  * Release the specified ethdev port.
  *
  * @param eth_dev
lib/librte_ether/rte_ether_version.map +1 -0
index c6c9d0d..f8bf2ee 100644
@@ -152,5 +152,6 @@ DPDK_17.02 {
 	rte_flow_flush;
 	rte_flow_query;
 	rte_flow_validate;
+	rte_eth_dev_attach_secondary;
 
 } DPDK_16.11;
Signature · 1 line
2.7.4