According to Documentation/admin-guide/kernel-parameters.txt,
the kernel command-line parameter memmap= means "Force usage
of a specific region of memory", but when add "memmap=3G@64M"
to the command-line, kernel boot hangs in sparse_init().
In order to support memmap=limit@base, refactor the function
early_parse_memmap() and then use memblock_mem_range_remove_map()
to limit the memory region.
With this patch, when add "memmap=3G@64M" to the command-line,
the kernel boots successfully, we can see the following messages:
[ 0.000000] Memory limited to 64MB-3136MB
...
[ 0.000000] Early memory node ranges
[ 0.000000] node 0: [mem 0x0000000004000000-0x000000000effffff]
[ 0.000000] node 0: [mem 0x0000000090200000-0x00000000ffffffff]
[ 0.000000] node 0: [mem 0x0000000120000000-0x00000001653fffff]
...
[ 0.000000] Memory: 3070816K/3147776K available (...)
When add "memmap=128M@64M nr_cpus=1 init 3" to the command-line,
the kernel also boots successfully, we can see the following messages:
[ 0.000000] Memory limited to 64MB-192MB
...
[ 0.000000] Early memory node ranges
[ 0.000000] node 0: [mem 0x0000000004000000-0x000000000c1fffff]
...
[ 0.000000] Memory: 95312K/133120K available (...)
After login, the output of free command is consistent with the
above log.
Signed-off-by: Tiezhu Yang <[email protected]>
---
arch/mips/kernel/setup.c | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 6b6d718..c940405 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -340,6 +340,7 @@ static void __init bootmem_init(void)
static int usermem __initdata;
static phys_addr_t memory_limit;
+static phys_addr_t memory_base;
static int __init early_parse_mem(char *p)
{
@@ -356,7 +357,6 @@ early_param("mem", early_parse_mem);
static int __init early_parse_memmap(char *p)
{
char *oldp;
- u64 start_at, mem_size;
if (!p)
return -EINVAL;
@@ -367,30 +367,38 @@ static int __init early_parse_memmap(char *p)
}
oldp = p;
- mem_size = memparse(p, &p);
+ memory_limit = memparse(p, &p) & PAGE_MASK;
if (p == oldp)
return -EINVAL;
if (*p == '@') {
- start_at = memparse(p+1, &p);
- memblock_add(start_at, mem_size);
+ memory_base = memparse(p + 1, &p) & PAGE_MASK;
+ } else if (*p == '$') {
+ memory_base = memparse(p+1, &p) & PAGE_MASK;
+ memblock_reserve(memory_base, memory_limit);
+ pr_notice("Memory reserved to %lldMB-%lldMB\n",
+ memory_base >> 20, (memory_base + memory_limit) >> 20);
+ memory_base = 0;
+ memory_limit = 0;
+ return 0;
} else if (*p == '#') {
- pr_err("\"memmap=nn#ss\" (force ACPI data) invalid on MIPS\n");
+ pr_err("\"memmap=nn#ss\" invalid on MIPS\n");
+ memory_limit = 0;
+ return -EINVAL;
+ } else if (*p == '!') {
+ pr_err("\"memmap=nn!ss\" invalid on MIPS\n");
+ memory_limit = 0;
return -EINVAL;
- } else if (*p == '$') {
- start_at = memparse(p+1, &p);
- memblock_add(start_at, mem_size);
- memblock_reserve(start_at, mem_size);
} else {
- pr_err("\"memmap\" invalid format!\n");
+ pr_err("Unrecognized memmap syntax: %s\n", p);
+ memory_limit = 0;
return -EINVAL;
}
- if (*p == '\0') {
- usermem = 1;
- return 0;
- } else
- return -EINVAL;
+ pr_notice("Memory limited to %lldMB-%lldMB\n",
+ memory_base >> 20, (memory_base + memory_limit) >> 20);
+
+ return *p == '\0' ? 0 : -EINVAL;
}
early_param("memmap", early_parse_memmap);
@@ -667,7 +675,7 @@ static void __init arch_mem_init(char **cmdline_p)
__pa_symbol(&__nosave_end) - __pa_symbol(&__nosave_begin));
/* Limit the memory. */
- memblock_enforce_memory_limit(memory_limit);
+ memblock_mem_range_remove_map(memory_base, memory_limit);
memblock_allow_resize();
early_memtest(PFN_PHYS(ARCH_PFN_OFFSET), PFN_PHYS(max_low_pfn));
--
2.1.0
Hi Tiezhu,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on hnaz-mm/master]
[also build test WARNING on linus/master v5.17-rc6 next-20220225]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Tiezhu-Yang/MIPS-Modify-mem-and-memmap-parameter/20220228-212554
base: https://github.com/hnaz/linux-mm master
config: mips-randconfig-r025-20220228 (https://download.01.org/0day-ci/archive/20220301/[email protected]/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d271fc04d5b97b12e6b797c6067d3c96a8d7470e)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install mips cross compiling tool for clang build
# apt-get install binutils-mips-linux-gnu
# https://github.com/0day-ci/linux/commit/ab143b3c599254c414419565480fc01acb23452a
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Tiezhu-Yang/MIPS-Modify-mem-and-memmap-parameter/20220228-212554
git checkout ab143b3c599254c414419565480fc01acb23452a
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=mips SHELL=/bin/bash arch/mips/kernel/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All warnings (new ones prefixed by >>):
arch/mips/kernel/setup.c:351:42: warning: format specifies type 'long long' but the argument has type 'phys_addr_t' (aka 'unsigned int') [-Wformat]
pr_notice("Memory limited to %lldMB\n", memory_limit >> 20);
~~~~ ^~~~~~~~~~~~~~~~~~
%u
include/linux/printk.h:509:36: note: expanded from macro 'pr_notice'
printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:446:60: note: expanded from macro 'printk'
#define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:418:19: note: expanded from macro 'printk_index_wrap'
_p_func(_fmt, ##__VA_ARGS__); \
~~~~ ^~~~~~~~~~~
arch/mips/kernel/setup.c:380:6: warning: format specifies type 'long long' but the argument has type 'phys_addr_t' (aka 'unsigned int') [-Wformat]
memory_base >> 20, (memory_base + memory_limit) >> 20);
^~~~~~~~~~~~~~~~~
include/linux/printk.h:509:36: note: expanded from macro 'pr_notice'
printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:446:60: note: expanded from macro 'printk'
#define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:418:19: note: expanded from macro 'printk_index_wrap'
_p_func(_fmt, ##__VA_ARGS__); \
~~~~ ^~~~~~~~~~~
>> arch/mips/kernel/setup.c:380:25: warning: format specifies type 'long long' but the argument has type 'unsigned int' [-Wformat]
memory_base >> 20, (memory_base + memory_limit) >> 20);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/printk.h:509:36: note: expanded from macro 'pr_notice'
printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:446:60: note: expanded from macro 'printk'
#define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:418:19: note: expanded from macro 'printk_index_wrap'
_p_func(_fmt, ##__VA_ARGS__); \
~~~~ ^~~~~~~~~~~
arch/mips/kernel/setup.c:399:5: warning: format specifies type 'long long' but the argument has type 'phys_addr_t' (aka 'unsigned int') [-Wformat]
memory_base >> 20, (memory_base + memory_limit) >> 20);
^~~~~~~~~~~~~~~~~
include/linux/printk.h:509:36: note: expanded from macro 'pr_notice'
printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:446:60: note: expanded from macro 'printk'
#define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:418:19: note: expanded from macro 'printk_index_wrap'
_p_func(_fmt, ##__VA_ARGS__); \
~~~~ ^~~~~~~~~~~
arch/mips/kernel/setup.c:399:24: warning: format specifies type 'long long' but the argument has type 'unsigned int' [-Wformat]
memory_base >> 20, (memory_base + memory_limit) >> 20);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/printk.h:509:36: note: expanded from macro 'pr_notice'
printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:446:60: note: expanded from macro 'printk'
#define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
include/linux/printk.h:418:19: note: expanded from macro 'printk_index_wrap'
_p_func(_fmt, ##__VA_ARGS__); \
~~~~ ^~~~~~~~~~~
5 warnings generated.
vim +380 arch/mips/kernel/setup.c
356
357 static int __init early_parse_memmap(char *p)
358 {
359 char *oldp;
360
361 if (!p)
362 return -EINVAL;
363
364 if (!strncmp(p, "exactmap", 8)) {
365 pr_err("\"memmap=exactmap\" invalid on MIPS\n");
366 return 0;
367 }
368
369 oldp = p;
370 memory_limit = memparse(p, &p) & PAGE_MASK;
371 if (p == oldp)
372 return -EINVAL;
373
374 if (*p == '@') {
375 memory_base = memparse(p + 1, &p) & PAGE_MASK;
376 } else if (*p == '$') {
377 memory_base = memparse(p+1, &p) & PAGE_MASK;
378 memblock_reserve(memory_base, memory_limit);
379 pr_notice("Memory reserved to %lldMB-%lldMB\n",
> 380 memory_base >> 20, (memory_base + memory_limit) >> 20);
381 memory_base = 0;
382 memory_limit = 0;
383 return 0;
384 } else if (*p == '#') {
385 pr_err("\"memmap=nn#ss\" invalid on MIPS\n");
386 memory_limit = 0;
387 return -EINVAL;
388 } else if (*p == '!') {
389 pr_err("\"memmap=nn!ss\" invalid on MIPS\n");
390 memory_limit = 0;
391 return -EINVAL;
392 } else {
393 pr_err("Unrecognized memmap syntax: %s\n", p);
394 memory_limit = 0;
395 return -EINVAL;
396 }
397
398 pr_notice("Memory limited to %lldMB-%lldMB\n",
399 memory_base >> 20, (memory_base + memory_limit) >> 20);
400
401 return *p == '\0' ? 0 : -EINVAL;
402 }
403 early_param("memmap", early_parse_memmap);
404
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]