# git rev-parse -q --verify 06cfdca71d0b8b58f29f9e18f8cacc1172034971^{commit} 06cfdca71d0b8b58f29f9e18f8cacc1172034971 already have revision, skipping fetch # git checkout -q -f -B kisskb 06cfdca71d0b8b58f29f9e18f8cacc1172034971 # git clean -qxdf # < git log -1 # commit 06cfdca71d0b8b58f29f9e18f8cacc1172034971 # Author: Oliver O'Halloran # Date: Fri Dec 7 02:17:14 2018 +1100 # # powerpc/mm: Fallback to RAM if the altmap is unusable # # The "altmap" is used to provide a pool of memory that is reserved for # the vmemmap backing of hot-plugged memory. This is useful when adding # large amount of ZONE_DEVICE memory to a system with a limited amount of # normal memory. # # On ppc64 we use huge pages to map the vmemmap which requires the backing # storage to be contigious and aligned to the hugepage size. The altmap # implementation allows for the altmap provider to reserve a few PFNs at # the start of the range for it's own uses and when this occurs the # first chunk of the altmap is not usage for hugepage mappings. On hash # there is no sane way to fall back to a normal sized page mapping so we # fail the allocation. This results in memory hotplug failing with # ENOMEM when the new range doesn't fall into an existing vmemmap block. # # This patch handles this case by falling back to using system memory # rather than failing if we cannot allocate from the altmap. This # fallback should only ever be used for the first vmemmap block so it # should not cause excess memory consumption. # # Fixes: 7b73d978a5d0 ("mm: pass the vmem_altmap to vmemmap_populate") # Signed-off-by: Oliver O'Halloran # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 06cfdca71d0b8b58f29f9e18f8cacc1172034971 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_smp_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:10:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:77:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ arch/powerpc/boot/dts/fsl/mpc8541cds.dtb: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) arch/powerpc/boot/dts/fsl/mpc8555cds.dtb: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc23c30) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc1343c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996245 Bytes = 5855.71 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996178 Bytes = 5855.64 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996410 Bytes = 5855.87 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5998154 Bytes = 5857.57 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996081 Bytes = 5855.55 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996783 Bytes = 5856.23 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5965342 Bytes = 5825.53 KiB = 5.69 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996409 Bytes = 5855.87 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996809 Bytes = 5856.26 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996468 Bytes = 5855.93 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5998203 Bytes = 5857.62 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5995941 Bytes = 5855.41 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5997063 Bytes = 5856.51 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996014 Bytes = 5855.48 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5998314 Bytes = 5857.73 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-4.20.0-rc1-g06cfdca71d0b Created: Sat Dec 8 02:12:17 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5996268 Bytes = 5855.73 KiB = 5.72 MiB Load Address: 00d00000 Entry Point: 00d00314 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc5 # Build took: 0:01:44.784616