[dpdk-dev] [PATCH v4 03/11] e1000: replace rte_panic instances in e1000 driver

[Kevin Traynor]

On 04/19/2018 07:01 AM, Arnon Warshavsky wrote:
> replace panic calls with log and retrun value.
> Local function to this file,
> changing from void to int is non-abi-breaking
> --
> v4 - keep error message literal string in a singhle line
> 
> Signed-off-by: Arnon Warshavsky <arnon at qwilt.com>
> ---
>  drivers/net/e1000/e1000_ethdev.h |  2 +-
>  drivers/net/e1000/igb_ethdev.c   |  3 ++-
>  drivers/net/e1000/igb_pf.c       | 15 +++++++++------
>  3 files changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h
> index 6354b89..2e527de 100644
> --- a/drivers/net/e1000/e1000_ethdev.h
> +++ b/drivers/net/e1000/e1000_ethdev.h
> @@ -411,7 +411,7 @@ int eth_igb_rss_hash_conf_get(struct rte_eth_dev *dev,
>  /*
>   * misc function prototypes
>   */
> -void igb_pf_host_init(struct rte_eth_dev *eth_dev);
> +int igb_pf_host_init(struct rte_eth_dev *eth_dev);
>  
>  void igb_pf_mbx_process(struct rte_eth_dev *eth_dev);
>  
> diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
> index 9b808a9..4479616 100644
> --- a/drivers/net/e1000/igb_ethdev.c
> +++ b/drivers/net/e1000/igb_ethdev.c
> @@ -833,7 +833,8 @@ static int igb_flex_filter_uninit(struct rte_eth_dev *eth_dev)
>  	}
>  
>  	/* initialize PF if max_vfs not zero */
> -	igb_pf_host_init(eth_dev);
> +	if (igb_pf_host_init(eth_dev) != 0)

You don't need "!= 0"

You need to set "error" here, or else return it from igb_pf_host_init().
We know -ENOMEM is the only error that can be returned from
igb_pf_host_init() but not sure if should assume that.

> +		goto err_late;
>  
>  	ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
>  	/* Set PF Reset Done bit so PF/VF Mail Ops can work */
> diff --git a/drivers/net/e1000/igb_pf.c b/drivers/net/e1000/igb_pf.c
> index b9f2e53..ae4b0a4 100644
> --- a/drivers/net/e1000/igb_pf.c
> +++ b/drivers/net/e1000/igb_pf.c
> @@ -63,7 +63,7 @@ int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
>  	return 0;
>  }
>  
> -void igb_pf_host_init(struct rte_eth_dev *eth_dev)
> +int igb_pf_host_init(struct rte_eth_dev *eth_dev)
>  {
>  	struct e1000_vf_info **vfinfo =
>  		E1000_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
> @@ -74,7 +74,7 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev)
>  
>  	RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
>  	if (0 == (vf_num = dev_num_vf(eth_dev)))
> -		return;
> +		return 0;
>  
>  	if (hw->mac.type == e1000_i350)
>  		nb_queue = 1;
> @@ -82,11 +82,14 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev)
>  		/* per datasheet, it should be 2, but 1 seems correct */
>  		nb_queue = 1;
>  	else
> -		return;
> +		return 0;
>  
>  	*vfinfo = rte_zmalloc("vf_info", sizeof(struct e1000_vf_info) * vf_num, 0);
> -	if (*vfinfo == NULL)
> -		rte_panic("Cannot allocate memory for private VF data\n");
> +	if (*vfinfo == NULL) {
> +		RTE_LOG(CRIT, PMD, "%s(): Cannot allocate memory for private VF data\n",
> +			__func__);
> +		return -1;
> +	}
>  
>  	RTE_ETH_DEV_SRIOV(eth_dev).active = ETH_8_POOLS;
>  	RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = nb_queue;
> @@ -98,7 +101,7 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev)
>  	/* set mb interrupt mask */
>  	igb_mb_intr_setup(eth_dev);
>  
> -	return;
> +	return 0;
>  }
>  
>  void igb_pf_host_uninit(struct rte_eth_dev *dev)
>