* [PATCH v3 1/4] MIPS: Refactor early_parse_mem() to fix mem= parameter
2022-02-28 13:23 [PATCH v3 0/4] MIPS: Modify mem= and memmap= parameter Tiezhu Yang
@ 2022-02-28 13:23 ` Tiezhu Yang
2022-02-28 17:36 ` kernel test robot
2022-02-28 13:23 ` [PATCH v3 2/4] memblock: Introduce memblock_mem_range_remove_map() Tiezhu Yang
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Tiezhu Yang @ 2022-02-28 13:23 UTC (permalink / raw)
To: Thomas Bogendoerfer, Mike Rapoport, Andrew Morton
Cc: Xuefeng Li, linux-mips, linux-mm, linux-kernel
According to Documentation/admin-guide/kernel-parameters.txt,
the kernel command-line parameter mem= means "Force usage of
a specific amount of memory", but when add "mem=3G" to the
command-line, kernel boot hangs in sparse_init().
This commit is similar with the implementation of the other
archs such as arm64, powerpc and riscv, refactor the function
early_parse_mem() and then use memblock_enforce_memory_limit()
to limit the memory size.
With this patch, when add "mem=3G" to the command-line, the
kernel boots successfully, we can see the following messages:
[ 0.000000] Memory limited to 3072MB
...
[ 0.000000] Early memory node ranges
[ 0.000000] node 0: [mem 0x0000000000200000-0x000000000effffff]
[ 0.000000] node 0: [mem 0x0000000090200000-0x00000000ffffffff]
[ 0.000000] node 0: [mem 0x0000000120000000-0x00000001613fffff]
...
[ 0.000000] Memory: 3005280K/3145728K available (...)
After login, the output of free command is consistent with the
above log.
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
arch/mips/kernel/setup.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index f979adf..6b6d718 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -339,27 +339,15 @@ static void __init bootmem_init(void)
#endif /* CONFIG_SGI_IP27 */
static int usermem __initdata;
+static phys_addr_t memory_limit;
static int __init early_parse_mem(char *p)
{
- phys_addr_t start, size;
-
- /*
- * If a user specifies memory size, we
- * blow away any automatically generated
- * size.
- */
- if (usermem == 0) {
- usermem = 1;
- memblock_remove(memblock_start_of_DRAM(),
- memblock_end_of_DRAM() - memblock_start_of_DRAM());
- }
- start = 0;
- size = memparse(p, &p);
- if (*p == '@')
- start = memparse(p + 1, &p);
+ if (!p)
+ return 1;
- memblock_add(start, size);
+ memory_limit = memparse(p, &p) & PAGE_MASK;
+ pr_notice("Memory limited to %lldMB\n", memory_limit >> 20);
return 0;
}
@@ -678,6 +666,10 @@ static void __init arch_mem_init(char **cmdline_p)
memblock_reserve(__pa_symbol(&__nosave_begin),
__pa_symbol(&__nosave_end) - __pa_symbol(&__nosave_begin));
+ /* Limit the memory. */
+ memblock_enforce_memory_limit(memory_limit);
+ memblock_allow_resize();
+
early_memtest(PFN_PHYS(ARCH_PFN_OFFSET), PFN_PHYS(max_low_pfn));
}
--
2.1.0
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v3 1/4] MIPS: Refactor early_parse_mem() to fix mem= parameter
2022-02-28 13:23 ` [PATCH v3 1/4] MIPS: Refactor early_parse_mem() to fix mem= parameter Tiezhu Yang
@ 2022-02-28 17:36 ` kernel test robot
0 siblings, 0 replies; 7+ messages in thread
From: kernel test robot @ 2022-02-28 17:36 UTC (permalink / raw)
To: Tiezhu Yang, Thomas Bogendoerfer, Mike Rapoport, Andrew Morton
Cc: llvm, kbuild-all, Linux Memory Management List, Xuefeng Li,
linux-mips, linux-kernel
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/20220228/202202282330.uO0sH1Bk-lkp@intel.com/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/8e3bd7f4c0a4003c328ef2d816454dd50810b974
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 8e3bd7f4c0a4003c328ef2d816454dd50810b974
# 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 <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> arch/mips/kernel/setup.c:350: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__); \
~~~~ ^~~~~~~~~~~
1 warning generated.
vim +350 arch/mips/kernel/setup.c
343
344 static int __init early_parse_mem(char *p)
345 {
346 if (!p)
347 return 1;
348
349 memory_limit = memparse(p, &p) & PAGE_MASK;
> 350 pr_notice("Memory limited to %lldMB\n", memory_limit >> 20);
351
352 return 0;
353 }
354 early_param("mem", early_parse_mem);
355
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/4] memblock: Introduce memblock_mem_range_remove_map()
2022-02-28 13:23 [PATCH v3 0/4] MIPS: Modify mem= and memmap= parameter Tiezhu Yang
2022-02-28 13:23 ` [PATCH v3 1/4] MIPS: Refactor early_parse_mem() to fix mem= parameter Tiezhu Yang
@ 2022-02-28 13:23 ` Tiezhu Yang
2022-02-28 13:23 ` [PATCH v3 3/4] MIPS: Refactor early_parse_memmap() to fix memmap= parameter Tiezhu Yang
2022-02-28 13:23 ` [PATCH v3 4/4] MIPS: Remove not used variable usermem Tiezhu Yang
3 siblings, 0 replies; 7+ messages in thread
From: Tiezhu Yang @ 2022-02-28 13:23 UTC (permalink / raw)
To: Thomas Bogendoerfer, Mike Rapoport, Andrew Morton
Cc: Xuefeng Li, linux-mips, linux-mm, linux-kernel
This is preparation for supporting memmap=limit@base parameter,
no functionality change.
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
include/linux/memblock.h | 1 +
mm/memblock.c | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 50ad196..e558d2c 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -482,6 +482,7 @@ phys_addr_t memblock_end_of_DRAM(void);
void memblock_enforce_memory_limit(phys_addr_t memory_limit);
void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size);
void memblock_mem_limit_remove_map(phys_addr_t limit);
+void memblock_mem_range_remove_map(phys_addr_t base, phys_addr_t limit);
bool memblock_is_memory(phys_addr_t addr);
bool memblock_is_map_memory(phys_addr_t addr);
bool memblock_is_region_memory(phys_addr_t base, phys_addr_t size);
diff --git a/mm/memblock.c b/mm/memblock.c
index 1018e50..2476d15d 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1723,7 +1723,7 @@ void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
base + size, PHYS_ADDR_MAX);
}
-void __init memblock_mem_limit_remove_map(phys_addr_t limit)
+void __init memblock_mem_range_remove_map(phys_addr_t base, phys_addr_t limit)
{
phys_addr_t max_addr;
@@ -1736,7 +1736,12 @@ void __init memblock_mem_limit_remove_map(phys_addr_t limit)
if (max_addr == PHYS_ADDR_MAX)
return;
- memblock_cap_memory_range(0, max_addr);
+ memblock_cap_memory_range(base, max_addr);
+}
+
+void __init memblock_mem_limit_remove_map(phys_addr_t limit)
+{
+ memblock_mem_range_remove_map(0, limit);
}
static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)
--
2.1.0
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v3 3/4] MIPS: Refactor early_parse_memmap() to fix memmap= parameter
2022-02-28 13:23 [PATCH v3 0/4] MIPS: Modify mem= and memmap= parameter Tiezhu Yang
2022-02-28 13:23 ` [PATCH v3 1/4] MIPS: Refactor early_parse_mem() to fix mem= parameter Tiezhu Yang
2022-02-28 13:23 ` [PATCH v3 2/4] memblock: Introduce memblock_mem_range_remove_map() Tiezhu Yang
@ 2022-02-28 13:23 ` Tiezhu Yang
2022-02-28 17:36 ` kernel test robot
2022-02-28 13:23 ` [PATCH v3 4/4] MIPS: Remove not used variable usermem Tiezhu Yang
3 siblings, 1 reply; 7+ messages in thread
From: Tiezhu Yang @ 2022-02-28 13:23 UTC (permalink / raw)
To: Thomas Bogendoerfer, Mike Rapoport, Andrew Morton
Cc: Xuefeng Li, linux-mips, linux-mm, linux-kernel
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 <yangtiezhu@loongson.cn>
---
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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v3 3/4] MIPS: Refactor early_parse_memmap() to fix memmap= parameter
2022-02-28 13:23 ` [PATCH v3 3/4] MIPS: Refactor early_parse_memmap() to fix memmap= parameter Tiezhu Yang
@ 2022-02-28 17:36 ` kernel test robot
0 siblings, 0 replies; 7+ messages in thread
From: kernel test robot @ 2022-02-28 17:36 UTC (permalink / raw)
To: Tiezhu Yang, Thomas Bogendoerfer, Mike Rapoport, Andrew Morton
Cc: llvm, kbuild-all, Linux Memory Management List, Xuefeng Li,
linux-mips, linux-kernel
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/202203010025.PU3GDSWx-lkp@intel.com/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 <lkp@intel.com>
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/kbuild-all@lists.01.org
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 4/4] MIPS: Remove not used variable usermem
2022-02-28 13:23 [PATCH v3 0/4] MIPS: Modify mem= and memmap= parameter Tiezhu Yang
` (2 preceding siblings ...)
2022-02-28 13:23 ` [PATCH v3 3/4] MIPS: Refactor early_parse_memmap() to fix memmap= parameter Tiezhu Yang
@ 2022-02-28 13:23 ` Tiezhu Yang
3 siblings, 0 replies; 7+ messages in thread
From: Tiezhu Yang @ 2022-02-28 13:23 UTC (permalink / raw)
To: Thomas Bogendoerfer, Mike Rapoport, Andrew Morton
Cc: Xuefeng Li, linux-mips, linux-mm, linux-kernel
Now, the variable usermem is not used any more, just remove it.
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
arch/mips/kernel/setup.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index c940405..89fdaae 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -338,7 +338,6 @@ static void __init bootmem_init(void)
#endif /* CONFIG_SGI_IP27 */
-static int usermem __initdata;
static phys_addr_t memory_limit;
static phys_addr_t memory_base;
@@ -628,10 +627,6 @@ static void __init arch_mem_init(char **cmdline_p)
*cmdline_p = command_line;
parse_early_param();
-
- if (usermem)
- pr_info("User-defined physical RAM map overwrite\n");
-
check_kernel_sections_mem();
early_init_fdt_reserve_self();
--
2.1.0
^ permalink raw reply [flat|nested] 7+ messages in thread