[PATCH] there are some memory leak about Dir operator

[PATCH] there are some memory leak about Dir operator

[zhang.zhangkun-hv44wF8Li93QT0dZR+AlfA]

From: zhangkun <zhangk.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>


Signed-off-by: zhangkun <zhangk.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
 lib/librte_eal/linuxapp/eal/eal_hugepage_info.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index b72a205..d784b7c 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -311,12 +311,14 @@ eal_hugepage_info_init(void)
 				/* if blocking lock failed */
 				if (flock(hpi->lock_descriptor, LOCK_EX) == -1) {
 					RTE_LOG(CRIT, EAL, "Failed to lock hugepage directory!\n");
+					closedir(dir);
 					return -1;
 				}
 				/* clear out the hugepages dir from unused pages */
-				if (clear_hugedir(hpi->hugedir) == -1)
+				if (clear_hugedir(hpi->hugedir) == -1) {
+					closedir(dir);
 					return -1;
-
+				}
 				/* for now, put all pages into socket 0,
 				 * later they will be sorted */
 				hpi->num_pages[0] = get_num_hugepages(dirent->d_name);
-- 
1.7.3.1.msysgit.0

[PATCH] there are some memory leak about Dir operator

[zhang.zhangkun-hv44wF8Li93QT0dZR+AlfA]

From: zhangkun <zhangk.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>


Signed-off-by: zhangkun <zhangk.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
 lib/librte_eal/linuxapp/eal/eal_hugepage_info.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
index b72a205..d784b7c 100644
--- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
@@ -311,12 +311,14 @@ eal_hugepage_info_init(void)
 				/* if blocking lock failed */
 				if (flock(hpi->lock_descriptor, LOCK_EX) == -1) {
 					RTE_LOG(CRIT, EAL, "Failed to lock hugepage directory!\n");
+					closedir(dir);
 					return -1;
 				}
 				/* clear out the hugepages dir from unused pages */
-				if (clear_hugedir(hpi->hugedir) == -1)
+				if (clear_hugedir(hpi->hugedir) == -1) {
+					closedir(dir);
 					return -1;
-
+				}
 				/* for now, put all pages into socket 0,
 				 * later they will be sorted */
 				hpi->num_pages[0] = get_num_hugepages(dirent->d_name);
-- 
1.7.3.1.msysgit.0

Re: [PATCH] there are some memory leak about Dir operator

[Zhang, Helin]

> -----Original Message-----
> From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] On Behalf Of
> zhang.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org
> Sent: Tuesday, August 19, 2014 11:40 AM
> To: dev-VfR2kkLFssw@public.gmane.org
> Cc: zhangkun
> Subject: [dpdk-dev] [PATCH] there are some memory leak about Dir operator
> 
> From: zhangkun <zhangk.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> 
> 
> Signed-off-by: zhangkun <zhangk.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> ---
>  lib/librte_eal/linuxapp/eal/eal_hugepage_info.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> index b72a205..d784b7c 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_hugepage_info.c
> @@ -311,12 +311,14 @@ eal_hugepage_info_init(void)
>  				/* if blocking lock failed */
>  				if (flock(hpi->lock_descriptor, LOCK_EX) == -1) {
>  					RTE_LOG(CRIT, EAL, "Failed to lock hugepage
> directory!\n");
> +					closedir(dir);
>  					return -1;
>  				}
>  				/* clear out the hugepages dir from unused pages */
> -				if (clear_hugedir(hpi->hugedir) == -1)
> +				if (clear_hugedir(hpi->hugedir) == -1) {
> +					closedir(dir);
>  					return -1;
> -
> +				}
>  				/* for now, put all pages into socket 0,
>  				 * later they will be sorted */
>  				hpi->num_pages[0] =
> get_num_hugepages(dirent->d_name);
> --
> 1.7.3.1.msysgit.0
> 

Hi Zhangkun

Could you help to explain more detailed about the memory leak? Wouldn't the OS take care of those closing during process exiting?

Regards,
Helin

Re: [PATCH] there are some memory leak about Dir operator

[Thomas Monjalon]

2014-08-19 11:51, zhang.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org:
> From: zhangkun <zhangk.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> 
> 
> Signed-off-by: zhangkun <zhangk.zhangkun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

Acked-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Log changed to:
  eal: fix memory leak in hugepage error cases
  The sysfs directory for hugepages parsing was not closed properly in some
  error cases.

Applied for version 1.7.1.

Thanks
-- 
Thomas