+ memblock-warn-if-zero-alignment-was-requested-fix.patch added to -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm/memblock.c: use dump_stack() instead of WARN_ON_ONCE for the alignment checks
has been added to the -mm tree.  Its filename is
     memblock-warn-if-zero-alignment-was-requested-fix.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/memblock-warn-if-zero-alignment-was-requested-fix.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/memblock-warn-if-zero-alignment-was-requested-fix.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: mm/memblock.c: use dump_stack() instead of WARN_ON_ONCE for the alignment checks

Using WARN_ON_ONCE too early causes the PowerPC kernel to fail.

Link: http://lkml.kernel.org/r/20181016131927.6ceba6ab@xxxxxxxxxxxxxxxx
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/memblock.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- a/mm/memblock.c~memblock-warn-if-zero-alignment-was-requested-fix
+++ a/mm/memblock.c
@@ -1298,8 +1298,10 @@ static phys_addr_t __init memblock_alloc
 {
 	phys_addr_t found;
 
-	if (WARN_ON_ONCE(!align))
+	if (!align) {
+		dump_stack();
 		align = SMP_CACHE_BYTES;
+	}
 
 	found = memblock_find_in_range_node(size, align, start, end, nid,
 					    flags);
@@ -1423,8 +1425,10 @@ static void * __init memblock_alloc_inte
 	if (WARN_ON_ONCE(slab_is_available()))
 		return kzalloc_node(size, GFP_NOWAIT, nid);
 
-	if (WARN_ON_ONCE(!align))
+	if (!align) {
+		dump_stack();
 		align = SMP_CACHE_BYTES;
+	}
 
 	if (max_addr > memblock.current_limit)
 		max_addr = memblock.current_limit;
_

Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are

mm-remove-include-linux-bootmemh-fix.patch
mm-remove-include-linux-bootmemh-fix-2.patch
mm-remove-include-linux-bootmemh-fix-3.patch
memblock-warn-if-zero-alignment-was-requested-fix.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux