diff mbox series

[1/2] net/txgbe: fix driver exit

Message ID 20201027062406.243081-1-jiawenwu@trustnetic.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series [1/2] net/txgbe: fix driver exit |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Jiawen Wu Oct. 27, 2020, 6:24 a.m. UTC 
  Replace the 'rte_panic()' with an error return.
Also change the type of the calling function.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.h |  2 +-
 drivers/net/txgbe/txgbe_pf.c     | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

Comments

Ferruh Yigit Oct. 27, 2020, 10:53 a.m. UTC | #1 
On 10/27/2020 6:24 AM, Jiawen Wu wrote:
> Replace the 'rte_panic()' with an error return.
> Also change the type of the calling function.
> 
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
>   drivers/net/txgbe/txgbe_ethdev.h |  2 +-
>   drivers/net/txgbe/txgbe_pf.c     | 12 ++++++++----
>   2 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
> index b708e6d43..fb1368890 100644
> --- a/drivers/net/txgbe/txgbe_ethdev.h
> +++ b/drivers/net/txgbe/txgbe_ethdev.h
> @@ -290,7 +290,7 @@ void txgbe_configure_dcb(struct rte_eth_dev *dev);
>   int
>   txgbe_dev_link_update_share(struct rte_eth_dev *dev,
>   		int wait_to_complete);
> -void txgbe_pf_host_init(struct rte_eth_dev *eth_dev);
> +int txgbe_pf_host_init(struct rte_eth_dev *eth_dev);

Better to update where 'txgbe_pf_host_init()' is called and check the return type.

Can you please check the following patch as sample:
https://patches.dpdk.org/patch/81576/
diff mbox series

Patch

diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
index b708e6d43..fb1368890 100644
--- a/drivers/net/txgbe/txgbe_ethdev.h
+++ b/drivers/net/txgbe/txgbe_ethdev.h
@@ -290,7 +290,7 @@  void txgbe_configure_dcb(struct rte_eth_dev *dev);
 int
 txgbe_dev_link_update_share(struct rte_eth_dev *dev,
 		int wait_to_complete);
-void txgbe_pf_host_init(struct rte_eth_dev *eth_dev);
+int txgbe_pf_host_init(struct rte_eth_dev *eth_dev);
 
 void txgbe_pf_host_uninit(struct rte_eth_dev *eth_dev);
 
diff --git a/drivers/net/txgbe/txgbe_pf.c b/drivers/net/txgbe/txgbe_pf.c
index 67045fb01..ee7fa83fa 100644
--- a/drivers/net/txgbe/txgbe_pf.c
+++ b/drivers/net/txgbe/txgbe_pf.c
@@ -64,7 +64,7 @@  txgbe_mb_intr_setup(struct rte_eth_dev *dev)
 	return 0;
 }
 
-void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)
+int txgbe_pf_host_init(struct rte_eth_dev *eth_dev)
 {
 	struct txgbe_vf_info **vfinfo = TXGBE_DEV_VFDATA(eth_dev);
 	struct txgbe_mirror_info *mirror_info = TXGBE_DEV_MR_INFO(eth_dev);
@@ -78,12 +78,14 @@  void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)
 	RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
 	vf_num = dev_num_vf(eth_dev);
 	if (vf_num == 0)
-		return;
+		return 0;
 
 	*vfinfo = rte_zmalloc("vf_info",
 			sizeof(struct txgbe_vf_info) * vf_num, 0);
-	if (*vfinfo == NULL)
-		rte_panic("Cannot allocate memory for private VF data\n");
+	if (*vfinfo == NULL) {
+		DEBUGOUT("Cannot allocate memory for private VF data\n");
+		return -ENOMEM;
+	}
 
 	rte_eth_switch_domain_alloc(&(*vfinfo)->switch_domain_id);
 
@@ -114,6 +116,8 @@  void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)
 
 	/* set mb interrupt mask */
 	txgbe_mb_intr_setup(eth_dev);
+
+	return 0;
 }
 
 void txgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)