[PATCH v2 0/2] ACPI, APEI: Memory leaks

[PATCH v2 0/2] ACPI, APEI: Memory leaks

[Joshua Hunt]

While investigating a possible memory leak using kmemleak I came across the
following five leaks coming from APEI and ERST:

unreferenced object 0xffff880402b6ee80 (size 32):
  comm "swapper/0", pid 1, jiffies 4294669373 (age 318.183s)
  hex dump (first 32 bytes):
    58 fe ab fa 03 88 ff ff 58 fe ab fa 03 88 ff ff  X.......X.......
    18 50 ea dc 00 00 00 00 3f 50 ea dc 00 00 00 00  .P......?P......
  backtrace:
    [<ffffffff82195c33>] create_object+0x103/0x2c0
    [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
    [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
    [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
    [<ffffffff8241a7e2>] collect_res_callback+0x82/0xa0
    [<ffffffff8241a225>] apei_exec_for_each_entry+0x85/0xb0
    [<ffffffff8241a26a>] apei_exec_collect_resources+0x1a/0x20
    [<ffffffff82afe532>] erst_init+0x3d6/0x3e5
    [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
    [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
    [<ffffffff82684a8e>] kernel_init+0xe/0xf0
    [<ffffffff826909d2>] ret_from_fork+0x42/0x70
    [<ffffffffffffffff>] 0xffffffffffffffff
unreferenced object 0xffff880402b6ee40 (size 32):
  comm "swapper/0", pid 1, jiffies 4294670231 (age 317.326s)
  hex dump (first 32 bytes):
    68 fe ab fa 03 88 ff ff 68 fe ab fa 03 88 ff ff  h.......h.......
    b2 00 00 00 00 00 00 00 b3 00 00 00 00 00 00 00  ................
  backtrace:
    [<ffffffff82195c33>] create_object+0x103/0x2c0
    [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
    [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
    [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
    [<ffffffff8241a7fc>] collect_res_callback+0x9c/0xa0
    [<ffffffff8241a225>] apei_exec_for_each_entry+0x85/0xb0
    [<ffffffff8241a26a>] apei_exec_collect_resources+0x1a/0x20
    [<ffffffff82afe532>] erst_init+0x3d6/0x3e5
    [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
    [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
    [<ffffffff82684a8e>] kernel_init+0xe/0xf0
    [<ffffffff826909d2>] ret_from_fork+0x42/0x70
    [<ffffffffffffffff>] 0xffffffffffffffff
unreferenced object 0xffff880402b6ee20 (size 32):
  comm "swapper/0", pid 1, jiffies 4294672240 (age 315.317s)
  hex dump (first 32 bytes):
    88 fd ab fa 03 88 ff ff 00 ee b6 02 04 88 ff ff  ................
    00 d0 15 cd 00 00 00 00 00 40 16 cd 00 00 00 00  .........@......
  backtrace:
    [<ffffffff82195c33>] create_object+0x103/0x2c0
    [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
    [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
    [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
    [<ffffffff8241a81a>] apei_get_res_callback+0x1a/0x20
    [<ffffffff823d0f8b>] acpi_nvs_for_each_region+0x2b/0x50
    [<ffffffff8241ae95>] apei_resources_request+0x95/0x380
    [<ffffffff82afe23e>] erst_init+0xe2/0x3e5
    [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
    [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
    [<ffffffff82684a8e>] kernel_init+0xe/0xf0
    [<ffffffff826909d2>] ret_from_fork+0x42/0x70
    [<ffffffffffffffff>] 0xffffffffffffffff
unreferenced object 0xffff880402b6ee00 (size 32):
  comm "swapper/0", pid 1, jiffies 4294672400 (age 315.157s)
  hex dump (first 32 bytes):
    20 ee b6 02 04 88 ff ff 88 fd ab fa 03 88 ff ff   ...............
    00 80 f3 dc 00 00 00 00 00 60 a9 dd 00 00 00 00  .........`......
  backtrace:
    [<ffffffff82195c33>] create_object+0x103/0x2c0
    [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
    [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
    [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
    [<ffffffff8241a81a>] apei_get_res_callback+0x1a/0x20
    [<ffffffff823d0f8b>] acpi_nvs_for_each_region+0x2b/0x50
    [<ffffffff8241ae95>] apei_resources_request+0x95/0x380
    [<ffffffff82afe23e>] erst_init+0xe2/0x3e5
    [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
    [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
    [<ffffffff82684a8e>] kernel_init+0xe/0xf0
    [<ffffffff826909d2>] ret_from_fork+0x42/0x70
    [<ffffffffffffffff>] 0xffffffffffffffff
unreferenced object 0xffff880402b6ede0 (size 32):
  comm "swapper/0", pid 1, jiffies 4294672863 (age 314.698s)
  hex dump (first 32 bytes):
    a8 fd ab fa 03 88 ff ff a8 fd ab fa 03 88 ff ff  ................
    00 00 00 f8 00 00 00 00 00 00 00 fc 00 00 00 00  ................
  backtrace:
    [<ffffffff82195c33>] create_object+0x103/0x2c0
    [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
    [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
    [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
    [<ffffffff8241a81a>] apei_get_res_callback+0x1a/0x20
    [<ffffffff82582d61>] pci_mmcfg_for_each_region+0x51/0x60
    [<ffffffff8241b14a>] apei_resources_request+0x34a/0x380
    [<ffffffff82afe23e>] erst_init+0xe2/0x3e5
    [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
    [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
    [<ffffffff82684a8e>] kernel_init+0xe/0xf0
    [<ffffffff826909d2>] ret_from_fork+0x42/0x70
    [<ffffffffffffffff>] 0xffffffffffffffff

The issue has been reported a handful of times upstream. Here is one of the previous
reports: https://lkml.org/lkml/2013/8/11/149

This series resolves the reported leaks and kmemleak is clean with these patches applied.

Changes from v1 as per Gong Chen's comments:
	* Use existing apei_resources_fini calls to do the cleanup
	* Update changelog in erst_init patch

Joshua Hunt (2):
  ACPI, APEI: Fix leaked resources
  ACPI, APEI, ERST: Fixed leaked resources in erst_init

 drivers/acpi/apei/apei-base.c |    6 ++++--
 drivers/acpi/apei/erst.c      |    3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[PATCH v2 1/2] ACPI, APEI: Fix leaked resources

[Joshua Hunt]

We leak the NVS and arch resources (if used), in apei_resources_request.
They are allocated to make sure we exclude them from the APEI resources,
but they are never freed at the end of the function. Free them now.

Signed-off-by: Josh Hunt <johunt@akamai.com>
---
 drivers/acpi/apei/apei-base.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index a2c8d7a..da370e1 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -536,7 +536,8 @@ int apei_resources_request(struct apei_resources *resources,
 		goto err_unmap_ioport;
 	}
 
-	return 0;
+	goto arch_res_fini;
+
 err_unmap_ioport:
 	list_for_each_entry(res, &resources->ioport, list) {
 		if (res == res_bak)
@@ -551,7 +552,8 @@ err_unmap_iomem:
 		release_mem_region(res->start, res->end - res->start);
 	}
 arch_res_fini:
-	apei_resources_fini(&arch_res);
+	if (arch_apei_filter_addr)
+		apei_resources_fini(&arch_res);
 nvs_res_fini:
 	apei_resources_fini(&nvs_resources);
 	return rc;
-- 
1.7.9.5

[PATCH v2 2/2] ACPI, APEI, ERST: Fixed leaked resources in erst_init

[Joshua Hunt]

erst_init currently leaks resources allocated from its call to
apei_resources_init(). The data allocated there gets copied
into apei_resources_all and can be freed when we're done with it.

Signed-off-by: Josh Hunt <johunt@akamai.com>
---
 drivers/acpi/apei/erst.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 6e6bc10..006c389 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -1207,6 +1207,9 @@ static int __init erst_init(void)
 		"Failed to allocate %lld bytes for persistent store error log.\n",
 		erst_erange.size);
 
+	/* Cleanup ERST Resources */
+	apei_resources_fini(&erst_resources);
+
 	return 0;
 
 err_release_erange:
-- 
1.7.9.5

Re: [PATCH v2 1/2] ACPI, APEI: Fix leaked resources

[Chen, Gong]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

On Tue, Mar 08, 2016 at 10:52:11AM -0500, Joshua Hunt wrote:
> Date:	Tue,  8 Mar 2016 10:52:11 -0500
> From: Joshua Hunt <johunt@akamai.com>
> To: gong.chen@intel.com, linux-acpi@vger.kernel.org, rjw@rjwysocki.net,
>  lenb@kernel.org, ying.huang@intel.com
> Cc: tony.luck@intel.com, linux-kernel@vger.kernel.org, Joshua Hunt
>  <johunt@akamai.com>
> Subject: [PATCH v2 1/2] ACPI, APEI: Fix leaked resources
> X-Mailer: git-send-email 1.7.9.5
> 
> We leak the NVS and arch resources (if used), in apei_resources_request.
> They are allocated to make sure we exclude them from the APEI resources,
> but they are never freed at the end of the function. Free them now.
> 
> Signed-off-by: Josh Hunt <johunt@akamai.com>
>
Reviewed-by: Chen, Gong <gong.chen@linux.intel.com>

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH v2 2/2] ACPI, APEI, ERST: Fixed leaked resources in erst_init

[Chen, Gong]

[-- Attachment #1: Type: text/plain, Size: 787 bytes --]

On Tue, Mar 08, 2016 at 10:52:12AM -0500, Joshua Hunt wrote:
> Date:	Tue,  8 Mar 2016 10:52:12 -0500
> From: Joshua Hunt <johunt@akamai.com>
> To: gong.chen@intel.com, linux-acpi@vger.kernel.org, rjw@rjwysocki.net,
>  lenb@kernel.org, ying.huang@intel.com
> Cc: tony.luck@intel.com, linux-kernel@vger.kernel.org, Joshua Hunt
>  <johunt@akamai.com>
> Subject: [PATCH v2 2/2] ACPI, APEI, ERST: Fixed leaked resources in
>  erst_init
> X-Mailer: git-send-email 1.7.9.5
> 
> erst_init currently leaks resources allocated from its call to
> apei_resources_init(). The data allocated there gets copied
> into apei_resources_all and can be freed when we're done with it.
> 
> Signed-off-by: Josh Hunt <johunt@akamai.com>

Reviewed-by: Chen, Gong <gong.chen@linux.intel.com>


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH v2 0/2] ACPI, APEI: Memory leaks

[Rafael J. Wysocki]

On Tuesday, March 08, 2016 10:52:10 AM Joshua Hunt wrote:
> While investigating a possible memory leak using kmemleak I came across the
> following five leaks coming from APEI and ERST:
> 
> unreferenced object 0xffff880402b6ee80 (size 32):
>   comm "swapper/0", pid 1, jiffies 4294669373 (age 318.183s)
>   hex dump (first 32 bytes):
>     58 fe ab fa 03 88 ff ff 58 fe ab fa 03 88 ff ff  X.......X.......
>     18 50 ea dc 00 00 00 00 3f 50 ea dc 00 00 00 00  .P......?P......
>   backtrace:
>     [<ffffffff82195c33>] create_object+0x103/0x2c0
>     [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
>     [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
>     [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
>     [<ffffffff8241a7e2>] collect_res_callback+0x82/0xa0
>     [<ffffffff8241a225>] apei_exec_for_each_entry+0x85/0xb0
>     [<ffffffff8241a26a>] apei_exec_collect_resources+0x1a/0x20
>     [<ffffffff82afe532>] erst_init+0x3d6/0x3e5
>     [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
>     [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
>     [<ffffffff82684a8e>] kernel_init+0xe/0xf0
>     [<ffffffff826909d2>] ret_from_fork+0x42/0x70
>     [<ffffffffffffffff>] 0xffffffffffffffff
> unreferenced object 0xffff880402b6ee40 (size 32):
>   comm "swapper/0", pid 1, jiffies 4294670231 (age 317.326s)
>   hex dump (first 32 bytes):
>     68 fe ab fa 03 88 ff ff 68 fe ab fa 03 88 ff ff  h.......h.......
>     b2 00 00 00 00 00 00 00 b3 00 00 00 00 00 00 00  ................
>   backtrace:
>     [<ffffffff82195c33>] create_object+0x103/0x2c0
>     [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
>     [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
>     [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
>     [<ffffffff8241a7fc>] collect_res_callback+0x9c/0xa0
>     [<ffffffff8241a225>] apei_exec_for_each_entry+0x85/0xb0
>     [<ffffffff8241a26a>] apei_exec_collect_resources+0x1a/0x20
>     [<ffffffff82afe532>] erst_init+0x3d6/0x3e5
>     [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
>     [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
>     [<ffffffff82684a8e>] kernel_init+0xe/0xf0
>     [<ffffffff826909d2>] ret_from_fork+0x42/0x70
>     [<ffffffffffffffff>] 0xffffffffffffffff
> unreferenced object 0xffff880402b6ee20 (size 32):
>   comm "swapper/0", pid 1, jiffies 4294672240 (age 315.317s)
>   hex dump (first 32 bytes):
>     88 fd ab fa 03 88 ff ff 00 ee b6 02 04 88 ff ff  ................
>     00 d0 15 cd 00 00 00 00 00 40 16 cd 00 00 00 00  .........@......
>   backtrace:
>     [<ffffffff82195c33>] create_object+0x103/0x2c0
>     [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
>     [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
>     [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
>     [<ffffffff8241a81a>] apei_get_res_callback+0x1a/0x20
>     [<ffffffff823d0f8b>] acpi_nvs_for_each_region+0x2b/0x50
>     [<ffffffff8241ae95>] apei_resources_request+0x95/0x380
>     [<ffffffff82afe23e>] erst_init+0xe2/0x3e5
>     [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
>     [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
>     [<ffffffff82684a8e>] kernel_init+0xe/0xf0
>     [<ffffffff826909d2>] ret_from_fork+0x42/0x70
>     [<ffffffffffffffff>] 0xffffffffffffffff
> unreferenced object 0xffff880402b6ee00 (size 32):
>   comm "swapper/0", pid 1, jiffies 4294672400 (age 315.157s)
>   hex dump (first 32 bytes):
>     20 ee b6 02 04 88 ff ff 88 fd ab fa 03 88 ff ff   ...............
>     00 80 f3 dc 00 00 00 00 00 60 a9 dd 00 00 00 00  .........`......
>   backtrace:
>     [<ffffffff82195c33>] create_object+0x103/0x2c0
>     [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
>     [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
>     [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
>     [<ffffffff8241a81a>] apei_get_res_callback+0x1a/0x20
>     [<ffffffff823d0f8b>] acpi_nvs_for_each_region+0x2b/0x50
>     [<ffffffff8241ae95>] apei_resources_request+0x95/0x380
>     [<ffffffff82afe23e>] erst_init+0xe2/0x3e5
>     [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
>     [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
>     [<ffffffff82684a8e>] kernel_init+0xe/0xf0
>     [<ffffffff826909d2>] ret_from_fork+0x42/0x70
>     [<ffffffffffffffff>] 0xffffffffffffffff
> unreferenced object 0xffff880402b6ede0 (size 32):
>   comm "swapper/0", pid 1, jiffies 4294672863 (age 314.698s)
>   hex dump (first 32 bytes):
>     a8 fd ab fa 03 88 ff ff a8 fd ab fa 03 88 ff ff  ................
>     00 00 00 f8 00 00 00 00 00 00 00 fc 00 00 00 00  ................
>   backtrace:
>     [<ffffffff82195c33>] create_object+0x103/0x2c0
>     [<ffffffff826868b2>] kmemleak_alloc+0x82/0xc0
>     [<ffffffff8218248b>] kmem_cache_alloc_trace+0x17b/0x210
>     [<ffffffff8241a6fa>] apei_res_add+0x19a/0x200
>     [<ffffffff8241a81a>] apei_get_res_callback+0x1a/0x20
>     [<ffffffff82582d61>] pci_mmcfg_for_each_region+0x51/0x60
>     [<ffffffff8241b14a>] apei_resources_request+0x34a/0x380
>     [<ffffffff82afe23e>] erst_init+0xe2/0x3e5
>     [<ffffffff820004bd>] do_one_initcall+0x19d/0x1d0
>     [<ffffffff82ac1152>] kernel_init_freeable+0x13d/0x1d6
>     [<ffffffff82684a8e>] kernel_init+0xe/0xf0
>     [<ffffffff826909d2>] ret_from_fork+0x42/0x70
>     [<ffffffffffffffff>] 0xffffffffffffffff
> 
> The issue has been reported a handful of times upstream. Here is one of the previous
> reports: https://lkml.org/lkml/2013/8/11/149
> 
> This series resolves the reported leaks and kmemleak is clean with these patches applied.
> 
> Changes from v1 as per Gong Chen's comments:
> 	* Use existing apei_resources_fini calls to do the cleanup
> 	* Update changelog in erst_init patch
> 
> Joshua Hunt (2):
>   ACPI, APEI: Fix leaked resources
>   ACPI, APEI, ERST: Fixed leaked resources in erst_init
> 
>  drivers/acpi/apei/apei-base.c |    6 ++++--
>  drivers/acpi/apei/erst.c      |    3 +++
>  2 files changed, 7 insertions(+), 2 deletions(-)

Tony, Boris, should I apply these?

Rafael

RE: [PATCH v2 0/2] ACPI, APEI: Memory leaks

[Luck, Tony]

>>  drivers/acpi/apei/apei-base.c |    6 ++++--
>>  drivers/acpi/apei/erst.c      |    3 +++
>>  2 files changed, 7 insertions(+), 2 deletions(-)
>
> Tony, Boris, should I apply these?

Rafael,

Yes please.

-Tony

Re: [PATCH v2 0/2] ACPI, APEI: Memory leaks

[Rafael J. Wysocki]

On Thursday, March 10, 2016 10:55:56 PM Luck, Tony wrote:
> >>  drivers/acpi/apei/apei-base.c |    6 ++++--
> >>  drivers/acpi/apei/erst.c      |    3 +++
> >>  2 files changed, 7 insertions(+), 2 deletions(-)
> >
> > Tony, Boris, should I apply these?
> 
> Rafael,
> 
> Yes please.

OK, applied.

Thanks,
Rafael