ethdev: remove forcing stopped state upon close

When closing a port, it is supposed to be already stopped,
and marked as such with "dev_started" state zeroed by the stop API.

Resetting "dev_started" before calling the driver close operation
was hiding the case of not properly stopped port being closed.
The flag "dev_started" is not changed anymore in "rte_eth_dev_close()".

In case the "dev_stop" function is called from "dev_close",
bypassing "rte_eth_dev_stop()" API,
the "dev_started" state must be explicitly reset in the PMD
in order to keep the same behaviour.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index e3b1347..f135558 100644 (file)
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -595,6 +595,7 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)
        if (ark->started == 0)
                return;
        ark->started = 0;
+       dev->data->dev_started = 0;
 
        /* Stop the extension first */
        if (ark->user_ext.dev_stop)

diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c
index 2217511..f2e48e1 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -609,6 +609,7 @@ atl_dev_stop(struct rte_eth_dev *dev)
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
 
        /* disable interrupts */
        atl_disable_intr(hw);

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index af47c19..952e8f7 100644 (file)
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -420,6 +420,7 @@ static void dpaa_eth_dev_stop(struct rte_eth_dev *dev)
        struct fman_if *fif = dev->process_private;
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
 
        if (!fif->is_shared_mac)
                fman_if_disable_rx(fif);

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index d050eb4..dd9238a 100644 (file)
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -717,6 +717,8 @@ eth_em_stop(struct rte_eth_dev *dev)
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
+       dev->data->dev_started = 0;
+
        eth_em_rxtx_control(dev, false);
        em_rxq_intr_disable(hw);
        em_lsc_intr_disable(hw);

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index cb3d97e..f697b0e 100644 (file)
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -1497,6 +1497,7 @@ eth_igb_stop(struct rte_eth_dev *dev)
        }
 
        adapter->stopped = true;
+       dev->data->dev_started = 0;
 }
 
 static int
@@ -3374,6 +3375,7 @@ igbvf_dev_stop(struct rte_eth_dev *dev)
        }
 
        adapter->stopped = true;
+       dev->data->dev_started = 0;
 }
 
 static int

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index d32fa43..e02d340 100644 (file)
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -1118,6 +1118,7 @@ static void ena_stop(struct rte_eth_dev *dev)
 
        ++adapter->dev_stats.dev_stop;
        adapter->state = ENA_ADAPTER_STATE_STOPPED;
+       dev->data->dev_started = 0;
 }
 
 static int ena_create_io_queue(struct ena_ring *ring)

diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c
index b3dec7e..dddbc89 100644 (file)
--- a/drivers/net/enetc/enetc_ethdev.c
+++ b/drivers/net/enetc/enetc_ethdev.c
@@ -54,6 +54,7 @@ enetc_dev_stop(struct rte_eth_dev *dev)
        uint32_t val;
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
        /* Disable port */
        val = enetc_port_rd(enetc_hw, ENETC_PMR);
        enetc_port_wr(enetc_hw, ENETC_PMR, val & (~ENETC_PMR_EN));

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index c4a6fdf..0c13fd5 100644 (file)
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -1161,6 +1161,7 @@ fm10k_dev_stop(struct rte_eth_dev *dev)
        int i;
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
 
        if (dev->data->tx_queues)
                for (i = 0; i < dev->data->nb_tx_queues; i++)

diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index 466c836..daf8f33 100644 (file)
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -1189,6 +1189,8 @@ static void hinic_dev_stop(struct rte_eth_dev *dev)
        name = dev->data->name;
        port_id = dev->data->port_id;
 
+       dev->data->dev_started = 0;
+
        if (!rte_bit_relaxed_test_and_clear32(HINIC_DEV_START,
                                              &nic_dev->dev_status)) {
                PMD_DRV_LOG(INFO, "Device %s already stopped", name);

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index ce5bae5..8fcc0f1 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4997,6 +4997,7 @@ hns3_dev_stop(struct rte_eth_dev *dev)
        struct hns3_hw *hw = &hns->hw;
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
 
        hw->adapter_state = HNS3_NIC_STOPPING;
        hns3_set_rxtx_function(dev);

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 1a19c0e..b203839 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1952,6 +1952,7 @@ hns3vf_dev_stop(struct rte_eth_dev *dev)
        struct hns3_hw *hw = &hns->hw;
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
 
        hw->adapter_state = HNS3_NIC_STOPPING;
        hns3_set_rxtx_function(dev);

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 943cfe7..825de51 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2599,6 +2599,7 @@ i40e_dev_stop(struct rte_eth_dev *dev)
        pf->tm_conf.committed = false;
 
        hw->adapter_stopped = 1;
+       dev->data->dev_started = 0;
 
        pf->adapter->rss_reta_updated = 0;
 }

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 4d6510d..40c9745 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -2207,7 +2207,7 @@ i40evf_dev_stop(struct rte_eth_dev *dev)
        i40evf_add_del_mc_addr_list(dev, vf->mc_addrs, vf->mc_addrs_num,
                                FALSE);
        hw->adapter_stopped = 1;
-
+       dev->data->dev_started = 0;
 }
 
 static int

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index f5e6e85..8bd2c04 100644 (file)
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -562,6 +562,7 @@ iavf_dev_stop(struct rte_eth_dev *dev)
                                  false);
 
        adapter->stopped = 1;
+       dev->data->dev_started = 0;
 }
 
 static int

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 0056da7..468a6d7 100644 (file)
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2369,6 +2369,7 @@ ice_dev_stop(struct rte_eth_dev *dev)
        }
 
        pf->adapter_stopped = true;
+       dev->data->dev_started = 0;
 }
 
 static int

diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
index 7f5066d..73b7d20 100644 (file)
--- a/drivers/net/igc/igc_ethdev.c
+++ b/drivers/net/igc/igc_ethdev.c
@@ -616,6 +616,7 @@ eth_igc_stop(struct rte_eth_dev *dev)
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        struct rte_eth_link link;
 
+       dev->data->dev_started = 0;
        adapter->stopped = 1;
 
        /* disable receive and transmit */

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 0b98e21..a45c596 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2917,6 +2917,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
        adapter->rss_reta_updated = 0;
 
        hw->adapter_stopped = true;
+       dev->data->dev_started = 0;
 }
 
 /*
@@ -5418,6 +5419,7 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
 
        ixgbevf_intr_disable(dev);
 
+       dev->data->dev_started = 0;
        hw->adapter_stopped = 1;
        ixgbe_stop_adapter(hw);
 

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index be747ad..329a550 100644 (file)
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -196,6 +196,7 @@ eth_kni_dev_stop(struct rte_eth_dev *dev)
        }
 
        dev->data->dev_link.link_status = 0;
+       dev->data->dev_started = 0;
 }
 
 static int

diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c
index 1a41f27..52bcefc 100644 (file)
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -1471,6 +1471,7 @@ lio_dev_stop(struct rte_eth_dev *eth_dev)
        struct lio_device *lio_dev = LIO_DEV(eth_dev);
 
        lio_dev_info(lio_dev, "Stopping port %d\n", eth_dev->data->port_id);
+       eth_dev->data->dev_started = 0;
        lio_dev->intf_open = 0;
        rte_mb();
 

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index 6077711..3c0332a 100644 (file)
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -413,6 +413,8 @@ mvneta_dev_stop(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
 
+       dev->data->dev_started = 0;
+
        if (!priv->ppio)
                return;
 

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index 5ae2d46..be3713d 100644 (file)
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -833,6 +833,7 @@ hn_dev_stop(struct rte_eth_dev *dev)
        struct hn_data *hv = dev->data->dev_private;
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
 
        hn_rndis_set_rxfilter(hv, 0);
        hn_vf_stop(dev);

diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c
index a9a8bc8..44e57ee 100644 (file)
--- a/drivers/net/nfb/nfb_ethdev.c
+++ b/drivers/net/nfb/nfb_ethdev.c
@@ -158,6 +158,8 @@ nfb_eth_dev_stop(struct rte_eth_dev *dev)
        uint16_t nb_rx = dev->data->nb_rx_queues;
        uint16_t nb_tx = dev->data->nb_tx_queues;
 
+       dev->data->dev_started = 0;
+
        for (i = 0; i < nb_tx; i++)
                nfb_eth_tx_queue_stop(dev, i);
 

diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c
index f0de1c8..c4dd0a5 100644 (file)
--- a/drivers/net/pfe/pfe_ethdev.c
+++ b/drivers/net/pfe/pfe_ethdev.c
@@ -378,6 +378,8 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
 {
        struct pfe_eth_priv_s *priv = dev->data->dev_private;
 
+       dev->data->dev_started = 0;
+
        gemac_disable(priv->EMAC_baseaddr);
        gpi_disable(priv->GPI_baseaddr);
 

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 548497f..88389c9 100644 (file)
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -1169,6 +1169,7 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)
        struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
 
        PMD_INIT_FUNC_TRACE(edev);
+       eth_dev->data->dev_started = 0;
 
        /* Bring the link down */
        qede_dev_set_link_state(eth_dev, false);

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 22c0802..48b658e 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -109,6 +109,7 @@ eth_dev_start(struct rte_eth_dev *dev)
 static void
 eth_dev_stop(struct rte_eth_dev *dev)
 {
+       dev->data->dev_started = 0;
        dev->data->dev_link.link_status = ETH_LINK_DOWN;
 }
 

diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c
index 0eecec1..c89ff16 100644 (file)
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -1020,6 +1020,8 @@ eth_dev_stop(struct rte_eth_dev *dev)
        uint16_t nb_rx = dev->data->nb_rx_queues;
        uint16_t nb_tx = dev->data->nb_tx_queues;
 
+       dev->data->dev_started = 0;
+
        for (i = 0; i < nb_tx; i++)
                eth_tx_queue_stop(dev, i);
 

diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c
index cc6eb4b..b87e1e5 100644 (file)
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -1766,6 +1766,7 @@ nicvf_dev_stop_cleanup(struct rte_eth_dev *dev, bool cleanup)
        struct nicvf *nic = nicvf_pmd_priv(dev);
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
 
        /* Teardown secondary vf first */
        for (i = 0; i < nic->sqs_count; i++) {

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index 66efecb..5328cfc 100644 (file)
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1158,6 +1158,7 @@ eth_dev_stop(struct rte_eth_dev *dev)
 {
        struct pmd_internal *internal = dev->data->dev_private;
 
+       dev->data->dev_started = 0;
        rte_atomic32_set(&internal->started, 0);
        update_queuing_status(dev);
 }

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 65eefa2..aa8de55 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -2523,6 +2523,7 @@ virtio_dev_stop(struct rte_eth_dev *dev)
        struct rte_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf;
 
        PMD_INIT_LOG(DEBUG, "stop");
+       dev->data->dev_started = 0;
 
        rte_spinlock_lock(&hw->state_lock);
        if (!hw->started)

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index fa950e1..828043a 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -858,6 +858,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
        rte_eth_linkstatus_set(dev, &link);
 
        hw->adapter_stopped = 1;
+       dev->data->dev_started = 0;
 }
 
 static void

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 38f249a..fe63965 100644 (file)
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -1772,7 +1772,6 @@ rte_eth_dev_close(uint16_t port_id)
        dev = &rte_eth_devices[port_id];
 
        RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_close);
-       dev->data->dev_started = 0;
        (*dev->dev_ops->dev_close)(dev);
 
        rte_ethdev_trace_close(port_id);