[dpdk-stable] patch 'net/vhost: fix unix socket not removed as closing' has been queued to stable release 16.11.1
Yuanhan Liu
yuanhan.liu at linux.intel.com
Wed Feb 15 08:28:09 CET 2017
On Wed, Feb 15, 2017 at 07:22:27AM +0000, Tan, Jianfeng wrote:
> Will below commit be back ported?
> aed0b12930b3 ("net/vhost: fix socket file deleted on stop")
It was already on the 16.11 branch in the last pick stage.
--yliu
>
> If yes, I agree.
>
> Thanks,
> Jianfeng
>
> > -----Original Message-----
> > From: Yuanhan Liu [mailto:yuanhan.liu at linux.intel.com]
> > Sent: Wednesday, February 15, 2017 2:27 PM
> > To: Tan, Jianfeng
> > Cc: Yuanhan Liu; Yao, Lei A; dpdk stable
> > Subject: patch 'net/vhost: fix unix socket not removed as closing' has been
> > queued to stable release 16.11.1
> >
> > Hi,
> >
> > FYI, your patch has been queued to stable release 16.11.1
> >
> > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable
> > yet. It will be pushed if I get no objections before 02/18/17.
> > So please shout if anyone has objections.
> >
> > Thanks.
> >
> > --yliu
> >
> > ---
> > From 67c33ab2c2798925c8e96f29434011d9a8ea25bc Mon Sep 17 00:00:00
> > 2001
> > From: Jianfeng Tan <jianfeng.tan at intel.com>
> > Date: Tue, 24 Jan 2017 08:37:38 +0000
> > Subject: [PATCH] net/vhost: fix unix socket not removed as closing
> >
> > [ upstream commit 954820dc7d9eeef76274adcc55d5b9ca4f425ec2 ]
> >
> > The commit aed0b12930b3 ("net/vhost: fix socket file deleted on stop")
> > moves rte_vhost_driver_register and rte_vhost_driver_unregister from
> > dev_start() and dev_stop() into driver's probe() and remove().
> >
> > Apps, like testpmd, using vhost pmd in server mode, usually calls
> > dev_stop() and dev_close() as quitting, instead of driver-specific
> > remove(). Then those unix socket files have no chance to get removed.
> >
> > Semantically, device-specific things should be put into device-specific
> > APIs. Fix this issue by moving rte_vhost_driver_unregister, plus other
> > structure free into dev_close().
> >
> > Fixes: aed0b12930b3 ("net/vhost: fix socket file deleted on stop")
> >
> > Reported-by: Lei Yao <lei.a.yao at intel.com>
> > Signed-off-by: Jianfeng Tan <jianfeng.tan at intel.com>
> > Acked-by: Yuanhan Liu <yuanhan.liu at linux.intel.com>
> > ---
> > drivers/net/vhost/rte_eth_vhost.c | 48 +++++++++++++++++++++++-------
> > ---------
> > 1 file changed, 28 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/net/vhost/rte_eth_vhost.c
> > b/drivers/net/vhost/rte_eth_vhost.c
> > index e715c31..328dde0 100644
> > --- a/drivers/net/vhost/rte_eth_vhost.c
> > +++ b/drivers/net/vhost/rte_eth_vhost.c
> > @@ -783,6 +783,32 @@ eth_dev_stop(struct rte_eth_dev *dev
> > __rte_unused)
> > {
> > }
> >
> > +static void
> > +eth_dev_close(struct rte_eth_dev *dev)
> > +{
> > + struct pmd_internal *internal;
> > + struct internal_list *list;
> > +
> > + internal = dev->data->dev_private;
> > + if (!internal)
> > + return;
> > +
> > + 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);
> > +
> > + free(internal->dev_name);
> > + free(internal->iface_name);
> > + rte_free(internal);
> > +}
> > +
> > static int
> > eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
> > uint16_t nb_rx_desc __rte_unused,
> > @@ -951,6 +977,7 @@ rte_eth_vhost_feature_get(void)
> > static const struct eth_dev_ops ops = {
> > .dev_start = eth_dev_start,
> > .dev_stop = eth_dev_stop,
> > + .dev_close = eth_dev_close,
> > .dev_configure = eth_dev_configure,
> > .dev_infos_get = eth_dev_info,
> > .rx_queue_setup = eth_rx_queue_setup,
> > @@ -1178,8 +1205,6 @@ static int
> > rte_pmd_vhost_remove(const char *name)
> > {
> > struct rte_eth_dev *eth_dev = NULL;
> > - struct pmd_internal *internal;
> > - struct internal_list *list;
> > unsigned int i;
> >
> > RTE_LOG(INFO, PMD, "Un-Initializing pmd_vhost for %s\n", name);
> > @@ -1189,22 +1214,9 @@ rte_pmd_vhost_remove(const char *name)
> > if (eth_dev == NULL)
> > return -ENODEV;
> >
> > - internal = eth_dev->data->dev_private;
> > - if (internal == NULL)
> > - return -ENODEV;
> > -
> > - list = find_internal_resource(internal->iface_name);
> > - if (list == NULL)
> > - return -ENODEV;
> > -
> > - pthread_mutex_lock(&internal_list_lock);
> > - TAILQ_REMOVE(&internal_list, list, next);
> > - pthread_mutex_unlock(&internal_list_lock);
> > - rte_free(list);
> > -
> > eth_dev_stop(eth_dev);
> >
> > - rte_vhost_driver_unregister(internal->iface_name);
> > + eth_dev_close(eth_dev);
> >
> > if (rte_atomic16_sub_return(&nb_started_ports, 1) == 0)
> > vhost_driver_session_stop();
> > @@ -1212,9 +1224,6 @@ rte_pmd_vhost_remove(const char *name)
> > rte_free(vring_states[eth_dev->data->port_id]);
> > vring_states[eth_dev->data->port_id] = NULL;
> >
> > - free(internal->dev_name);
> > - free(internal->iface_name);
> > -
> > for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
> > rte_free(eth_dev->data->rx_queues[i]);
> > for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
> > @@ -1222,7 +1231,6 @@ rte_pmd_vhost_remove(const char *name)
> >
> > rte_free(eth_dev->data->mac_addrs);
> > rte_free(eth_dev->data);
> > - rte_free(internal);
> >
> > rte_eth_dev_release_port(eth_dev);
> >
> > --
> > 1.9.0
More information about the stable
mailing list