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

Groups > linux.kernel > #1724372

[PATCH 3.18 12/24] mm: cma: fix totalcma_pages to include DT defined CMA regions

Show all headers | View raw

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

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

From: George G. Davis <ggdavisiv@gmail.com>

commit 94737a85f332aee75255960eaa16e89ddfa4c75a upstream.

The totalcma_pages variable is not updated to account for CMA regions
defined via device tree reserved-memory sub-nodes.  Fix this omission by
moving the calculation of totalcma_pages into cma_init_reserved_mem()
instead of cma_declare_contiguous() such that it will include reserved
memory used by all CMA regions.

Signed-off-by: George G. Davis <george_davis@mentor.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/cma.c
+++ b/mm/cma.c
@@ -200,6 +200,7 @@ int __init cma_init_reserved_mem(phys_ad
 	cma->order_per_bit = order_per_bit;
 	*res_cma = cma;
 	cma_area_count++;
+	totalcma_pages += (size / PAGE_SIZE);
 
 	return 0;
 }
@@ -338,7 +339,6 @@ int __init cma_declare_contiguous(phys_a
 	if (ret)
 		goto err;
 
-	totalcma_pages += (size / PAGE_SIZE);
 	pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
 		&base);
 	return 0;

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