[dpdk-dev,RFC,V4] ixgbe: changes to support PCI Port Hotplug
diff mbox

Message ID 1433778458-17434-1-git-send-email-bernard.iremonger@intel.com
State Superseded, archived
Headers show

Commit Message

Iremonger, Bernard June 8, 2015, 3:47 p.m. UTC
This patch depends on the Port Hotplug Framework.
It implements the eth_dev_uninit functions for rte_ixgbe_pmd and
rte_ixgbevf_pmd.

Changes in V4:
Release rx and tx queues in dev_uninit() functions.
Replace TRUE and FALSE with 1 and 0.

Changes in V3:
Rebased to use drivers/net/ixgbe directory.

Changes in V2:
Added call to dev_close() in dev_uninit() functions.
Removed input parameter checks from dev_uninit() functions.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c |  107 ++++++++++++++++++++++++++++++++++++--
 drivers/net/ixgbe/ixgbe_ethdev.h |    2 +
 drivers/net/ixgbe/ixgbe_pf.c     |   22 ++++++++
 3 files changed, 126 insertions(+), 5 deletions(-)

Comments

Ananyev, Konstantin June 15, 2015, 10:31 p.m. UTC | #1
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Bernard Iremonger
> Sent: Monday, June 08, 2015 4:48 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [RFC PATCH V4] ixgbe: changes to support PCI Port Hotplug
> 
> This patch depends on the Port Hotplug Framework.
> It implements the eth_dev_uninit functions for rte_ixgbe_pmd and
> rte_ixgbevf_pmd.
> 
> Changes in V4:
> Release rx and tx queues in dev_uninit() functions.
> Replace TRUE and FALSE with 1 and 0.
> 
> Changes in V3:
> Rebased to use drivers/net/ixgbe directory.
> 
> Changes in V2:
> Added call to dev_close() in dev_uninit() functions.
> Removed input parameter checks from dev_uninit() functions.
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> ---
>  drivers/net/ixgbe/ixgbe_ethdev.c |  107 ++++++++++++++++++++++++++++++++++++--
>  drivers/net/ixgbe/ixgbe_ethdev.h |    2 +
>  drivers/net/ixgbe/ixgbe_pf.c     |   22 ++++++++
>  3 files changed, 126 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 0d9f9b2..7f9d286 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -117,6 +117,7 @@
>  #define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))
> 
>  static int eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev);
> +static int eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev);
>  static int  ixgbe_dev_configure(struct rte_eth_dev *dev);
>  static int  ixgbe_dev_start(struct rte_eth_dev *dev);
>  static void ixgbe_dev_stop(struct rte_eth_dev *dev);
> @@ -183,6 +184,7 @@ static void ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_conf
> 
>  /* For Virtual Function support */
>  static int eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev);
> +static int eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev);
>  static int  ixgbevf_dev_configure(struct rte_eth_dev *dev);
>  static int  ixgbevf_dev_start(struct rte_eth_dev *dev);
>  static void ixgbevf_dev_stop(struct rte_eth_dev *dev);
> @@ -916,6 +918,57 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev)
>  	return 0;
>  }
> 
> +static int
> +eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct rte_pci_device *pci_dev;
> +	struct ixgbe_hw *hw;
> +	unsigned i;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> +		return -EPERM;
> +
> +	hw = IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
> +	pci_dev = eth_dev->pci_dev;
> +
> +	if (hw->adapter_stopped == 0)
> +		ixgbe_dev_close(eth_dev);
> +
> +	eth_dev->dev_ops = NULL;
> +	eth_dev->rx_pkt_burst = NULL;
> +	eth_dev->tx_pkt_burst = NULL;
> +
> +	/* Unlock any pending hardware semaphore */
> +	ixgbe_swfw_lock_reset(hw);
> +
> +	/* disable uio intr before callback unregister */
> +	rte_intr_disable(&(pci_dev->intr_handle));
> +	rte_intr_callback_unregister(&(pci_dev->intr_handle),
> +		ixgbe_dev_interrupt_handler, (void *)eth_dev);
> +
> +	/* uninitialize PF if max_vfs not zero */
> +	ixgbe_pf_host_uninit(eth_dev);
> +
> +	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
> +		ixgbe_dev_rx_queue_release(eth_dev->data->rx_queues[i]);
> +		eth_dev->data->rx_queues[i] = NULL;
> +	}
> +
> +	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
> +		ixgbe_dev_tx_queue_release(eth_dev->data->tx_queues[i]);
> +		eth_dev->data->tx_queues[i] = NULL;
> +	}
> +
> +	rte_free(eth_dev->data->mac_addrs);
> +	eth_dev->data->mac_addrs = NULL;
> +
> +	rte_free(eth_dev->data->hash_mac_addrs);
> +	eth_dev->data->hash_mac_addrs = NULL;
> +
> +	return 0;
> +}
> 
>  /*
>   * Negotiate mailbox API version with the PF.
> @@ -1086,13 +1139,56 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
>  	return 0;
>  }
> 
> +/* Virtual Function device uninit */
> +
> +static int
> +eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct ixgbe_hw *hw;
> +	unsigned i;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> +		return -EPERM;
> +
> +	hw = IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
> +
> +	if (hw->adapter_stopped == 0)
> +		ixgbevf_dev_close(eth_dev);
> +
> +	eth_dev->dev_ops = NULL;
> +	eth_dev->rx_pkt_burst = NULL;
> +	eth_dev->tx_pkt_burst = NULL;
> +
> +	/* Disable the interrupts for VF */
> +	ixgbevf_intr_disable(hw);
> +
> +	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
> +		ixgbe_dev_rx_queue_release(eth_dev->data->rx_queues[i]);
> +		eth_dev->data->rx_queues[i] = NULL;
> +	}
> +
> +	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
> +		ixgbe_dev_tx_queue_release(eth_dev->data->tx_queues[i]);
> +		eth_dev->data->tx_queues[i] = NULL;
> +	}
> +
> +	rte_free(eth_dev->data->mac_addrs);
> +	eth_dev->data->mac_addrs = NULL;
> +
> +	return 0;
> +}
> +
>  static struct eth_driver rte_ixgbe_pmd = {
>  	{
>  		.name = "rte_ixgbe_pmd",
>  		.id_table = pci_id_ixgbe_map,
> -		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
> +		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
> +			RTE_PCI_DRV_DETACHABLE,
>  	},
>  	.eth_dev_init = eth_ixgbe_dev_init,
> +	.eth_dev_uninit = eth_ixgbe_dev_uninit,
>  	.dev_private_size = sizeof(struct ixgbe_adapter),
>  };
> 
> @@ -1103,9 +1199,10 @@ static struct eth_driver rte_ixgbevf_pmd = {
>  	{
>  		.name = "rte_ixgbevf_pmd",
>  		.id_table = pci_id_ixgbevf_map,
> -		.drv_flags = RTE_PCI_DRV_NEED_MAPPING,
> +		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE,
>  	},
>  	.eth_dev_init = eth_ixgbevf_dev_init,
> +	.eth_dev_uninit = eth_ixgbevf_dev_uninit,
>  	.dev_private_size = sizeof(struct ixgbe_adapter),
>  };
> 
> @@ -1475,7 +1572,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
>  	}
> 
>  	/* stop adapter */
> -	hw->adapter_stopped = FALSE;
> +	hw->adapter_stopped = 0;
>  	ixgbe_stop_adapter(hw);
> 
>  	/* reinitialize adapter
> @@ -1628,7 +1725,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
> 
>  	/* reset the NIC */
>  	ixgbe_pf_reset_hw(hw);
> -	hw->adapter_stopped = FALSE;
> +	hw->adapter_stopped = 0;
> 
>  	/* stop adapter */
>  	ixgbe_stop_adapter(hw);
> @@ -3015,7 +3112,7 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
> 
>  	PMD_INIT_FUNC_TRACE();
> 
> -	hw->adapter_stopped = TRUE;
> +	hw->adapter_stopped = 1;
>  	ixgbe_stop_adapter(hw);
> 
>  	/*
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
> index 19237b8..710ee87 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.h
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.h
> @@ -389,6 +389,8 @@ void ixgbe_vlan_hw_strip_disable_all(struct rte_eth_dev *dev);
> 
>  void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev);
> 
> +void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev);
> +
>  void ixgbe_pf_mbx_process(struct rte_eth_dev *eth_dev);
> 
>  int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev);
> diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
> index caed137..fd1c4ca 100644
> --- a/drivers/net/ixgbe/ixgbe_pf.c
> +++ b/drivers/net/ixgbe/ixgbe_pf.c
> @@ -144,6 +144,28 @@ void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
>  	return;
>  }
> 
> +void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct ixgbe_vf_info **vfinfo;
> +	uint16_t vf_num;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	vfinfo = IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
> +
> +	RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).def_pool_q_idx = 0;
> +
> +	vf_num = dev_num_vf(eth_dev);
> +	if (vf_num == 0)
> +		return;
> +
> +	rte_free(*vfinfo);
> +	*vfinfo = NULL;
> +}
> +
>  int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
>  {
>  	uint32_t vtctl, fcrth;
> --

Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

> 1.7.4.1
Helin Zhang June 17, 2015, 6:11 a.m. UTC | #2
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Bernard Iremonger
> Sent: Monday, June 8, 2015 11:48 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [RFC PATCH V4] ixgbe: changes to support PCI Port Hotplug
> 
> This patch depends on the Port Hotplug Framework.
> It implements the eth_dev_uninit functions for rte_ixgbe_pmd and
> rte_ixgbevf_pmd.
> 
> Changes in V4:
> Release rx and tx queues in dev_uninit() functions.
> Replace TRUE and FALSE with 1 and 0.
> 
> Changes in V3:
> Rebased to use drivers/net/ixgbe directory.
> 
> Changes in V2:
> Added call to dev_close() in dev_uninit() functions.
> Removed input parameter checks from dev_uninit() functions.
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: Helin Zhang <helin.zhang@intel.com>

> ---
>  drivers/net/ixgbe/ixgbe_ethdev.c |  107
> ++++++++++++++++++++++++++++++++++++--
>  drivers/net/ixgbe/ixgbe_ethdev.h |    2 +
>  drivers/net/ixgbe/ixgbe_pf.c     |   22 ++++++++
>  3 files changed, 126 insertions(+), 5 deletions(-)
Michael Qiu June 24, 2015, 7:45 a.m. UTC | #3
On 6/9/2015 12:01 AM, Bernard Iremonger wrote:
> This patch depends on the Port Hotplug Framework.
> It implements the eth_dev_uninit functions for rte_ixgbe_pmd and
> rte_ixgbevf_pmd.
>
> Changes in V4:
> Release rx and tx queues in dev_uninit() functions.
> Replace TRUE and FALSE with 1 and 0.
>
> Changes in V3:
> Rebased to use drivers/net/ixgbe directory.
>
> Changes in V2:
> Added call to dev_close() in dev_uninit() functions.
> Removed input parameter checks from dev_uninit() functions.
>
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>

Acked-by: Michael Qiu <michael.qiu@intel.com>
> ---
>  drivers/net/ixgbe/ixgbe_ethdev.c |  107 ++++++++++++++++++++++++++++++++++++--
>  drivers/net/ixgbe/ixgbe_ethdev.h |    2 +
>  drivers/net/ixgbe/ixgbe_pf.c     |   22 ++++++++
>  3 files changed, 126 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 0d9f9b2..7f9d286 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -117,6 +117,7 @@
>  #define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))
>  
>  static int eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev);
> +static int eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev);
>  static int  ixgbe_dev_configure(struct rte_eth_dev *dev);
>  static int  ixgbe_dev_start(struct rte_eth_dev *dev);
>  static void ixgbe_dev_stop(struct rte_eth_dev *dev);
> @@ -183,6 +184,7 @@ static void ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_conf
>  
>  /* For Virtual Function support */
>  static int eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev);
> +static int eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev);
>  static int  ixgbevf_dev_configure(struct rte_eth_dev *dev);
>  static int  ixgbevf_dev_start(struct rte_eth_dev *dev);
>  static void ixgbevf_dev_stop(struct rte_eth_dev *dev);
> @@ -916,6 +918,57 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev)
>  	return 0;
>  }
>  
> +static int
> +eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct rte_pci_device *pci_dev;
> +	struct ixgbe_hw *hw;
> +	unsigned i;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> +		return -EPERM;
> +
> +	hw = IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
> +	pci_dev = eth_dev->pci_dev;
> +
> +	if (hw->adapter_stopped == 0)
> +		ixgbe_dev_close(eth_dev);
> +
> +	eth_dev->dev_ops = NULL;
> +	eth_dev->rx_pkt_burst = NULL;
> +	eth_dev->tx_pkt_burst = NULL;
> +
> +	/* Unlock any pending hardware semaphore */
> +	ixgbe_swfw_lock_reset(hw);
> +
> +	/* disable uio intr before callback unregister */
> +	rte_intr_disable(&(pci_dev->intr_handle));
> +	rte_intr_callback_unregister(&(pci_dev->intr_handle),
> +		ixgbe_dev_interrupt_handler, (void *)eth_dev);
> +
> +	/* uninitialize PF if max_vfs not zero */
> +	ixgbe_pf_host_uninit(eth_dev);
> +
> +	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
> +		ixgbe_dev_rx_queue_release(eth_dev->data->rx_queues[i]);
> +		eth_dev->data->rx_queues[i] = NULL;
> +	}
> +
> +	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
> +		ixgbe_dev_tx_queue_release(eth_dev->data->tx_queues[i]);
> +		eth_dev->data->tx_queues[i] = NULL;
> +	}
> +
> +	rte_free(eth_dev->data->mac_addrs);
> +	eth_dev->data->mac_addrs = NULL;
> +
> +	rte_free(eth_dev->data->hash_mac_addrs);
> +	eth_dev->data->hash_mac_addrs = NULL;
> +
> +	return 0;
> +}
>  
>  /*
>   * Negotiate mailbox API version with the PF.
> @@ -1086,13 +1139,56 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
>  	return 0;
>  }
>  
> +/* Virtual Function device uninit */
> +
> +static int
> +eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct ixgbe_hw *hw;
> +	unsigned i;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> +		return -EPERM;
> +
> +	hw = IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
> +
> +	if (hw->adapter_stopped == 0)
> +		ixgbevf_dev_close(eth_dev);
> +
> +	eth_dev->dev_ops = NULL;
> +	eth_dev->rx_pkt_burst = NULL;
> +	eth_dev->tx_pkt_burst = NULL;
> +
> +	/* Disable the interrupts for VF */
> +	ixgbevf_intr_disable(hw);
> +
> +	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
> +		ixgbe_dev_rx_queue_release(eth_dev->data->rx_queues[i]);
> +		eth_dev->data->rx_queues[i] = NULL;
> +	}
> +
> +	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
> +		ixgbe_dev_tx_queue_release(eth_dev->data->tx_queues[i]);
> +		eth_dev->data->tx_queues[i] = NULL;
> +	}
> +
> +	rte_free(eth_dev->data->mac_addrs);
> +	eth_dev->data->mac_addrs = NULL;
> +
> +	return 0;
> +}
> +
>  static struct eth_driver rte_ixgbe_pmd = {
>  	{
>  		.name = "rte_ixgbe_pmd",
>  		.id_table = pci_id_ixgbe_map,
> -		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
> +		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
> +			RTE_PCI_DRV_DETACHABLE,
>  	},
>  	.eth_dev_init = eth_ixgbe_dev_init,
> +	.eth_dev_uninit = eth_ixgbe_dev_uninit,
>  	.dev_private_size = sizeof(struct ixgbe_adapter),
>  };
>  
> @@ -1103,9 +1199,10 @@ static struct eth_driver rte_ixgbevf_pmd = {
>  	{
>  		.name = "rte_ixgbevf_pmd",
>  		.id_table = pci_id_ixgbevf_map,
> -		.drv_flags = RTE_PCI_DRV_NEED_MAPPING,
> +		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE,
>  	},
>  	.eth_dev_init = eth_ixgbevf_dev_init,
> +	.eth_dev_uninit = eth_ixgbevf_dev_uninit,
>  	.dev_private_size = sizeof(struct ixgbe_adapter),
>  };
>  
> @@ -1475,7 +1572,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
>  	}
>  
>  	/* stop adapter */
> -	hw->adapter_stopped = FALSE;
> +	hw->adapter_stopped = 0;
>  	ixgbe_stop_adapter(hw);
>  
>  	/* reinitialize adapter
> @@ -1628,7 +1725,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
>  
>  	/* reset the NIC */
>  	ixgbe_pf_reset_hw(hw);
> -	hw->adapter_stopped = FALSE;
> +	hw->adapter_stopped = 0;
>  
>  	/* stop adapter */
>  	ixgbe_stop_adapter(hw);
> @@ -3015,7 +3112,7 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
>  
>  	PMD_INIT_FUNC_TRACE();
>  
> -	hw->adapter_stopped = TRUE;
> +	hw->adapter_stopped = 1;
>  	ixgbe_stop_adapter(hw);
>  
>  	/*
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
> index 19237b8..710ee87 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.h
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.h
> @@ -389,6 +389,8 @@ void ixgbe_vlan_hw_strip_disable_all(struct rte_eth_dev *dev);
>  
>  void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev);
>  
> +void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev);
> +
>  void ixgbe_pf_mbx_process(struct rte_eth_dev *eth_dev);
>  
>  int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev);
> diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
> index caed137..fd1c4ca 100644
> --- a/drivers/net/ixgbe/ixgbe_pf.c
> +++ b/drivers/net/ixgbe/ixgbe_pf.c
> @@ -144,6 +144,28 @@ void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
>  	return;
>  }
>  
> +void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct ixgbe_vf_info **vfinfo;
> +	uint16_t vf_num;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	vfinfo = IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
> +
> +	RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).def_pool_q_idx = 0;
> +
> +	vf_num = dev_num_vf(eth_dev);
> +	if (vf_num == 0)
> +		return;
> +
> +	rte_free(*vfinfo);
> +	*vfinfo = NULL;
> +}
> +
>  int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
>  {
>  	uint32_t vtctl, fcrth;
Michael Qiu June 24, 2015, 7:46 a.m. UTC | #4
On 6/9/2015 12:01 AM, Bernard Iremonger wrote:
> This patch depends on the Port Hotplug Framework.
> It implements the eth_dev_uninit functions for rte_ixgbe_pmd and
> rte_ixgbevf_pmd.
>
> Changes in V4:
> Release rx and tx queues in dev_uninit() functions.
> Replace TRUE and FALSE with 1 and 0.
>
> Changes in V3:
> Rebased to use drivers/net/ixgbe directory.
>
> Changes in V2:
> Added call to dev_close() in dev_uninit() functions.
> Removed input parameter checks from dev_uninit() functions.
>
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>

Tested-by: Michael Qiu <michael.qiu@intel.com>
> ---
>  drivers/net/ixgbe/ixgbe_ethdev.c |  107 ++++++++++++++++++++++++++++++++++++--
>  drivers/net/ixgbe/ixgbe_ethdev.h |    2 +
>  drivers/net/ixgbe/ixgbe_pf.c     |   22 ++++++++
>  3 files changed, 126 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 0d9f9b2..7f9d286 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -117,6 +117,7 @@
>  #define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))
>  
>  static int eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev);
> +static int eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev);
>  static int  ixgbe_dev_configure(struct rte_eth_dev *dev);
>  static int  ixgbe_dev_start(struct rte_eth_dev *dev);
>  static void ixgbe_dev_stop(struct rte_eth_dev *dev);
> @@ -183,6 +184,7 @@ static void ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_conf
>  
>  /* For Virtual Function support */
>  static int eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev);
> +static int eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev);
>  static int  ixgbevf_dev_configure(struct rte_eth_dev *dev);
>  static int  ixgbevf_dev_start(struct rte_eth_dev *dev);
>  static void ixgbevf_dev_stop(struct rte_eth_dev *dev);
> @@ -916,6 +918,57 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev)
>  	return 0;
>  }
>  
> +static int
> +eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct rte_pci_device *pci_dev;
> +	struct ixgbe_hw *hw;
> +	unsigned i;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> +		return -EPERM;
> +
> +	hw = IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
> +	pci_dev = eth_dev->pci_dev;
> +
> +	if (hw->adapter_stopped == 0)
> +		ixgbe_dev_close(eth_dev);
> +
> +	eth_dev->dev_ops = NULL;
> +	eth_dev->rx_pkt_burst = NULL;
> +	eth_dev->tx_pkt_burst = NULL;
> +
> +	/* Unlock any pending hardware semaphore */
> +	ixgbe_swfw_lock_reset(hw);
> +
> +	/* disable uio intr before callback unregister */
> +	rte_intr_disable(&(pci_dev->intr_handle));
> +	rte_intr_callback_unregister(&(pci_dev->intr_handle),
> +		ixgbe_dev_interrupt_handler, (void *)eth_dev);
> +
> +	/* uninitialize PF if max_vfs not zero */
> +	ixgbe_pf_host_uninit(eth_dev);
> +
> +	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
> +		ixgbe_dev_rx_queue_release(eth_dev->data->rx_queues[i]);
> +		eth_dev->data->rx_queues[i] = NULL;
> +	}
> +
> +	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
> +		ixgbe_dev_tx_queue_release(eth_dev->data->tx_queues[i]);
> +		eth_dev->data->tx_queues[i] = NULL;
> +	}
> +
> +	rte_free(eth_dev->data->mac_addrs);
> +	eth_dev->data->mac_addrs = NULL;
> +
> +	rte_free(eth_dev->data->hash_mac_addrs);
> +	eth_dev->data->hash_mac_addrs = NULL;
> +
> +	return 0;
> +}
>  
>  /*
>   * Negotiate mailbox API version with the PF.
> @@ -1086,13 +1139,56 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
>  	return 0;
>  }
>  
> +/* Virtual Function device uninit */
> +
> +static int
> +eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct ixgbe_hw *hw;
> +	unsigned i;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> +		return -EPERM;
> +
> +	hw = IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
> +
> +	if (hw->adapter_stopped == 0)
> +		ixgbevf_dev_close(eth_dev);
> +
> +	eth_dev->dev_ops = NULL;
> +	eth_dev->rx_pkt_burst = NULL;
> +	eth_dev->tx_pkt_burst = NULL;
> +
> +	/* Disable the interrupts for VF */
> +	ixgbevf_intr_disable(hw);
> +
> +	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
> +		ixgbe_dev_rx_queue_release(eth_dev->data->rx_queues[i]);
> +		eth_dev->data->rx_queues[i] = NULL;
> +	}
> +
> +	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
> +		ixgbe_dev_tx_queue_release(eth_dev->data->tx_queues[i]);
> +		eth_dev->data->tx_queues[i] = NULL;
> +	}
> +
> +	rte_free(eth_dev->data->mac_addrs);
> +	eth_dev->data->mac_addrs = NULL;
> +
> +	return 0;
> +}
> +
>  static struct eth_driver rte_ixgbe_pmd = {
>  	{
>  		.name = "rte_ixgbe_pmd",
>  		.id_table = pci_id_ixgbe_map,
> -		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
> +		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
> +			RTE_PCI_DRV_DETACHABLE,
>  	},
>  	.eth_dev_init = eth_ixgbe_dev_init,
> +	.eth_dev_uninit = eth_ixgbe_dev_uninit,
>  	.dev_private_size = sizeof(struct ixgbe_adapter),
>  };
>  
> @@ -1103,9 +1199,10 @@ static struct eth_driver rte_ixgbevf_pmd = {
>  	{
>  		.name = "rte_ixgbevf_pmd",
>  		.id_table = pci_id_ixgbevf_map,
> -		.drv_flags = RTE_PCI_DRV_NEED_MAPPING,
> +		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE,
>  	},
>  	.eth_dev_init = eth_ixgbevf_dev_init,
> +	.eth_dev_uninit = eth_ixgbevf_dev_uninit,
>  	.dev_private_size = sizeof(struct ixgbe_adapter),
>  };
>  
> @@ -1475,7 +1572,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
>  	}
>  
>  	/* stop adapter */
> -	hw->adapter_stopped = FALSE;
> +	hw->adapter_stopped = 0;
>  	ixgbe_stop_adapter(hw);
>  
>  	/* reinitialize adapter
> @@ -1628,7 +1725,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
>  
>  	/* reset the NIC */
>  	ixgbe_pf_reset_hw(hw);
> -	hw->adapter_stopped = FALSE;
> +	hw->adapter_stopped = 0;
>  
>  	/* stop adapter */
>  	ixgbe_stop_adapter(hw);
> @@ -3015,7 +3112,7 @@ ixgbevf_dev_stop(struct rte_eth_dev *dev)
>  
>  	PMD_INIT_FUNC_TRACE();
>  
> -	hw->adapter_stopped = TRUE;
> +	hw->adapter_stopped = 1;
>  	ixgbe_stop_adapter(hw);
>  
>  	/*
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
> index 19237b8..710ee87 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.h
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.h
> @@ -389,6 +389,8 @@ void ixgbe_vlan_hw_strip_disable_all(struct rte_eth_dev *dev);
>  
>  void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev);
>  
> +void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev);
> +
>  void ixgbe_pf_mbx_process(struct rte_eth_dev *eth_dev);
>  
>  int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev);
> diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
> index caed137..fd1c4ca 100644
> --- a/drivers/net/ixgbe/ixgbe_pf.c
> +++ b/drivers/net/ixgbe/ixgbe_pf.c
> @@ -144,6 +144,28 @@ void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
>  	return;
>  }
>  
> +void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)
> +{
> +	struct ixgbe_vf_info **vfinfo;
> +	uint16_t vf_num;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	vfinfo = IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
> +
> +	RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx = 0;
> +	RTE_ETH_DEV_SRIOV(eth_dev).def_pool_q_idx = 0;
> +
> +	vf_num = dev_num_vf(eth_dev);
> +	if (vf_num == 0)
> +		return;
> +
> +	rte_free(*vfinfo);
> +	*vfinfo = NULL;
> +}
> +
>  int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
>  {
>  	uint32_t vtctl, fcrth;

Patch
diff mbox

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 0d9f9b2..7f9d286 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -117,6 +117,7 @@ 
 #define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0]))
 
 static int eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev);
+static int eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev);
 static int  ixgbe_dev_configure(struct rte_eth_dev *dev);
 static int  ixgbe_dev_start(struct rte_eth_dev *dev);
 static void ixgbe_dev_stop(struct rte_eth_dev *dev);
@@ -183,6 +184,7 @@  static void ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_conf
 
 /* For Virtual Function support */
 static int eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev);
+static int eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev);
 static int  ixgbevf_dev_configure(struct rte_eth_dev *dev);
 static int  ixgbevf_dev_start(struct rte_eth_dev *dev);
 static void ixgbevf_dev_stop(struct rte_eth_dev *dev);
@@ -916,6 +918,57 @@  eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
+static int
+eth_ixgbe_dev_uninit(struct rte_eth_dev *eth_dev)
+{
+	struct rte_pci_device *pci_dev;
+	struct ixgbe_hw *hw;
+	unsigned i;
+
+	PMD_INIT_FUNC_TRACE();
+
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return -EPERM;
+
+	hw = IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+	pci_dev = eth_dev->pci_dev;
+
+	if (hw->adapter_stopped == 0)
+		ixgbe_dev_close(eth_dev);
+
+	eth_dev->dev_ops = NULL;
+	eth_dev->rx_pkt_burst = NULL;
+	eth_dev->tx_pkt_burst = NULL;
+
+	/* Unlock any pending hardware semaphore */
+	ixgbe_swfw_lock_reset(hw);
+
+	/* disable uio intr before callback unregister */
+	rte_intr_disable(&(pci_dev->intr_handle));
+	rte_intr_callback_unregister(&(pci_dev->intr_handle),
+		ixgbe_dev_interrupt_handler, (void *)eth_dev);
+
+	/* uninitialize PF if max_vfs not zero */
+	ixgbe_pf_host_uninit(eth_dev);
+
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+		ixgbe_dev_rx_queue_release(eth_dev->data->rx_queues[i]);
+		eth_dev->data->rx_queues[i] = NULL;
+	}
+
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
+		ixgbe_dev_tx_queue_release(eth_dev->data->tx_queues[i]);
+		eth_dev->data->tx_queues[i] = NULL;
+	}
+
+	rte_free(eth_dev->data->mac_addrs);
+	eth_dev->data->mac_addrs = NULL;
+
+	rte_free(eth_dev->data->hash_mac_addrs);
+	eth_dev->data->hash_mac_addrs = NULL;
+
+	return 0;
+}
 
 /*
  * Negotiate mailbox API version with the PF.
@@ -1086,13 +1139,56 @@  eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
+/* Virtual Function device uninit */
+
+static int
+eth_ixgbevf_dev_uninit(struct rte_eth_dev *eth_dev)
+{
+	struct ixgbe_hw *hw;
+	unsigned i;
+
+	PMD_INIT_FUNC_TRACE();
+
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return -EPERM;
+
+	hw = IXGBE_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+
+	if (hw->adapter_stopped == 0)
+		ixgbevf_dev_close(eth_dev);
+
+	eth_dev->dev_ops = NULL;
+	eth_dev->rx_pkt_burst = NULL;
+	eth_dev->tx_pkt_burst = NULL;
+
+	/* Disable the interrupts for VF */
+	ixgbevf_intr_disable(hw);
+
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+		ixgbe_dev_rx_queue_release(eth_dev->data->rx_queues[i]);
+		eth_dev->data->rx_queues[i] = NULL;
+	}
+
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
+		ixgbe_dev_tx_queue_release(eth_dev->data->tx_queues[i]);
+		eth_dev->data->tx_queues[i] = NULL;
+	}
+
+	rte_free(eth_dev->data->mac_addrs);
+	eth_dev->data->mac_addrs = NULL;
+
+	return 0;
+}
+
 static struct eth_driver rte_ixgbe_pmd = {
 	{
 		.name = "rte_ixgbe_pmd",
 		.id_table = pci_id_ixgbe_map,
-		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
+			RTE_PCI_DRV_DETACHABLE,
 	},
 	.eth_dev_init = eth_ixgbe_dev_init,
+	.eth_dev_uninit = eth_ixgbe_dev_uninit,
 	.dev_private_size = sizeof(struct ixgbe_adapter),
 };
 
@@ -1103,9 +1199,10 @@  static struct eth_driver rte_ixgbevf_pmd = {
 	{
 		.name = "rte_ixgbevf_pmd",
 		.id_table = pci_id_ixgbevf_map,
-		.drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+		.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE,
 	},
 	.eth_dev_init = eth_ixgbevf_dev_init,
+	.eth_dev_uninit = eth_ixgbevf_dev_uninit,
 	.dev_private_size = sizeof(struct ixgbe_adapter),
 };
 
@@ -1475,7 +1572,7 @@  ixgbe_dev_start(struct rte_eth_dev *dev)
 	}
 
 	/* stop adapter */
-	hw->adapter_stopped = FALSE;
+	hw->adapter_stopped = 0;
 	ixgbe_stop_adapter(hw);
 
 	/* reinitialize adapter
@@ -1628,7 +1725,7 @@  ixgbe_dev_stop(struct rte_eth_dev *dev)
 
 	/* reset the NIC */
 	ixgbe_pf_reset_hw(hw);
-	hw->adapter_stopped = FALSE;
+	hw->adapter_stopped = 0;
 
 	/* stop adapter */
 	ixgbe_stop_adapter(hw);
@@ -3015,7 +3112,7 @@  ixgbevf_dev_stop(struct rte_eth_dev *dev)
 
 	PMD_INIT_FUNC_TRACE();
 
-	hw->adapter_stopped = TRUE;
+	hw->adapter_stopped = 1;
 	ixgbe_stop_adapter(hw);
 
 	/*
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
index 19237b8..710ee87 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.h
+++ b/drivers/net/ixgbe/ixgbe_ethdev.h
@@ -389,6 +389,8 @@  void ixgbe_vlan_hw_strip_disable_all(struct rte_eth_dev *dev);
 
 void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev);
 
+void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev);
+
 void ixgbe_pf_mbx_process(struct rte_eth_dev *eth_dev);
 
 int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev);
diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index caed137..fd1c4ca 100644
--- a/drivers/net/ixgbe/ixgbe_pf.c
+++ b/drivers/net/ixgbe/ixgbe_pf.c
@@ -144,6 +144,28 @@  void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev)
 	return;
 }
 
+void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)
+{
+	struct ixgbe_vf_info **vfinfo;
+	uint16_t vf_num;
+
+	PMD_INIT_FUNC_TRACE();
+
+	vfinfo = IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
+
+	RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
+	RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = 0;
+	RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx = 0;
+	RTE_ETH_DEV_SRIOV(eth_dev).def_pool_q_idx = 0;
+
+	vf_num = dev_num_vf(eth_dev);
+	if (vf_num == 0)
+		return;
+
+	rte_free(*vfinfo);
+	*vfinfo = NULL;
+}
+
 int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev)
 {
 	uint32_t vtctl, fcrth;