[dpdk-dev] [PATCH 1/4] net/vhost: remove an unused member
From: Itsuro Oda
remove an unused member from pmd_internal.
---
drivers/net/vhost/rte_eth_vhost.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 46f01a7f4..d4e3485ce 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -95,7 +95,6 @@ struct vhost_queue {
struct pmd_internal {
rte_atomic32_t dev_attached;
- char *dev_name;
char *iface_name;
uint16_t max_queues;
int vid;
@@ -1008,7 +1007,6 @@ eth_dev_close(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_tx_queues; i++)
rte_free(dev->data->tx_queues[i]);
- free(internal->dev_name);
free(internal->iface_name);
rte_free(internal);
@@ -1253,9 +1251,6 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
* - and point eth_dev structure to new eth_dev_data structure
*/
internal = eth_dev->data->dev_private;
- internal->dev_name = strdup(name);
- if (internal->dev_name == NULL)
- goto error;
internal->iface_name = strdup(iface_name);
if (internal->iface_name == NULL)
goto error;
@@ -1305,10 +1300,8 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
return data->port_id;
error:
- if (internal) {
+ if (internal)
free(internal->iface_name);
- free(internal->dev_name);
- }
rte_free(vring_state);
rte_eth_dev_release_port(eth_dev);
rte_free(list);
--
2.17.0
[dpdk-dev] [PATCH 2/4] net/vhost: allocate iface_name from heap
From: Itsuro Oda allocate iface_name of pmd_internal from heap in order to be able to refer from secondary processes. --- drivers/net/vhost/rte_eth_vhost.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index d4e3485ce..1b07aad24 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1007,7 +1007,7 @@ eth_dev_close(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_tx_queues; i++) rte_free(dev->data->tx_queues[i]); - free(internal->iface_name); + rte_free(internal->iface_name); rte_free(internal); dev->data->dev_private = NULL; @@ -1251,9 +1251,11 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name, * - and point eth_dev structure to new eth_dev_data structure */ internal = eth_dev->data->dev_private; - internal->iface_name = strdup(iface_name); + internal->iface_name = rte_malloc_socket(name, strlen(iface_name) + 1, +0, numa_node); if (internal->iface_name == NULL) goto error; + strcpy(internal->iface_name, iface_name); list->eth_dev = eth_dev; pthread_mutex_lock(&internal_list_lock); @@ -1301,7 +1303,7 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name, error: if (internal) - free(internal->iface_name); + rte_free(internal->iface_name); rte_free(vring_state); rte_eth_dev_release_port(eth_dev); rte_free(list); -- 2.17.0
[dpdk-dev] [PATCH 0/4] make vhost PMD available for secondary processes
From: Itsuro Oda vhost PMD has not been available for secondary processes since DPDK v18.11. (https://bugs.dpdk.org/show_bug.cgi?id=194) (for a long term !) This series of patches intend to make vhost PMD available for secondary processes. Because now setting vhost driver to communicate with a vhost-user master (ex. Qemu) is accomplished by the probe function of the primary process, only the primary process can be a vhost-user slave. With this patch, setting vhost driver is delayed at eth_dev configuration in order to be able to set it from a secondary process. Because (in the first place,) setting vhost driver is not necessary to be done at probe (it is enough to be done up to eth_dev start), this fix is no problem for the primary process. There is a precondition that the same process has to operate a vhost interface from begining to end (eth_dev configuration to eth_dev close). (This patch leaves it to user's responsibility.) This precondition will not be a problem in most use cases (including SPP). Itsuro Oda (4): net/vhost: remove an unused member net/vhost: allocate iface_name from heap net/vhost: delay vhost driver setup net/vhost: make secondary probe complete drivers/net/vhost/rte_eth_vhost.c | 152 +- 1 file changed, 88 insertions(+), 64 deletions(-) -- 2.17.0
[dpdk-dev] [PATCH 3/4] net/vhost: delay vhost driver setup
From: Itsuro Oda
setting vhost driver is delayed at eth_dev configuration
in order to be able to set it from a secondary process.
---
drivers/net/vhost/rte_eth_vhost.c | 130 ++
1 file changed, 78 insertions(+), 52 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 1b07aad24..0b8b5a4ca 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -96,6 +96,8 @@ struct vhost_queue {
struct pmd_internal {
rte_atomic32_t dev_attached;
char *iface_name;
+ uint64_t flags;
+ uint64_t disable_flags;
uint16_t max_queues;
int vid;
rte_atomic32_t started;
@@ -490,17 +492,6 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t
nb_bufs)
return nb_tx;
}
-static int
-eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
-{
- struct pmd_internal *internal = dev->data->dev_private;
- const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
-
- internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
-
- return 0;
-}
-
static inline struct internal_list *
find_internal_resource(char *ifname)
{
@@ -876,6 +867,62 @@ static struct vhost_device_ops vhost_ops = {
.vring_state_changed = vring_state_changed,
};
+static int
+vhost_driver_setup(struct rte_eth_dev *eth_dev)
+{
+ struct pmd_internal *internal = eth_dev->data->dev_private;
+ struct internal_list *list = NULL;
+ struct rte_vhost_vring_state *vring_state = NULL;
+ unsigned int numa_node = eth_dev->device->numa_node;
+ const char *name = eth_dev->device->name;
+
+ list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
+ if (list == NULL)
+ goto error;
+
+ vring_state = rte_zmalloc_socket(name, sizeof(*vring_state),
+0, numa_node);
+ if (vring_state == NULL)
+ goto error;
+
+ list->eth_dev = eth_dev;
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_INSERT_TAIL(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+
+ rte_spinlock_init(&vring_state->lock);
+ vring_states[eth_dev->data->port_id] = vring_state;
+
+ if (rte_vhost_driver_register(internal->iface_name, internal->flags))
+ goto error;
+
+ if (internal->disable_flags) {
+ if (rte_vhost_driver_disable_features(internal->iface_name,
+ internal->disable_flags))
+ goto error;
+ }
+
+ if (rte_vhost_driver_callback_register(internal->iface_name,
+ &vhost_ops) < 0) {
+ VHOST_LOG(ERR, "Can't register callbacks\n");
+ goto error;
+ }
+
+ if (rte_vhost_driver_start(internal->iface_name) < 0) {
+ VHOST_LOG(ERR, "Failed to start driver for %s\n",
+ internal->iface_name);
+ goto error;
+ }
+
+ return 0;
+
+error:
+ rte_free(vring_state);
+ rte_free(list);
+
+ return -1;
+}
+
int
rte_eth_vhost_get_queue_event(uint16_t port_id,
struct rte_eth_vhost_queue_event *event)
@@ -942,6 +989,24 @@ rte_eth_vhost_get_vid_from_port_id(uint16_t port_id)
return vid;
}
+static int
+eth_dev_configure(struct rte_eth_dev *dev)
+{
+ struct pmd_internal *internal = dev->data->dev_private;
+ const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
+
+ /* NOTE: the same process has to operate a vhost interface
+* from begining to end (eth_dev configure to eth_dev close).
+* It is user's responsibility at the moment.
+*/
+ if (vhost_driver_setup(dev) < 0)
+ return -1;
+
+ internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
+
+ return 0;
+}
+
static int
eth_dev_start(struct rte_eth_dev *eth_dev)
{
@@ -1217,16 +1282,10 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
struct pmd_internal *internal = NULL;
struct rte_eth_dev *eth_dev = NULL;
struct rte_ether_addr *eth_addr = NULL;
- struct rte_vhost_vring_state *vring_state = NULL;
- struct internal_list *list = NULL;
VHOST_LOG(INFO, "Creating VHOST-USER backend on numa socket %u\n",
numa_node);
- list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
- if (list == NULL)
- goto error;
-
/* reserve an ethdev entry */
eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internal));
if (eth_dev == NULL)
@@ -1240,11 +1299,6 @@ eth_dev_
[dpdk-dev] [PATCH 4/4] net/vhost: make secondary probe complete
From: Itsuro Oda add lacking member setting and make secondary probe complete. --- drivers/net/vhost/rte_eth_vhost.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 0b8b5a4ca..7a501cf91 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1390,8 +1390,11 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev) VHOST_LOG(ERR, "Failed to probe %s\n", name); return -1; } - /* TODO: request info from primary to set up Rx and Tx */ + eth_dev->rx_pkt_burst = eth_vhost_rx; + eth_dev->tx_pkt_burst = eth_vhost_tx; eth_dev->dev_ops = &ops; + if (dev->device.numa_node == SOCKET_ID_ANY) + dev->device.numa_node = rte_socket_id(); eth_dev->device = &dev->device; rte_eth_dev_probing_finish(eth_dev); return 0; -- 2.17.0
Re: [dpdk-dev] [PATCH 0/4] make vhost PMD available for secondary processes
Hi, I will fix to add signed-off-by and correct spelling error according to test-report@dpdk. Please check the content until then. Thanks. On Wed, 8 Jan 2020 15:25:06 +0900 o...@valinux.co.jp wrote: > From: Itsuro Oda > > vhost PMD has not been available for secondary processes since > DPDK v18.11. (https://bugs.dpdk.org/show_bug.cgi?id=194) > (for a long term !) > This series of patches intend to make vhost PMD available for > secondary processes. > Because now setting vhost driver to communicate with a vhost-user > master (ex. Qemu) is accomplished by the probe function of the > primary process, only the primary process can be a vhost-user > slave. > With this patch, setting vhost driver is delayed at eth_dev > configuration in order to be able to set it from a secondary > process. Because (in the first place,) setting vhost driver is not > necessary to be done at probe (it is enough to be done up to eth_dev > start), this fix is no problem for the primary process. > There is a precondition that the same process has to operate > a vhost interface from begining to end (eth_dev configuration to > eth_dev close). (This patch leaves it to user's responsibility.) > This precondition will not be a problem in most use cases > (including SPP). > > Itsuro Oda (4): > net/vhost: remove an unused member > net/vhost: allocate iface_name from heap > net/vhost: delay vhost driver setup > net/vhost: make secondary probe complete > > drivers/net/vhost/rte_eth_vhost.c | 152 +----- > 1 file changed, 88 insertions(+), 64 deletions(-) > > -- > 2.17.0 -- Itsuro ODA
[dpdk-dev] [PATCH 4/4] net/vhost: make secondary probe complete
add lacking member setting and make secondary probe complete. Signed-off-by: Itsuro Oda --- drivers/net/vhost/rte_eth_vhost.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 44f44cea3..485a88794 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1390,8 +1390,11 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev) VHOST_LOG(ERR, "Failed to probe %s\n", name); return -1; } - /* TODO: request info from primary to set up Rx and Tx */ + eth_dev->rx_pkt_burst = eth_vhost_rx; + eth_dev->tx_pkt_burst = eth_vhost_tx; eth_dev->dev_ops = &ops; + if (dev->device.numa_node == SOCKET_ID_ANY) + dev->device.numa_node = rte_socket_id(); eth_dev->device = &dev->device; rte_eth_dev_probing_finish(eth_dev); return 0; -- 2.17.0
[dpdk-dev] [PATCH 1/4] net/vhost: remove an unused member
remove an unused member from pmd_internal.
Signed-off-by: Itsuro Oda
---
drivers/net/vhost/rte_eth_vhost.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 46f01a7f4..d4e3485ce 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -95,7 +95,6 @@ struct vhost_queue {
struct pmd_internal {
rte_atomic32_t dev_attached;
- char *dev_name;
char *iface_name;
uint16_t max_queues;
int vid;
@@ -1008,7 +1007,6 @@ eth_dev_close(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_tx_queues; i++)
rte_free(dev->data->tx_queues[i]);
- free(internal->dev_name);
free(internal->iface_name);
rte_free(internal);
@@ -1253,9 +1251,6 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
* - and point eth_dev structure to new eth_dev_data structure
*/
internal = eth_dev->data->dev_private;
- internal->dev_name = strdup(name);
- if (internal->dev_name == NULL)
- goto error;
internal->iface_name = strdup(iface_name);
if (internal->iface_name == NULL)
goto error;
@@ -1305,10 +1300,8 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
return data->port_id;
error:
- if (internal) {
+ if (internal)
free(internal->iface_name);
- free(internal->dev_name);
- }
rte_free(vring_state);
rte_eth_dev_release_port(eth_dev);
rte_free(list);
--
2.17.0
[dpdk-dev] [PATCH 0/4] make vhost PMD available for secondary processes
vhost PMD has not been available for secondary processes since DPDK v18.11. (https://bugs.dpdk.org/show_bug.cgi?id=194) (for a long term !) This series of patches intend to make vhost PMD available for secondary processes. Because now setting vhost driver to communicate with a vhost-user master (ex. Qemu) is accomplished by the probe function of the primary process, only the primary process can be a vhost-user slave. With this patch, setting vhost driver is delayed at eth_dev configuration in order to be able to set it from a secondary process. Because (in the first place,) setting vhost driver is not necessary to be done at probe (it is enough to be done up to eth_dev start), this fix is no problem for the primary process. There is a precondition that the same process has to operate a vhost interface from beginning to end (from eth_dev configuration to eth_dev close). (This patch leaves it to user's responsibility.) This precondition will not be a problem in most use cases (including SPP). v2: - add signed-off-by - fix spelling error Itsuro Oda (4): net/vhost: remove an unused member net/vhost: allocate iface_name from heap net/vhost: delay vhost driver setup net/vhost: make secondary probe complete drivers/net/vhost/rte_eth_vhost.c | 152 +- 1 file changed, 88 insertions(+), 64 deletions(-) -- 2.17.0
[dpdk-dev] [PATCH 2/4] net/vhost: allocate iface_name from heap
allocate iface_name of pmd_internal from heap in order to be able to refer from secondary processes. Signed-off-by: Itsuro Oda --- drivers/net/vhost/rte_eth_vhost.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index d4e3485ce..1b07aad24 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1007,7 +1007,7 @@ eth_dev_close(struct rte_eth_dev *dev) for (i = 0; i < dev->data->nb_tx_queues; i++) rte_free(dev->data->tx_queues[i]); - free(internal->iface_name); + rte_free(internal->iface_name); rte_free(internal); dev->data->dev_private = NULL; @@ -1251,9 +1251,11 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name, * - and point eth_dev structure to new eth_dev_data structure */ internal = eth_dev->data->dev_private; - internal->iface_name = strdup(iface_name); + internal->iface_name = rte_malloc_socket(name, strlen(iface_name) + 1, +0, numa_node); if (internal->iface_name == NULL) goto error; + strcpy(internal->iface_name, iface_name); list->eth_dev = eth_dev; pthread_mutex_lock(&internal_list_lock); @@ -1301,7 +1303,7 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name, error: if (internal) - free(internal->iface_name); + rte_free(internal->iface_name); rte_free(vring_state); rte_eth_dev_release_port(eth_dev); rte_free(list); -- 2.17.0
[dpdk-dev] [PATCH 3/4] net/vhost: delay vhost driver setup
setting vhost driver is delayed at eth_dev configuration
in order to be able to set it from a secondary process.
Signed-off-by: Itsuro Oda
---
drivers/net/vhost/rte_eth_vhost.c | 130 ++
1 file changed, 78 insertions(+), 52 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 1b07aad24..44f44cea3 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -96,6 +96,8 @@ struct vhost_queue {
struct pmd_internal {
rte_atomic32_t dev_attached;
char *iface_name;
+ uint64_t flags;
+ uint64_t disable_flags;
uint16_t max_queues;
int vid;
rte_atomic32_t started;
@@ -490,17 +492,6 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t
nb_bufs)
return nb_tx;
}
-static int
-eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
-{
- struct pmd_internal *internal = dev->data->dev_private;
- const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
-
- internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
-
- return 0;
-}
-
static inline struct internal_list *
find_internal_resource(char *ifname)
{
@@ -876,6 +867,62 @@ static struct vhost_device_ops vhost_ops = {
.vring_state_changed = vring_state_changed,
};
+static int
+vhost_driver_setup(struct rte_eth_dev *eth_dev)
+{
+ struct pmd_internal *internal = eth_dev->data->dev_private;
+ struct internal_list *list = NULL;
+ struct rte_vhost_vring_state *vring_state = NULL;
+ unsigned int numa_node = eth_dev->device->numa_node;
+ const char *name = eth_dev->device->name;
+
+ list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
+ if (list == NULL)
+ goto error;
+
+ vring_state = rte_zmalloc_socket(name, sizeof(*vring_state),
+0, numa_node);
+ if (vring_state == NULL)
+ goto error;
+
+ list->eth_dev = eth_dev;
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_INSERT_TAIL(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+
+ rte_spinlock_init(&vring_state->lock);
+ vring_states[eth_dev->data->port_id] = vring_state;
+
+ if (rte_vhost_driver_register(internal->iface_name, internal->flags))
+ goto error;
+
+ if (internal->disable_flags) {
+ if (rte_vhost_driver_disable_features(internal->iface_name,
+ internal->disable_flags))
+ goto error;
+ }
+
+ if (rte_vhost_driver_callback_register(internal->iface_name,
+ &vhost_ops) < 0) {
+ VHOST_LOG(ERR, "Can't register callbacks\n");
+ goto error;
+ }
+
+ if (rte_vhost_driver_start(internal->iface_name) < 0) {
+ VHOST_LOG(ERR, "Failed to start driver for %s\n",
+ internal->iface_name);
+ goto error;
+ }
+
+ return 0;
+
+error:
+ rte_free(vring_state);
+ rte_free(list);
+
+ return -1;
+}
+
int
rte_eth_vhost_get_queue_event(uint16_t port_id,
struct rte_eth_vhost_queue_event *event)
@@ -942,6 +989,24 @@ rte_eth_vhost_get_vid_from_port_id(uint16_t port_id)
return vid;
}
+static int
+eth_dev_configure(struct rte_eth_dev *dev)
+{
+ struct pmd_internal *internal = dev->data->dev_private;
+ const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
+
+ /* NOTE: the same process has to operate a vhost interface
+* from beginning to end (from eth_dev configure to eth_dev close).
+* It is user's responsibility at the moment.
+*/
+ if (vhost_driver_setup(dev) < 0)
+ return -1;
+
+ internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
+
+ return 0;
+}
+
static int
eth_dev_start(struct rte_eth_dev *eth_dev)
{
@@ -1217,16 +1282,10 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
struct pmd_internal *internal = NULL;
struct rte_eth_dev *eth_dev = NULL;
struct rte_ether_addr *eth_addr = NULL;
- struct rte_vhost_vring_state *vring_state = NULL;
- struct internal_list *list = NULL;
VHOST_LOG(INFO, "Creating VHOST-USER backend on numa socket %u\n",
numa_node);
- list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
- if (list == NULL)
- goto error;
-
/* reserve an ethdev entry */
eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internal));
if (eth_dev == NULL)
@@ -1240,11 +1299,6 @@ eth_dev_
Re: [dpdk-dev] [PATCH 0/4] make vhost PMD available for secondary processes
Hi vhost PMD maitainers, I have not got any feedback yet. Since this is the first time I submit a patch, something may be wrong, would you tell me what should I do ? Thanks. On Thu, 9 Jan 2020 08:22:05 +0900 Itsuro Oda wrote: > vhost PMD has not been available for secondary processes since > DPDK v18.11. (https://bugs.dpdk.org/show_bug.cgi?id=194) > (for a long term !) > This series of patches intend to make vhost PMD available for > secondary processes. > Because now setting vhost driver to communicate with a vhost-user > master (ex. Qemu) is accomplished by the probe function of the > primary process, only the primary process can be a vhost-user > slave. > With this patch, setting vhost driver is delayed at eth_dev > configuration in order to be able to set it from a secondary > process. Because (in the first place,) setting vhost driver is not > necessary to be done at probe (it is enough to be done up to eth_dev > start), this fix is no problem for the primary process. > There is a precondition that the same process has to operate > a vhost interface from beginning to end (from eth_dev configuration > to eth_dev close). (This patch leaves it to user's responsibility.) > This precondition will not be a problem in most use cases > (including SPP). > > v2: > - add signed-off-by > - fix spelling error > > Itsuro Oda (4): > net/vhost: remove an unused member > net/vhost: allocate iface_name from heap > net/vhost: delay vhost driver setup > net/vhost: make secondary probe complete > > drivers/net/vhost/rte_eth_vhost.c | 152 +----- > 1 file changed, 88 insertions(+), 64 deletions(-) > > -- > 2.17.0 -- Itsuro ODA
Re: [dpdk-dev] [PATCH 0/4] make vhost PMD available for secondary processes
Hi Maxime, Thank you for your reply and review. I will make fixes of the patches according to your indication and post them. Thanks. Itsuro Oda On Tue, 4 Feb 2020 18:54:23 +0100 Maxime Coquelin wrote: > Hi Itsuro, > > On 1/20/20 3:17 AM, Itsuro ODA wrote: > > Hi vhost PMD maitainers, > > > > I have not got any feedback yet. > > Since this is the first time I submit a patch, something > > may be wrong, would you tell me what should I do ? > > Sorry for the delay, and thanks for the contribution. > > You series does not apply properly on dpdk-next-virtio master branch: > https://git.dpdk.org/next/dpdk-next-virtio > > I will review it, so when doing v3, please rebase it. > > More generally, you series comprises fixes (patch 2 to 4), and > cleanup (patch 1). > > Cleanup patch should be the last, in order to ease the backporting > of the fixes to LTSes (we avoid backporting cleanup patches). > > Regarding fixes patches, it should tag the faulty commit in > master branch, and sta...@dpdk.org should be Cc'ed. > > Example of commit message with fixes tag: > http://patches.dpdk.org/patch/63305/ > > Finally, when you'll post the v3, please prefix the patches subject > with the revision number: > > git format-patch --subject-prefix"PATCH v3" ... > > Thanks, > Maxime > > > Thanks. > > > > On Thu, 9 Jan 2020 08:22:05 +0900 > > Itsuro Oda wrote: > > > >> vhost PMD has not been available for secondary processes since > >> DPDK v18.11. (https://bugs.dpdk.org/show_bug.cgi?id=194) > >> (for a long term !) > >> This series of patches intend to make vhost PMD available for > >> secondary processes. > >> Because now setting vhost driver to communicate with a vhost-user > >> master (ex. Qemu) is accomplished by the probe function of the > >> primary process, only the primary process can be a vhost-user > >> slave. > >> With this patch, setting vhost driver is delayed at eth_dev > >> configuration in order to be able to set it from a secondary > >> process. Because (in the first place,) setting vhost driver is not > >> necessary to be done at probe (it is enough to be done up to eth_dev > >> start), this fix is no problem for the primary process. > >> There is a precondition that the same process has to operate > >> a vhost interface from beginning to end (from eth_dev configuration > >> to eth_dev close). (This patch leaves it to user's responsibility.) > >> This precondition will not be a problem in most use cases > >> (including SPP). > >> > >> v2: > >> - add signed-off-by > >> - fix spelling error > >> > >> Itsuro Oda (4): > >> net/vhost: remove an unused member > >> net/vhost: allocate iface_name from heap > >> net/vhost: delay vhost driver setup > >> net/vhost: make secondary probe complete > >> > >> drivers/net/vhost/rte_eth_vhost.c | 152 +- > >> 1 file changed, 88 insertions(+), 64 deletions(-) > >> > >> -- > >> 2.17.0 > > -- Itsuro ODA
[dpdk-dev] [PATCH v3 0/4] make vhost PMD available for secondary processes
vhost PMD has not been available for secondary processes since DPDK v18.11. (https://bugs.dpdk.org/show_bug.cgi?id=194) (for a long term !) This series of patches intend to make vhost PMD available for secondary processes. Because now setting vhost driver to communicate with a vhost-user master (ex. Qemu) is accomplished by the probe function of the primary process, only the primary process can be a vhost-user slave. With this patch, setting vhost driver is delayed at eth_dev configuration in order to be able to set it from a secondary process. Because (in the first place,) setting vhost driver is not necessary to be done at probe (it is enough to be done up to eth_dev start), this fix is no problem for the primary process. There is a precondition that the same process has to operate a vhost interface from beginning to end (from eth_dev configuration to eth_dev close). (This patch leaves it to user's responsibility.) This precondition will not be a problem in most use cases (including SPP). v2: - add signed-off-by - fix spelling error v3: - rebase on dpdk-next-virtio master - change patch order - fix subject and commit message Itsuro Oda (4): net/vhost: allocate interface name from heap net/vhost: delay vhost driver setup net/vhost: make secondary probe complete net/vhost: remove an unused member drivers/net/vhost/rte_eth_vhost.c | 152 +- 1 file changed, 88 insertions(+), 64 deletions(-) -- 2.17.0
[dpdk-dev] [PATCH v3 3/4] net/vhost: make secondary probe complete
This patch adds lacking member setting and makes secondary probe complete. Fixes: 4852aa8f6e21 (drivers/net: enable hotplug on secondary process) Cc: sta...@dpdk.org Signed-off-by: Itsuro Oda Reviewed-by: Maxime Coquelin --- drivers/net/vhost/rte_eth_vhost.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index d7bba5c6e..307de2c68 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1397,8 +1397,11 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev) VHOST_LOG(ERR, "Failed to probe %s\n", name); return -1; } - /* TODO: request info from primary to set up Rx and Tx */ + eth_dev->rx_pkt_burst = eth_vhost_rx; + eth_dev->tx_pkt_burst = eth_vhost_tx; eth_dev->dev_ops = &ops; + if (dev->device.numa_node == SOCKET_ID_ANY) + dev->device.numa_node = rte_socket_id(); eth_dev->device = &dev->device; rte_eth_dev_probing_finish(eth_dev); return 0; -- 2.17.0
[dpdk-dev] [PATCH v3 2/4] net/vhost: delay vhost driver setup
Vhost driver setup is delayed at eth_dev configuration
in order to be able to set it from a secondary process.
Fixes: 4852aa8f6e21 (drivers/net: enable hotplug on secondary process)
Cc: sta...@dpdk.org
Signed-off-by: Itsuro Oda
Reviewed-by: Maxime Coquelin
---
drivers/net/vhost/rte_eth_vhost.c | 130 ++
1 file changed, 78 insertions(+), 52 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index cea2ead2d..d7bba5c6e 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -97,6 +97,8 @@ struct pmd_internal {
rte_atomic32_t dev_attached;
char *dev_name;
char *iface_name;
+ uint64_t flags;
+ uint64_t disable_flags;
uint16_t max_queues;
int vid;
rte_atomic32_t started;
@@ -491,17 +493,6 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t
nb_bufs)
return nb_tx;
}
-static int
-eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
-{
- struct pmd_internal *internal = dev->data->dev_private;
- const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
-
- internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
-
- return 0;
-}
-
static inline struct internal_list *
find_internal_resource(char *ifname)
{
@@ -877,6 +868,62 @@ static struct vhost_device_ops vhost_ops = {
.vring_state_changed = vring_state_changed,
};
+static int
+vhost_driver_setup(struct rte_eth_dev *eth_dev)
+{
+ struct pmd_internal *internal = eth_dev->data->dev_private;
+ struct internal_list *list = NULL;
+ struct rte_vhost_vring_state *vring_state = NULL;
+ unsigned int numa_node = eth_dev->device->numa_node;
+ const char *name = eth_dev->device->name;
+
+ list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
+ if (list == NULL)
+ goto error;
+
+ vring_state = rte_zmalloc_socket(name, sizeof(*vring_state),
+0, numa_node);
+ if (vring_state == NULL)
+ goto error;
+
+ list->eth_dev = eth_dev;
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_INSERT_TAIL(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+
+ rte_spinlock_init(&vring_state->lock);
+ vring_states[eth_dev->data->port_id] = vring_state;
+
+ if (rte_vhost_driver_register(internal->iface_name, internal->flags))
+ goto error;
+
+ if (internal->disable_flags) {
+ if (rte_vhost_driver_disable_features(internal->iface_name,
+ internal->disable_flags))
+ goto error;
+ }
+
+ if (rte_vhost_driver_callback_register(internal->iface_name,
+ &vhost_ops) < 0) {
+ VHOST_LOG(ERR, "Can't register callbacks\n");
+ goto error;
+ }
+
+ if (rte_vhost_driver_start(internal->iface_name) < 0) {
+ VHOST_LOG(ERR, "Failed to start driver for %s\n",
+ internal->iface_name);
+ goto error;
+ }
+
+ return 0;
+
+error:
+ rte_free(vring_state);
+ rte_free(list);
+
+ return -1;
+}
+
int
rte_eth_vhost_get_queue_event(uint16_t port_id,
struct rte_eth_vhost_queue_event *event)
@@ -943,6 +990,24 @@ rte_eth_vhost_get_vid_from_port_id(uint16_t port_id)
return vid;
}
+static int
+eth_dev_configure(struct rte_eth_dev *dev)
+{
+ struct pmd_internal *internal = dev->data->dev_private;
+ const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
+
+ /* NOTE: the same process has to operate a vhost interface
+* from beginning to end (from eth_dev configure to eth_dev close).
+* It is user's responsibility at the moment.
+*/
+ if (vhost_driver_setup(dev) < 0)
+ return -1;
+
+ internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
+
+ return 0;
+}
+
static int
eth_dev_start(struct rte_eth_dev *eth_dev)
{
@@ -1219,16 +1284,10 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
struct pmd_internal *internal = NULL;
struct rte_eth_dev *eth_dev = NULL;
struct rte_ether_addr *eth_addr = NULL;
- struct rte_vhost_vring_state *vring_state = NULL;
- struct internal_list *list = NULL;
VHOST_LOG(INFO, "Creating VHOST-USER backend on numa socket %u\n",
numa_node);
- list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
- if (list == NULL)
- goto error;
-
/* reserve an ethdev entry
[dpdk-dev] [PATCH v3 4/4] net/vhost: remove an unused member
This patch removes an unused member from pmd_internal.
Signed-off-by: Itsuro Oda
Reviewed-by: Maxime Coquelin
---
drivers/net/vhost/rte_eth_vhost.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 307de2c68..90263ae77 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -95,7 +95,6 @@ struct vhost_queue {
struct pmd_internal {
rte_atomic32_t dev_attached;
- char *dev_name;
char *iface_name;
uint64_t flags;
uint64_t disable_flags;
@@ -1073,7 +1072,6 @@ eth_dev_close(struct rte_eth_dev *dev)
for (i = 0; i < dev->data->nb_tx_queues; i++)
rte_free(dev->data->tx_queues[i]);
- free(internal->dev_name);
rte_free(internal->iface_name);
rte_free(internal);
@@ -1307,9 +1305,6 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
* - and point eth_dev structure to new eth_dev_data structure
*/
internal = eth_dev->data->dev_private;
- internal->dev_name = strdup(name);
- if (internal->dev_name == NULL)
- goto error;
internal->iface_name = rte_malloc_socket(name, strlen(iface_name) + 1,
0, numa_node);
if (internal->iface_name == NULL)
@@ -1335,10 +1330,8 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
return 0;
error:
- if (internal) {
+ if (internal)
rte_free(internal->iface_name);
- free(internal->dev_name);
- }
rte_eth_dev_release_port(eth_dev);
return -1;
--
2.17.0
[dpdk-dev] [PATCH v3 1/4] net/vhost: allocate interface name from heap
This patch allocates iface_name of pmd_internal from heap
in order to be able to refer from secondary processes.
Fixes: 4852aa8f6e21 (drivers/net: enable hotplug on secondary process)
Cc: sta...@dpdk.org
Signed-off-by: Itsuro Oda
Reviewed-by: Maxime Coquelin
---
drivers/net/vhost/rte_eth_vhost.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index a63588986..cea2ead2d 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1009,7 +1009,7 @@ eth_dev_close(struct rte_eth_dev *dev)
rte_free(dev->data->tx_queues[i]);
free(internal->dev_name);
- free(internal->iface_name);
+ rte_free(internal->iface_name);
rte_free(internal);
dev->data->dev_private = NULL;
@@ -1256,9 +1256,11 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
internal->dev_name = strdup(name);
if (internal->dev_name == NULL)
goto error;
- internal->iface_name = strdup(iface_name);
+ internal->iface_name = rte_malloc_socket(name, strlen(iface_name) + 1,
+0, numa_node);
if (internal->iface_name == NULL)
goto error;
+ strcpy(internal->iface_name, iface_name);
list->eth_dev = eth_dev;
pthread_mutex_lock(&internal_list_lock);
@@ -1306,7 +1308,7 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char
*iface_name,
error:
if (internal) {
- free(internal->iface_name);
+ rte_free(internal->iface_name);
free(internal->dev_name);
}
rte_free(vring_state);
--
2.17.0
Re: [dpdk-dev] [PATCH 0/2] Fix Vhost PMD setup
Hi Yinan, Maxime, David, Thank you for quick test, fix and review. It looks good to me. The original fix has been queued to stable 19.11.1. It should be rejected or applied this fix too. Thanks. Itsuto Oda On Tue, 18 Feb 2020 18:22:38 +0100 Maxime Coquelin wrote: > This series fixes regression introduced in v20.02-rc3. > First patch fixes the error path, and second one fix > Vhost device reconfigure issue reported by Yinan. > > v2: > --- > - Fix error path order (David) > > Maxime Coquelin (2): > net/vhost: fix Vhost setup error path > net/vhost: prevent multiple setup on reconfig > > drivers/net/vhost/rte_eth_vhost.c | 26 +++--- > 1 file changed, 19 insertions(+), 7 deletions(-) > > -- > 2.24.1 -- Itsuro ODA
Re: [dpdk-dev] [PATCH 2/2] net/vhost: prevent multiple setup on reconfig
Hi Maxime, Tiewi,
On Wed, 19 Feb 2020 09:17:41 +0100
Maxime Coquelin wrote:
> Hi Tiwei,
>
> On 2/19/20 4:44 AM, Tiwei Bie wrote:
> > On Tue, Feb 18, 2020 at 06:22:40PM +0100, Maxime Coquelin wrote:
> >> Ethdev's .dev_configure callback can be called multiple
> >> time during a device life-time, but Vhost makes the
> >> wrong assumption that it is not the case and try to
> >> setup again the device on reconfiguration.
> >>
> >> This patch ensures the device hasn't been already setup
> >> before proceeding.
> >>
> >> Fixes: 3d01b759d267 ("net/vhost: delay driver setup")
> >>
> >> Reported-by: Yinan Wang
> >> Signed-off-by: Maxime Coquelin
> >> Tested-by: Yinan Wang
> >> Reviewed-by: David Marchand
> >> ---
> >> drivers/net/vhost/rte_eth_vhost.c | 5 +
> >> 1 file changed, 5 insertions(+)
> >>
> >> diff --git a/drivers/net/vhost/rte_eth_vhost.c
> >> b/drivers/net/vhost/rte_eth_vhost.c
> >> index 4a7b1b608c..458ed58f5f 100644
> >> --- a/drivers/net/vhost/rte_eth_vhost.c
> >> +++ b/drivers/net/vhost/rte_eth_vhost.c
> >> @@ -876,6 +876,11 @@ vhost_driver_setup(struct rte_eth_dev *eth_dev)
> >>unsigned int numa_node = eth_dev->device->numa_node;
> >>const char *name = eth_dev->device->name;
> >>
> >> + /* Don't try to setup again if it has already been done. */
> >> + list = find_internal_resource(internal->iface_name);
> >> + if (list)
> >> + return 0;
> >> +
> >>list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
> >>if (list == NULL)
> >>return -1;
> >> --
> >> 2.24.1
> >
> > Thanks Maxime for the fix!
> >
> > Reviewed-by: Tiwei Bie
> >
> > Not related to this fix, it seems there is a potential leak after
> > delaying the driver setup to _configure, as the list won't be
> > registered until users configure the device. So internal->iface_name
> > allocated in _create will leak if the device is released without
> > doing _configure first.
> >
> > https://github.com/DPDK/dpdk/blob/e6c78e736d77/drivers/net/vhost/rte_eth_vhost.c#L1058
> > https://github.com/DPDK/dpdk/blob/e6c78e736d77/drivers/net/vhost/rte_eth_vhost.c#L1075
> >
> > It's not a common case and it's quite late in this release,
> > probably it's fine to fix it later.
>
> That's a valid point, and I also agree there is no urgency for v20.02.
> Itsuro, would you take care of fixing it for v20.05?
Sure, I will do it.
Thanks.
Itsuro Oda
> Thanks,
> Maxime
> > Thanks,
> > Tiwei
> >
--
Itsuro ODA
[dpdk-dev] [PATCH] net/vhost: fix potential memory leak
If a vhost device is closed before eth_dev_configure is done
to the device, internal resources allocated to the device
does not freed. This patch fixes it.
Fixes: 3d01b759d267 ("net/vhost: delay driver setup")
Signed-off-by: Itsuro Oda
---
drivers/net/vhost/rte_eth_vhost.c | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 458ed58f5..1ed977e9b 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1065,16 +1065,14 @@ eth_dev_close(struct rte_eth_dev *dev)
eth_dev_stop(dev);
- rte_vhost_driver_unregister(internal->iface_name);
-
list = find_internal_resource(internal->iface_name);
- if (!list)
- return;
-
- pthread_mutex_lock(&internal_list_lock);
- TAILQ_REMOVE(&internal_list, list, next);
- pthread_mutex_unlock(&internal_list_lock);
- rte_free(list);
+ if (list) {
+ rte_vhost_driver_unregister(internal->iface_name);
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_REMOVE(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+ rte_free(list);
+ }
if (dev->data->rx_queues)
for (i = 0; i < dev->data->nb_rx_queues; i++)
--
2.17.0
[dpdk-dev] [PATCH v2] net/vhost: fix potential memory leak
If a vhost device is closed before eth_dev_configure is done
to the device, internal resources allocated to the device
would not be freed. This patch fixes it.
Fixes: 3d01b759d267 ("net/vhost: delay driver setup")
Cc: sta...@dpdk.org
Signed-off-by: Itsuro Oda
Reviewd-by: Xiaolong Ye
---
v2:
- fix commit message
drivers/net/vhost/rte_eth_vhost.c | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 458ed58f5..1ed977e9b 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1065,16 +1065,14 @@ eth_dev_close(struct rte_eth_dev *dev)
eth_dev_stop(dev);
- rte_vhost_driver_unregister(internal->iface_name);
-
list = find_internal_resource(internal->iface_name);
- if (!list)
- return;
-
- pthread_mutex_lock(&internal_list_lock);
- TAILQ_REMOVE(&internal_list, list, next);
- pthread_mutex_unlock(&internal_list_lock);
- rte_free(list);
+ if (list) {
+ rte_vhost_driver_unregister(internal->iface_name);
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_REMOVE(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+ rte_free(list);
+ }
if (dev->data->rx_queues)
for (i = 0; i < dev->data->nb_rx_queues; i++)
--
2.17.0
[dpdk-dev] [PATCH v3] net/vhost: fix potential memory leak
If a vhost device is closed before eth_dev_configure is done
to the device, internal resources allocated to the device
would not be freed. This patch fixes it.
Fixes: 3d01b759d267 ("net/vhost: delay driver setup")
Cc: sta...@dpdk.org
Signed-off-by: Itsuro Oda
Reviewed-by: Xiaolong Ye
---
v2:
- fix commit message
v3:
- fix spell error of Reviewed-by
drivers/net/vhost/rte_eth_vhost.c | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 458ed58f5..1ed977e9b 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1065,16 +1065,14 @@ eth_dev_close(struct rte_eth_dev *dev)
eth_dev_stop(dev);
- rte_vhost_driver_unregister(internal->iface_name);
-
list = find_internal_resource(internal->iface_name);
- if (!list)
- return;
-
- pthread_mutex_lock(&internal_list_lock);
- TAILQ_REMOVE(&internal_list, list, next);
- pthread_mutex_unlock(&internal_list_lock);
- rte_free(list);
+ if (list) {
+ rte_vhost_driver_unregister(internal->iface_name);
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_REMOVE(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+ rte_free(list);
+ }
if (dev->data->rx_queues)
for (i = 0; i < dev->data->nb_rx_queues; i++)
--
2.17.0
[dpdk-dev] [PATCH] vhost: make iotlb cache name unique among multi processes
Currently, iotlb cache name is comprised of vid and virtqueue
index. For example, "iotlb_cache_0_0". Because vid is assigned
per process, iotlb cache name is not unique among multi processes.
For example a secondary process uses a vhost
(ex. eth_vhost0,iface=/tmp/sock0) and another secondary process
uses a vhost (ex. eth_vhost1,iface=/tmp/sock1), iotlb cache
name of both vhost ("iotlb_cache_0_0") are same and as a result
iotlb cache is broken.
This patch makes iotlb cache name unique among milti processes
by using the interface name not vid to comprise iotlb cache name.
Since the length of interface name is variable, this patch uses
hash value calculated by the interface name.
Fixes: d012d1f293f4 (vhost: add IOTLB helper functions)
Cc: sta...@dpdk.org
Signed-off-by: Itsuro Oda
---
lib/librte_vhost/iotlb.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index bc1758528..0992c145b 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -6,6 +6,7 @@
#include
#endif
+#include
#include
#include "iotlb.h"
@@ -288,6 +289,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
char pool_name[RTE_MEMPOOL_NAMESIZE];
struct vhost_virtqueue *vq = dev->virtqueue[vq_index];
int socket = 0;
+ uint32_t val;
if (vq->iotlb_pool) {
/*
@@ -308,8 +310,10 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
TAILQ_INIT(&vq->iotlb_list);
TAILQ_INIT(&vq->iotlb_pending_list);
- snprintf(pool_name, sizeof(pool_name), "iotlb_cache_%d_%d",
- dev->vid, vq_index);
+ val = rte_jhash(dev->ifname, strlen(dev->ifname), 0);
+ snprintf(pool_name, sizeof(pool_name), "iotlb_cache_%08x_%d",
+ val, vq_index);
+ VHOST_LOG_CONFIG(DEBUG, "IOTLB cache name: %s\n", pool_name);
/* If already created, free it and recreate */
vq->iotlb_pool = rte_mempool_lookup(pool_name);
--
2.17.0
[dpdk-dev] [PATCH v2] vhost: make iotlb cache name unique among multi processes
Currently, iotlb cache name is comprised of vid and virtqueue
index. For example, "iotlb_cache_0_0". Because vid is assigned
per process, iotlb cache name is not unique among multi processes.
For example a secondary process uses a vhost
(ex. eth_vhost0,iface=/tmp/sock0) and another secondary process
uses a vhost (ex. eth_vhost1,iface=/tmp/sock1), iotlb cache
name of both vhost ("iotlb_cache_0_0") are same and as a result
iotlb cache is broken.
This patch makes iotlb cache name unique among milti processes
by adding process id to the iotlb cache name.
The prefix of the name is shortend to "iotlb_" since the maximum
length of pool name is 23 bytes (RTE_MEMPOOL_NAMESIZE is 24).
Note that pid_t is 4 bytes (thus max 10 digits), vid is max 4
digits (MAX_VHOST_DEVICE is 1024) and vq_index is 1 digit. It is
just 23 characters in maximum.
Fixes: d012d1f293f4 (vhost: add IOTLB helper functions)
Cc: sta...@dpdk.org
Signed-off-by: Itsuro Oda
---
v2:
* use the process id to make the iotlb cache name unique.
lib/librte_vhost/iotlb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index bc1758528..7af5b8c8d 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -308,8 +308,9 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
TAILQ_INIT(&vq->iotlb_list);
TAILQ_INIT(&vq->iotlb_pending_list);
- snprintf(pool_name, sizeof(pool_name), "iotlb_cache_%d_%d",
- dev->vid, vq_index);
+ snprintf(pool_name, sizeof(pool_name), "iotlb_%d_%d_%d",
+ getpid(), dev->vid, vq_index);
+ VHOST_LOG_CONFIG(DEBUG, "IOTLB cache name: %s\n", pool_name);
/* If already created, free it and recreate */
vq->iotlb_pool = rte_mempool_lookup(pool_name);
--
2.17.0
[dpdk-dev] [PATCH v3] vhost: make iotlb cache name unique among multi processes
Currently, iotlb cache name is comprised of vid and virtqueue
index. For example, "iotlb_cache_0_0". Because vid is assigned
per process, iotlb cache name is not unique among multi processes.
For example a secondary process uses a vhost
(ex. eth_vhost0,iface=/tmp/sock0) and another secondary process
uses a vhost (ex. eth_vhost1,iface=/tmp/sock1), iotlb cache
name of both vhost ("iotlb_cache_0_0") are same and as a result
iotlb cache is broken.
This patch makes iotlb cache name unique among milti processes
by adding process id to the iotlb cache name.
The prefix of the name is shortend to "iotlb_" since the maximum
length of pool name is 25 bytes (RTE_MEMPOOL_NAMESIZE is 26).
Note that it is just 25 characters in maximum at the moment.
Here,
* pid_t == int: max 10 digits.
* vid < MAX_VHOST_DECICE(1024): max 4 digits.
* vq_index < VHOST_MAX_VRING(256): max 3 digits.
Fixes: d012d1f293f4 (vhost: add IOTLB helper functions)
Cc: sta...@dpdk.org
Signed-off-by: Itsuro Oda
---
v3:
* change format.
* fix commit message.
v2:
* use the process id to make the iotlb cache name unique.
lib/librte_vhost/iotlb.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index bc1758528..5b3a0c090 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -308,8 +308,9 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
TAILQ_INIT(&vq->iotlb_list);
TAILQ_INIT(&vq->iotlb_pending_list);
- snprintf(pool_name, sizeof(pool_name), "iotlb_cache_%d_%d",
- dev->vid, vq_index);
+ snprintf(pool_name, sizeof(pool_name), "iotlb_%u_%d_%d",
+ getpid(), dev->vid, vq_index);
+ VHOST_LOG_CONFIG(DEBUG, "IOTLB cache name: %s\n", pool_name);
/* If already created, free it and recreate */
vq->iotlb_pool = rte_mempool_lookup(pool_name);
--
2.17.0
