[dpdk-dev] [PATCH] net/i40e: fix memory leak if VF init fails

[dpdk-dev] [PATCH] net/i40e: fix memory leak if VF init fails

[Jingjing Wu]

Cc: stable@dpdk.org
Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
 drivers/net/i40e/i40e_ethdev_vf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index f6d8293..9eca9ed 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1317,6 +1317,8 @@ i40evf_init_vf(struct rte_eth_dev *dev)
 
 err_alloc:
 	rte_free(vf->vf_res);
+	rte_free(vf->aq_resp);
+	vf->vsi_res = NULL;
 err_aq:
 	i40e_shutdown_adminq(hw); /* ignore error */
 err:
-- 
2.7.4

[dpdk-dev] [PATCH v2] net/i40e: fix memory leak if VF init fails

[Jingjing Wu]

Cc: stable@dpdk.org
Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
v2 change:
 - free aq_resp at err_aq

 drivers/net/i40e/i40e_ethdev_vf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index f6d8293..1206af1 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1317,7 +1317,9 @@ i40evf_init_vf(struct rte_eth_dev *dev)
 
 err_alloc:
 	rte_free(vf->vf_res);
+	vf->vsi_res = NULL;
 err_aq:
+	rte_free(vf->aq_resp);
 	i40e_shutdown_adminq(hw); /* ignore error */
 err:
 	return -1;
-- 
2.7.4

[dpdk-dev] [PATCH v3] net/i40e: fix memory leak if VF init fails

[Jingjing Wu]

Cc: stable@dpdk.org
Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
v3 change:
 - add new err branch to free aq_resp
 - fix indent

v2 change:
 - free aq_resp at err_aq


 drivers/net/i40e/i40e_ethdev_vf.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index f6d8293..44806d1 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1249,29 +1249,29 @@ i40evf_init_vf(struct rte_eth_dev *dev)
 	/* VF reset, shutdown admin queue and initialize again */
 	if (i40e_shutdown_adminq(hw) != I40E_SUCCESS) {
 		PMD_INIT_LOG(ERR, "i40e_shutdown_adminq failed");
-		return -1;
+		goto err;
 	}
 
 	i40e_init_adminq_parameter(hw);
 	if (i40e_init_adminq(hw) != I40E_SUCCESS) {
 		PMD_INIT_LOG(ERR, "init_adminq failed");
-		return -1;
+		goto err;
 	}
 	vf->aq_resp = rte_zmalloc("vf_aq_resp", I40E_AQ_BUF_SZ, 0);
 	if (!vf->aq_resp) {
 		PMD_INIT_LOG(ERR, "unable to allocate vf_aq_resp memory");
-			goto err_aq;
+		goto err_aq;
 	}
 	if (i40evf_check_api_version(dev) != 0) {
 		PMD_INIT_LOG(ERR, "check_api version failed");
-		goto err_aq;
+		goto err_api;
 	}
 	bufsz = sizeof(struct virtchnl_vf_resource) +
 		(I40E_MAX_VF_VSI * sizeof(struct virtchnl_vsi_resource));
 	vf->vf_res = rte_zmalloc("vf_res", bufsz, 0);
 	if (!vf->vf_res) {
 		PMD_INIT_LOG(ERR, "unable to allocate vf_res memory");
-			goto err_aq;
+		goto err_api;
 	}
 
 	if (i40evf_get_vf_resource(dev) != 0) {
@@ -1317,6 +1317,9 @@ i40evf_init_vf(struct rte_eth_dev *dev)
 
 err_alloc:
 	rte_free(vf->vf_res);
+	vf->vsi_res = NULL;
+err_api:
+	rte_free(vf->aq_resp);
 err_aq:
 	i40e_shutdown_adminq(hw); /* ignore error */
 err:
-- 
2.7.4

Re: [dpdk-dev] [PATCH v3] net/i40e: fix memory leak if VF init fails

[Xing, Beilei]

> -----Original Message-----
> From: Wu, Jingjing
> Sent: Wednesday, September 13, 2017 7:54 AM
> To: Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
> Subject: [PATCH v3] net/i40e: fix memory leak if VF init fails
> 
> Cc: stable@dpdk.org
> Fixes: 4861cde46116 ("i40e: new poll mode driver")
> 
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>

Acked-by: Beilei Xing <beilei.xing@intel.com>

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] net/i40e: fix memory leak if VF init fails

[Ferruh Yigit]

On 9/14/2017 2:44 AM, Xing, Beilei wrote:
> 
> 
>> -----Original Message-----
>> From: Wu, Jingjing
>> Sent: Wednesday, September 13, 2017 7:54 AM
>> To: Xing, Beilei <beilei.xing@intel.com>
>> Cc: dev@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
>> Subject: [PATCH v3] net/i40e: fix memory leak if VF init fails
>>
>> Cc: stable@dpdk.org
>> Fixes: 4861cde46116 ("i40e: new poll mode driver")
>>
>> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> 
> Acked-by: Beilei Xing <beilei.xing@intel.com>

Applied to dpdk-next-net/master, thanks.

Re: [dpdk-dev] [PATCH v2] net/i40e: fix memory leak if VF init fails

[Xing, Beilei]

> -----Original Message-----
> From: Wu, Jingjing
> Sent: Wednesday, September 13, 2017 3:24 AM
> To: Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
> Subject: [PATCH v2] net/i40e: fix memory leak if VF init fails
> 
> Cc: stable@dpdk.org
> Fixes: 4861cde46116 ("i40e: new poll mode driver")
> 
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> v2 change:
>  - free aq_resp at err_aq
> 
>  drivers/net/i40e/i40e_ethdev_vf.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
> b/drivers/net/i40e/i40e_ethdev_vf.c
> index f6d8293..1206af1 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -1317,7 +1317,9 @@ i40evf_init_vf(struct rte_eth_dev *dev)
> 
>  err_alloc:
>  	rte_free(vf->vf_res);
> +	vf->vsi_res = NULL;
>  err_aq:
> +	rte_free(vf->aq_resp);

Seems it's inappropriate to free aq_resp here, if reset NIC failed, vf->aq_resp is not allocated yet.

/* Reset VF and wait until it's complete */
        if (i40evf_reset_vf(hw)) {
                PMD_INIT_LOG(ERR, "reset NIC failed");
                goto err_aq;
        }

How about adding a new error branch?

>  	i40e_shutdown_adminq(hw); /* ignore error */
>  err:
>  	return -1;
> --
> 2.7.4

Re: [dpdk-dev] [PATCH v2] net/i40e: fix memory leak if VF init fails

[Wu, Jingjing]

> -----Original Message-----
> From: Xing, Beilei
> Sent: Wednesday, September 13, 2017 11:23 AM
> To: Wu, Jingjing <jingjing.wu@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: RE: [PATCH v2] net/i40e: fix memory leak if VF init fails
> 
> 
> 
> > -----Original Message-----
> > From: Wu, Jingjing
> > Sent: Wednesday, September 13, 2017 3:24 AM
> > To: Xing, Beilei <beilei.xing@intel.com>
> > Cc: dev@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
> > Subject: [PATCH v2] net/i40e: fix memory leak if VF init fails
> >
> > Cc: stable@dpdk.org
> > Fixes: 4861cde46116 ("i40e: new poll mode driver")
> >
> > Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> > ---
> > v2 change:
> >  - free aq_resp at err_aq
> >
> >  drivers/net/i40e/i40e_ethdev_vf.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
> > b/drivers/net/i40e/i40e_ethdev_vf.c
> > index f6d8293..1206af1 100644
> > --- a/drivers/net/i40e/i40e_ethdev_vf.c
> > +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> > @@ -1317,7 +1317,9 @@ i40evf_init_vf(struct rte_eth_dev *dev)
> >
> >  err_alloc:
> >  	rte_free(vf->vf_res);
> > +	vf->vsi_res = NULL;
> >  err_aq:
> > +	rte_free(vf->aq_resp);
> 
> Seems it's inappropriate to free aq_resp here, if reset NIC failed, vf->aq_resp is
> not allocated yet.
> 
> /* Reset VF and wait until it's complete */
>         if (i40evf_reset_vf(hw)) {
>                 PMD_INIT_LOG(ERR, "reset NIC failed");
>                 goto err_aq;
>         }
> 
> How about adding a new error branch?

Yes, a new version will be sent.

Thanks
Jingjing