Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1724370

[PATCH 3.18 10/24] mm/cma: make kmemleak ignore CMA regions

Show all headers | View raw

3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Thierry Reding <treding@nvidia.com>

commit 620951e2745750de1482128615adc15b74ee37ed upstream.

kmemleak will add allocations as objects to a pool.  The memory allocated
for each object in this pool is periodically searched for pointers to
other allocated objects.  This only works for memory that is mapped into
the kernel's virtual address space, which happens not to be the case for
most CMA regions.

Furthermore, CMA regions are typically used to store data transferred to
or from a device and therefore don't contain pointers to other objects.

Without this, the kernel crashes on the first execution of the
scan_gray_list() because it tries to access highmem.  Perhaps a more
appropriate fix would be to reject any object that can't map to a kernel
virtual address?

[akpm@linux-foundation.org: add comment]
[akpm@linux-foundation.org: fix comment, per Catalin]
[sfr@canb.auug.org.au: include linux/io.h for phys_to_virt()]
Signed-off-by: Thierry Reding <treding@nvidia.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 mm/cma.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- a/mm/cma.c
+++ b/mm/cma.c
@@ -33,6 +33,7 @@
 #include <linux/log2.h>
 #include <linux/cma.h>
 #include <linux/highmem.h>
+#include <linux/io.h>
 
 struct cma {
 	unsigned long	base_pfn;
@@ -325,6 +326,11 @@ int __init cma_declare_contiguous(phys_a
 			}
 		}
 
+		/*
+		 * kmemleak scans/reads tracked objects for pointers to other
+		 * objects but this address isn't mapped and accessible
+		 */
+		kmemleak_ignore(phys_to_virt(addr));
 		base = addr;
 	}
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.18 00/24] 3.18.69-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 15/24] mm: cma: fix incorrect type conversion for size during dma allocation Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 11/24] mm: cma: split cma-reserved in dmesg log Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 05/24] gcov: support GCC 7.1 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 23/24] scsi: sg: reset res_in_use after unlinking reserved array Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 17/24] arm64: flush FP/SIMD state correctly after execve() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 19/24] x86-64: Handle PC-relative relocations on per-CPU data Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 17:50 +0200
  [PATCH 3.18 02/24] ALSA: au88x0: Fix zero clear of stream->resources Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 18/24] arm64: fpsimd: Prevent registers leaking across exec Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 10/24] mm/cma: make kmemleak ignore CMA regions Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 12/24] mm: cma: fix totalcma_pages to include DT defined CMA regions Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 22/24] scsi: sg: protect accesses to reserved page array Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 03/24] gcov: add support for GCC 5.1 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 14/24] mm: cma: constify and use correct signness in mm/cma.c Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 09/24] mm: cma: align to physical address, not CMA region position Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 04/24] gcov: add support for gcc version >= 6 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  [PATCH 3.18 07/24] arm64: mm: abort uaccess retries upon fatal signal Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-31 18:00 +0200
  Re: [PATCH 3.18 00/24] 3.18.69-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-08-31 21:10 +0200
  Re: [PATCH 3.18 00/24] 3.18.69-stable review Guenter Roeck <linux@roeck-us.net> - 2017-08-31 21:40 +0200
  Re: [PATCH 3.18 00/24] 3.18.69-stable review Guenter Roeck <linux@roeck-us.net> - 2017-09-01 04:40 +0200
    Re: [PATCH 3.18 00/24] 3.18.69-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-01 07:10 +0200

csiph-web