Tested-by: Pavel Fedin <p.fedin at samsung.com> Kind regards, Pavel Fedin Expert Engineer Samsung Electronics Research center Russia
> -----Original Message----- > From: Jianfeng Tan [mailto:jianfeng.tan at intel.com] > Sent: Monday, January 11, 2016 9:16 AM > To: dev at dpdk.org > Cc: p.fedin at samsung.com; yuanhan.liu at linux.intel.com; Jianfeng Tan > Subject: [PATCH v2] pmd/virtio: fix cannot start virtio dev after stop > > v2 changes: > - Address compiling error. > - Add Reported-by. > > Fix the issue that virtio device cannot be started after stopped. > > The field, hw->started, should be changed by virtio_dev_start/stop instead > of virtio_dev_close. > > Reported-by: Pavel Fedin <p.fedin at samsung.com> > Signed-off-by: Jianfeng Tan <jianfeng.tan at intel.com> > Acked-by: Yuanhan Liu <yuanhan.liu at linux.intel.com> > > --- > drivers/net/virtio/virtio_ethdev.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/virtio/virtio_ethdev.c > b/drivers/net/virtio/virtio_ethdev.c > index d928339..5bdd305 100644 > --- a/drivers/net/virtio/virtio_ethdev.c > +++ b/drivers/net/virtio/virtio_ethdev.c > @@ -490,11 +490,13 @@ virtio_dev_close(struct rte_eth_dev *dev) > > PMD_INIT_LOG(DEBUG, "virtio_dev_close"); > > + if (hw->started == 1) > + virtio_dev_stop(dev); > + > /* reset the NIC */ > if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC) > vtpci_irq_config(hw, VIRTIO_MSI_NO_VECTOR); > vtpci_reset(hw); > - hw->started = 0; > virtio_dev_free_mbufs(dev); > virtio_free_queues(dev); > } > @@ -1408,10 +1410,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) > if (rte_eal_process_type() == RTE_PROC_SECONDARY) > return -EPERM; > > - if (hw->started == 1) { > - virtio_dev_stop(eth_dev); > - virtio_dev_close(eth_dev); > - } > + /* Close it anyway since there's no way to know if closed */ > + virtio_dev_close(eth_dev); > + > pci_dev = eth_dev->pci_dev; > > eth_dev->dev_ops = NULL; > @@ -1612,9 +1613,12 @@ static void > virtio_dev_stop(struct rte_eth_dev *dev) > { > struct rte_eth_link link; > + struct virtio_hw *hw = dev->data->dev_private; > > PMD_INIT_LOG(DEBUG, "stop"); > > + hw->started = 0; > + > if (dev->data->dev_conf.intr_conf.lsc) > rte_intr_disable(&dev->pci_dev->intr_handle); > > -- > 2.1.4
