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

net/vhost: fix socket file deleted on stop

Browse Source 
If you create a vhost server device, it doesn't create the actual datagram
socket until you call .dev_start().  If you call .dev_stop() is also
deletes those sockets.  For QEMU clients, this is a problem since QEMU
doesn't know how to re-attach to datagram sockets that have gone away.

To fix this, register and unregister the datagram sockets during device
creation and removal.

Fixes: ee584e9710 ("vhost: add driver on top of the library")
Cc: stable@dpdk.org

Signed-off-by: Chas Williams <ciwillia@brocade.com>
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
This commit is contained in:
Chas Williams 2017-01-03 11:22:42 -05:00 committed by Yuanhan Liu
parent 5731d6acc7
commit aed0b12930
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/net/vhost/rte_eth_vhost.c
View File

@ -115,9 +115,6 @@ struct pmd_internal {
char *dev_name;
char *iface_name;
uint16_t max_queues;
uint64_t flags;
volatile uint16_t once;
};
struct internal_list {
@ -776,35 +773,14 @@ vhost_driver_session_stop(void)
}
static int
eth_dev_start(struct rte_eth_dev *dev)
eth_dev_start(struct rte_eth_dev *dev __rte_unused)
{
struct pmd_internal *internal = dev->data->dev_private;
int ret = 0;
if (rte_atomic16_cmpset(&internal->once, 0, 1)) {
ret = rte_vhost_driver_register(internal->iface_name,
internal->flags);
if (ret)
return ret;
}
/* We need only one message handling thread */
if (rte_atomic16_add_return(&nb_started_ports, 1) == 1)
ret = vhost_driver_session_start();
return ret;
return 0;
}
static void
eth_dev_stop(struct rte_eth_dev *dev)
eth_dev_stop(struct rte_eth_dev *dev __rte_unused)
{
struct pmd_internal *internal = dev->data->dev_private;
if (rte_atomic16_cmpset(&internal->once, 1, 0))
rte_vhost_driver_unregister(internal->iface_name);
if (rte_atomic16_sub_return(&nb_started_ports, 1) == 0)
vhost_driver_session_stop();
}
static int
@ -1046,7 +1022,6 @@ eth_dev_vhost_create(const char *name, char *iface_name, int16_t queues,
internal->iface_name = strdup(iface_name);
if (internal->iface_name == NULL)
goto error;
internal->flags = flags;
list->eth_dev = eth_dev;
pthread_mutex_lock(&internal_list_lock);
@ -1081,6 +1056,15 @@ eth_dev_vhost_create(const char *name, char *iface_name, int16_t queues,
eth_dev->rx_pkt_burst = eth_vhost_rx;
eth_dev->tx_pkt_burst = eth_vhost_tx;
if (rte_vhost_driver_register(iface_name, flags))
goto error;
/* We need only one message handling thread */
if (rte_atomic16_add_return(&nb_started_ports, 1) == 1) {
if (vhost_driver_session_start())
goto error;
}
return data->port_id;
error:
@ -1218,6 +1202,11 @@ rte_pmd_vhost_remove(const char *name)
eth_dev_stop(eth_dev);
rte_vhost_driver_unregister(internal->iface_name);
if (rte_atomic16_sub_return(&nb_started_ports, 1) == 0)
vhost_driver_session_stop();
rte_free(vring_states[eth_dev->data->port_id]);
vring_states[eth_dev->data->port_id] = NULL;