[dpdk-stable] [PATCH 18.08] net/vmxnet3: fix hot-unplug

[Kevin Traynor]

On 11/23/2018 02:06 PM, Luca Boccassi wrote:
> [ backported from upstream commit 6c99085d972b5f0fddf9f986ea8907ed5dafd086 ]
> 

Thanks, build fixed now

> The vmxnet3 driver can't call back into dev_close(), and possibly
> dev_stop(), in dev_uninit().  When dev_uninit() is called, anything
> that those routines would want to clean up has already been released.
> Further, for complete cleanup, it is necessary to release any of the
> queue resources during dev_close().
> This allows a vmxnet3 device to be hot-unplugged without leaking
> queues.
> Also set RTE_ETH_DEV_CLOSE_REMOVE on close so that the port resources
> can be deallocated.
> Return EBUSY if remove is called before stop.
> 
> Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Brian Russell <brussell at brocade.com>
> Signed-off-by: Luca Boccassi <bluca at debian.org>
> ---
> Removed setting RTE_ETH_DEV_CLOSE_REMOVE which was added in 18.11.
> 
>  drivers/net/vmxnet3/vmxnet3_ethdev.c | 37 ++++++++++++++++++++++------
>  1 file changed, 30 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
> index 2613cd135..610b8c8ea 100644
> --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
> +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
> @@ -355,8 +355,10 @@ eth_vmxnet3_dev_uninit(struct rte_eth_dev *eth_dev)
>  	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
>  		return 0;
>  
> -	if (hw->adapter_stopped == 0)
> -		vmxnet3_dev_close(eth_dev);
> +	if (hw->adapter_stopped == 0) {
> +		PMD_INIT_LOG(DEBUG, "Device has not been closed.");
> +		return -EBUSY;
> +	}
>  
>  	eth_dev->dev_ops = NULL;
>  	eth_dev->rx_pkt_burst = NULL;
> @@ -803,7 +805,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
>  	PMD_INIT_FUNC_TRACE();
>  
>  	if (hw->adapter_stopped == 1) {
> -		PMD_INIT_LOG(DEBUG, "Device already closed.");
> +		PMD_INIT_LOG(DEBUG, "Device already stopped.");
>  		return;
>  	}
>  
> @@ -827,7 +829,6 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
>  	/* reset the device */
>  	VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV);
>  	PMD_INIT_LOG(DEBUG, "Device reset.");
> -	hw->adapter_stopped = 0;
>  
>  	vmxnet3_dev_clear_queues(dev);
>  
> @@ -837,6 +838,30 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
>  	link.link_speed = ETH_SPEED_NUM_10G;
>  	link.link_autoneg = ETH_LINK_FIXED;
>  	rte_eth_linkstatus_set(dev, &link);
> +
> +	hw->adapter_stopped = 1;
> +}
> +
> +static void
> +vmxnet3_free_queues(struct rte_eth_dev *dev)
> +{
> +	int i;
> +
> +	PMD_INIT_FUNC_TRACE();
> +
> +	for (i = 0; i < dev->data->nb_rx_queues; i++) {
> +		void *rxq = dev->data->rx_queues[i];
> +
> +		vmxnet3_dev_rx_queue_release(rxq);
> +	}
> +	dev->data->nb_rx_queues = 0;
> +
> +	for (i = 0; i < dev->data->nb_tx_queues; i++) {
> +		void *txq = dev->data->tx_queues[i];
> +
> +		vmxnet3_dev_tx_queue_release(txq);
> +	}
> +	dev->data->nb_tx_queues = 0;
>  }
>  
>  /*
> @@ -845,12 +870,10 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
>  static void
>  vmxnet3_dev_close(struct rte_eth_dev *dev)
>  {
> -	struct vmxnet3_hw *hw = dev->data->dev_private;
> -
>  	PMD_INIT_FUNC_TRACE();
>  
>  	vmxnet3_dev_stop(dev);
> -	hw->adapter_stopped = 1;
> +	vmxnet3_free_queues(dev);
>  }
>  
>  static void
>