| Message ID | 1522810579-7466-2-git-send-email-hejianet@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jia,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on arm64/for-next/core]
[also build test ERROR on v4.16 next-20180403]
[cannot apply to linus/master mmotm/master]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Jia-He/mm-page_alloc-remain-memblock_next_valid_pfn-on-arm-and-arm64/20180404-200732
base: https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-next/core
config: i386-randconfig-x013-201813 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All error/warnings (new ones prefixed by >>):
In file included from include/linux/gfp.h:6:0,
from include/linux/mm.h:10,
from mm/page_alloc.c:18:
mm/page_alloc.c: In function 'memmap_init_zone':
>> include/linux/mmzone.h:1299:28: error: called object is not a function or function pointer
#define next_valid_pfn (pfn++)
~~~~^~~
>> mm/page_alloc.c:5349:39: note: in expansion of macro 'next_valid_pfn'
for (pfn = start_pfn; pfn < end_pfn; next_valid_pfn(pfn)) {
^~~~~~~~~~~~~~
vim +1299 include/linux/mmzone.h
1296
1297 /* fallback to default defitions*/
1298 #ifndef next_valid_pfn
> 1299 #define next_valid_pfn (pfn++)
1300 #endif
1301
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
sorry, will fix it right now Cheer, Jia On 4/4/2018 10:19 PM, kbuild test robot Wrote: > Hi Jia, > > Thank you for the patch! Yet something to improve: > > [auto build test ERROR on arm64/for-next/core] > [also build test ERROR on v4.16 next-20180403] > [cannot apply to linus/master mmotm/master] > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > > url: https://github.com/0day-ci/linux/commits/Jia-He/mm-page_alloc-remain-memblock_next_valid_pfn-on-arm-and-arm64/20180404-200732 > base: https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-next/core > config: i386-randconfig-x013-201813 (attached as .config) > compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 > reproduce: > # save the attached .config to linux build tree > make ARCH=i386 > > All error/warnings (new ones prefixed by >>): > > In file included from include/linux/gfp.h:6:0, > from include/linux/mm.h:10, > from mm/page_alloc.c:18: > mm/page_alloc.c: In function 'memmap_init_zone': >>> include/linux/mmzone.h:1299:28: error: called object is not a function or function pointer > #define next_valid_pfn (pfn++) > ~~~~^~~ >>> mm/page_alloc.c:5349:39: note: in expansion of macro 'next_valid_pfn' > for (pfn = start_pfn; pfn < end_pfn; next_valid_pfn(pfn)) { > ^~~~~~~~~~~~~~ > > vim +1299 include/linux/mmzone.h > > 1296 > 1297 /* fallback to default defitions*/ > 1298 #ifndef next_valid_pfn >> 1299 #define next_valid_pfn (pfn++) > 1300 #endif > 1301 > > --- > 0-DAY kernel test infrastructure Open Source Technology Center > https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index a1f11a7..296cc52 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -25,6 +25,7 @@ #include <linux/dma-contiguous.h> #include <linux/sizes.h> #include <linux/stop_machine.h> +#include <linux/arm96_common.h> #include <asm/cp15.h> #include <asm/mach-types.h> diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 00e7b90..6efab80 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -40,6 +40,7 @@ #include <linux/mm.h> #include <linux/kexec.h> #include <linux/crash_dump.h> +#include <linux/arm96_common.h> #include <asm/boot.h> #include <asm/fixmap.h> diff --git a/include/linux/arm96_common.h b/include/linux/arm96_common.h new file mode 100644 index 0000000..a6f68ea --- /dev/null +++ b/include/linux/arm96_common.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Common definitions of arm and arm64 + * Copyright (C) 2018 HXT-semitech Corp. + */ +#ifndef __ARM96_COMMON_H +#define __ARM96_COMMON_H +#ifdef CONFIG_HAVE_ARCH_PFN_VALID +/* HAVE_MEMBLOCK is always enabled on arm and arm64 */ +ulong __init_memblock memblock_next_valid_pfn(ulong pfn) +{ + struct memblock_type *type = &memblock.memory; + unsigned int right = type->cnt; + unsigned int mid, left = 0; + phys_addr_t addr = PFN_PHYS(++pfn); + + do { + mid = (right + left) / 2; + + if (addr < type->regions[mid].base) + right = mid; + else if (addr >= (type->regions[mid].base + + type->regions[mid].size)) + left = mid + 1; + else { + /* addr is within the region, so pfn is valid */ + return pfn; + } + } while (left < right); + + if (right == type->cnt) + return -1UL; + else + return PHYS_PFN(type->regions[right].base); +} +EXPORT_SYMBOL(memblock_next_valid_pfn); +#endif /*CONFIG_HAVE_ARCH_PFN_VALID*/ +#endif /*__ARM96_COMMON_H*/ diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index d797716..a517d43 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1245,6 +1245,8 @@ static inline int pfn_valid(unsigned long pfn) return 0; return valid_section(__nr_to_section(pfn_to_section_nr(pfn))); } + +#define next_valid_pfn(pfn) (pfn++) #endif static inline int pfn_present(unsigned long pfn) @@ -1270,6 +1272,10 @@ static inline int pfn_present(unsigned long pfn) #endif #define early_pfn_valid(pfn) pfn_valid(pfn) +#ifdef CONFIG_HAVE_ARCH_PFN_VALID +extern ulong memblock_next_valid_pfn(ulong pfn); +#define next_valid_pfn(pfn) memblock_next_valid_pfn(pfn) +#endif void sparse_init(void); #else #define sparse_init() do {} while (0) @@ -1291,6 +1297,11 @@ struct mminit_pfnnid_cache { #define early_pfn_valid(pfn) (1) #endif +/* fallback to default defitions*/ +#ifndef next_valid_pfn +#define next_valid_pfn (pfn++) +#endif + void memory_present(int nid, unsigned long start, unsigned long end); unsigned long __init node_memmap_size_bytes(int, unsigned long, unsigned long); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c19f5ac..9d05f29 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5475,7 +5475,7 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, if (altmap && start_pfn == altmap->base_pfn) start_pfn += altmap->reserve; - for (pfn = start_pfn; pfn < end_pfn; pfn++) { + for (pfn = start_pfn; pfn < end_pfn; next_valid_pfn(pfn)) { /* * There can be holes in boot-time mem_map[]s handed to this * function. They do not exist on hotplugged memory.
Commit b92df1de5d28 ("mm: page_alloc: skip over regions of invalid pfns where possible") optimized the loop in memmap_init_zone(). But it causes possible panic bug. So Daniel Vacek reverted it later. But as suggested by Daniel Vacek, it is fine to using memblock to skip gaps and finding next valid frame with CONFIG_HAVE_ARCH_PFN_VALID. On arm and arm64, memblock is used by default. But generic version of pfn_valid() is based on mem sections and memblock_next_valid_pfn() does not always return the next valid one but skips more resulting in some valid frames to be skipped (as if they were invalid). And that's why kernel was eventually crashing on some !arm machines. And as verified by Eugeniu Rosca, arm can benifit from commit b92df1de5d28. So remain the memblock_next_valid_pfn on arm{,64} and move the related codes to arm64 arch directory. Suggested-by: Daniel Vacek <neelx@redhat.com> Signed-off-by: Jia He <jia.he@hxt-semitech.com> --- arch/arm/mm/init.c | 1 + arch/arm64/mm/init.c | 1 + include/linux/arm96_common.h | 37 +++++++++++++++++++++++++++++++++++++ include/linux/mmzone.h | 11 +++++++++++ mm/page_alloc.c | 2 +- 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 include/linux/arm96_common.h