init_mm: cleanup ARCH's text/data/brk setup code
Subsystems (15)
v2 cover init_mm: cleanup ARCH's text/data/brk setup code
Add setup_initial_init_mm() helper, then use it
to cleanup the text, data and brk setup code.
v2:
- change argument from "char *" to "void *" setup_initial_init_mm() suggested by Geert Uytterhoeven
- use NULL instead of (void *)0 on h8300 and m68k
- collect ACKs
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Kefeng Wang (15):
mm: add setup_initial_init_mm() helper
arc: convert to setup_initial_init_mm()
arm: convert to setup_initial_init_mm()
arm64: convert to setup_initial_init_mm()
csky: convert to setup_initial_init_mm()
h8300: convert to setup_initial_init_mm()
m68k: convert to setup_initial_init_mm()
nds32: convert to setup_initial_init_mm()
nios2: convert to setup_initial_init_mm()
openrisc: convert to setup_initial_init_mm()
powerpc: convert to setup_initial_init_mm()
riscv: convert to setup_initial_init_mm()
s390: convert to setup_initial_init_mm()
sh: convert to setup_initial_init_mm()
x86: convert to setup_initial_init_mm()
arch/arc/mm/init.c | 5 +---- arch/arm/kernel/setup.c | 5 +---- arch/arm64/kernel/setup.c | 5 +---- arch/csky/kernel/setup.c | 5 +---- arch/h8300/kernel/setup.c | 5 +---- arch/m68k/kernel/setup_mm.c | 5 +---- arch/m68k/kernel/setup_no.c | 5 +---- arch/nds32/kernel/setup.c | 5 +---- arch/nios2/kernel/setup.c | 5 +---- arch/openrisc/kernel/setup.c | 5 +---- arch/powerpc/kernel/setup-common.c | 5 +---- arch/riscv/kernel/setup.c | 5 +---- arch/s390/kernel/setup.c | 5 +---- arch/sh/kernel/setup.c | 5 +---- arch/x86/kernel/setup.c | 5 +---- include/linux/mm_types.h | 8 ++++++++ 16 files changed, 23 insertions(+), 60 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/15 mm: add setup_initial_init_mm() helper
Add setup_initial_init_mm() helper to setup kernel text, data and brk.
--- include/linux/mm_types.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/linux/mm_types.h +8 -0
@@ -572,6 +572,14 @@ struct mm_struct { };extern struct mm_struct init_mm; +static inline void setup_initial_init_mm (void *start_code,void *end_code, +void *end_data,void *brk) +{ + init_mm.start_code = (unsigned long )start_code; + init_mm.end_code = (unsigned long )end_code; + init_mm.end_data = (unsigned long )end_data; + init_mm.brk = (unsigned long )brk; +}/* Pointer magic because the dynamic array size confuses some compilers. */ static inline void mm_init_cpumask (struct mm_struct *mm)
Signature · 1 line
2.26.2
Mike Rapoport
reviewerRe: [PATCH v2 01/15] mm: add setup_initial_init_mm() helper
Hello Kefeng,
Quoted 24 lines · Kefeng Wang
Add
setup_initial_init_mm()helper to setup kernel text, data and brk.Cc linux-snps-arc at lists.infradead.orgCc linux-arm-kernel at lists.infradead.orgCc linux-csky at vger.kernel.orgCc uclinux-h8-devel at lists.sourceforge.jpCc linux-m68k at lists.linux-m68k.orgCc openrisc at lists.librecores.orgCc linuxppc-dev at lists.ozlabs.orgCc linux-riscv at lists.infradead.orgCc linux-sh at vger.kernel.orgCc linux-s390 at vger.kernel.orgCc x86 at kernel.orgSigned-off-by Kefeng Wang <[email protected]>--- include/linux/mm_types.h | 8 ++++++++ 1 file changed, 8 insertions(+)include/linux/mm_types.h +0
-0
include/linux/mm_types.h struct mm_struct { · line 576
Quoted 5 lines
include/linux/mm_types.h +2
-0@@ -572,6 +572,14 @@ struct mm_struct { };extern struct mm_struct init_mm; +static inline void setup_initial_init_mm (void *start_code,void *end_code, +void *end_data,void *brk)
I think it's not that performance sensitive to make it inline. It can be placed in mm/init-mm.c with a forward declaration in mm.h
Quoted 17 lines
include/linux/mm_types.h +6
-0+{ + init_mm.start_code = (unsigned long )start_code; + init_mm.end_code = (unsigned long )end_code; + init_mm.end_data = (unsigned long )end_data; + init_mm.brk = (unsigned long )brk; +}/* Pointer magic because the dynamic array size confuses some compilers. */ static inline void mm_init_cpumask (struct mm_struct *mm)Signature · 7 lines
2.26.2 _______________________________________________ linux-riscv mailing list linux-riscv at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
Signature · 2 lines
Sincerely yours, Mike.
Re: [PATCH v2 01/15] mm: add setup_initial_init_mm() helper
Quoted 29 lines · Mike Rapoport
Hello Kefeng,
Quoted 26 lines · Kefeng Wang
Add
setup_initial_init_mm()helper to setup kernel text, data and brk.Cc linux-snps-arc at lists.infradead.orgCc linux-arm-kernel at lists.infradead.orgCc linux-csky at vger.kernel.orgCc uclinux-h8-devel at lists.sourceforge.jpCc linux-m68k at lists.linux-m68k.orgCc openrisc at lists.librecores.orgCc linuxppc-dev at lists.ozlabs.orgCc linux-riscv at lists.infradead.orgCc linux-sh at vger.kernel.orgCc linux-s390 at vger.kernel.orgCc x86 at kernel.orgSigned-off-by Kefeng Wang <[email protected]>--- include/linux/mm_types.h | 8 ++++++++ 1 file changed, 8 insertions(+)include/linux/mm_types.h +0
-0@@ -572,6 +572,14 @@ struct mm_struct { };
Quoted 5 lines
include/linux/mm_types.h struct mm_struct { · line 576
Quoted 3 lines
include/linux/mm_types.h +2
-0extern struct mm_struct init_mm; +static inline void setup_initial_init_mm (void *start_code,void *end_code, +void *end_data,void *brk)I think it's not that performance sensitive to make it inline. It can be placed in
mm/init-mm.cwith a forward declaration inmm.h
Ok, I will send a update one with this change.
Quoted 18 lines
Quoted 18 lines
include/linux/mm_types.h +6
-0+{ + init_mm.start_code = (unsigned long )start_code; + init_mm.end_code = (unsigned long )end_code; + init_mm.end_data = (unsigned long )end_data; + init_mm.brk = (unsigned long )brk; +}/* Pointer magic because the dynamic array size confuses some compilers. */ static inline void mm_init_cpumask (struct mm_struct *mm)Signature · 7 lines
2.26.2 _______________________________________________ linux-riscv mailing list linux-riscv at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 1/1 mm: add setup_initial_init_mm() helper
In reply to Mike RapoportAdd setup_initial_init_mm() helper to setup kernel text, data and brk.
---
v3: declaration in mm.h, implemention in init-mm.c
include/linux/mm.h | 3 +++ mm/init-mm.c | 9 +++++++++ 2 files changed, 12 insertions(+)
include/linux/mm.h +3 -0
@@ -244,6 +244,9 @@ int __add_to_page_cache_locked(struct page *page, struct address_space *mapping,#define lru_to_page (head) (list_entry((head)->prev, struct page, lru)) +void setup_initial_init_mm (void *start_code,void *end_code, +void *end_data,void *brk); +/* * Linux kernel virtual memory manager primitives. * The idea being to have a "virtual" mm in the same way
mm/init-mm.c +9 -0
@@ -40,3 +40,12 @@ struct mm_struct init_mm = { .cpu_bitmap = CPU_BITS_NONE, INIT_MM_CONTEXT(init_mm) }; + +void setup_initial_init_mm (void *start_code,void *end_code, +void *end_data,void *brk) +{ + init_mm.start_code = (unsigned long )start_code; + init_mm.end_code = (unsigned long )end_code; + init_mm.end_data = (unsigned long )end_data; + init_mm.brk = (unsigned long )brk; +}
Signature · 1 line
2.26.2
PATCH v2 2/15 arc: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/arc/mm/init.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arc/mm/init.c +1 -4
@@ -94,10 +94,7 @@ void __init setup_arch_memory(void) {unsigned long max_zone_pfn[MAX_NR_ZONES ] = {0 }; - init_mm.start_code = (unsigned long )_text; - init_mm.end_code = (unsigned long )_etext; - init_mm.end_data = (unsigned long )_edata; - init_mm.brk = (unsigned long )_end; +setup_initial_init_mm (_text, _etext, _edata, _end);/* first page of system - kernel .vector starts here */ min_low_pfn =virt_to_pfn (CONFIG_LINUX_RAM_BASE );
Signature · 1 line
2.26.2
Re: [PATCH v2 02/15] arc: convert to setup_initial_init_mm()
Quoted 5 lines · Kefeng Wang
Use
setup_initial_init_mm()helper to simplify code.Cc Vineet Gupta <[email protected]>Signed-off-by Kefeng Wang <[email protected]>
Thx,
-Vineet
Quoted 20 lines
--- arch/arc/mm/init.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)arch/arc/mm/init.c +1
-4@@ -94,10 +94,7 @@ void __init setup_arch_memory(void) {unsigned long max_zone_pfn[MAX_NR_ZONES ] = {0 }; - init_mm.start_code = (unsigned long )_text; - init_mm.end_code = (unsigned long )_etext; - init_mm.end_data = (unsigned long )_edata; - init_mm.brk = (unsigned long )_end; +setup_initial_init_mm (_text, _etext, _edata, _end);/* first page of system - kernel .vector starts here */ min_low_pfn =virt_to_pfn (CONFIG_LINUX_RAM_BASE );
PATCH v2 3/15 arm: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/arm/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/kernel/setup.c +1 -4
@@ -1114,10 +1114,7 @@ void __init setup_arch(char **cmdline_p)if (mdesc->reboot_mode !=REBOOT_HARD ) reboot_mode = mdesc->reboot_mode; - init_mm.start_code = (unsigned long ) _text; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long ) _end; +setup_initial_init_mm (_text, _etext, _edata, _end);/* populate cmd_line too for later use, preserving boot_command_line */ strlcpy (cmd_line, boot_command_line,COMMAND_LINE_SIZE );
Signature · 1 line
2.26.2
Re: [PATCH v2 03/15] arm: convert to setup_initial_init_mm()
Quoted 5 lines · Kefeng Wang
Use
setup_initial_init_mm()helper to simplify code.Cc Russell King <[email protected]>Signed-off-by Kefeng Wang <[email protected]>
Thanks.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
PATCH v2 4/15 arm64: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/arm64/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm64/kernel/setup.c +1 -4
@@ -298,10 +298,7 @@ u64 cpu_logical_map(unsigned int cpu) void __init __no_sanitize_address setup_arch(char **cmdline_p) { - init_mm.start_code = (unsigned long ) _stext; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long ) _end; +setup_initial_init_mm (_stext, _etext, _edata, _end); *cmdline_p = boot_command_line;
Signature · 1 line
2.26.2
Re: [PATCH v2 04/15] arm64: convert to setup_initial_init_mm()
Quoted 6 lines · Kefeng Wang
Use
setup_initial_init_mm()helper to simplify code.Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Kefeng Wang <[email protected]>
PATCH v2 5/15 csky: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/csky/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/csky/kernel/setup.c +1 -4
@@ -78,10 +78,7 @@ void __init setup_arch(char **cmdline_p)pr_info ("Phys. mem: %ldMB\n" , (unsigned long )memblock_phys_mem_size ()/1024 /1024 ); - init_mm.start_code = (unsigned long ) _stext; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long ) _end; +setup_initial_init_mm (_stext, _etext, _edata, _end);parse_early_param ();
Signature · 1 line
2.26.2
PATCH v2 6/15 h8300: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/h8300/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/h8300/kernel/setup.c +1 -4
@@ -97,10 +97,7 @@ void __init setup_arch(char **cmdline_p) {unflatten_and_copy_device_tree (); - init_mm.start_code = (unsigned long ) _stext; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long )0 ; +setup_initial_init_mm (_stext, _etext, _edata,NULL );pr_notice ("\r\n\nuClinux " CPU "\n" );pr_notice ("Flat model support (C) 1998,1999 Kenneth Albanowski, D. Jeff Dionne\n" );
Signature · 1 line
2.26.2
PATCH v2 7/15 m68k: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/m68k/kernel/setup_mm.c | 5 +---- arch/m68k/kernel/setup_no.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-)
arch/m68k/kernel/setup_mm.c +1 -4
@@ -258,10 +258,7 @@ void __init setup_arch(char **cmdline_p) } } - init_mm.start_code =PAGE_OFFSET ; - init_mm.end_code = (unsigned long )_etext; - init_mm.end_data = (unsigned long )_edata; - init_mm.brk = (unsigned long )_end; +setup_initial_init_mm ((void *)PAGE_OFFSET , _etext, _edata, _end);#if defined(CONFIG_BOOTPARAM )strncpy (m68k_command_line,CONFIG_BOOTPARAM_STRING ,CL_SIZE );
arch/m68k/kernel/setup_no.c +1 -4
@@ -87,10 +87,7 @@ void __init setup_arch(char **cmdline_p) memory_start =PAGE_ALIGN (_ramstart); memory_end = _ramend; - init_mm.start_code = (unsigned long ) &_stext; - init_mm.end_code = (unsigned long ) &_etext; - init_mm.end_data = (unsigned long ) &_edata; - init_mm.brk = (unsigned long )0 ; +setup_initial_init_mm (_stext, _etext, _edata,NULL );config_BSP (&command_line[0 ],sizeof (command_line));
Signature · 1 line
2.26.2
PATCH v2 8/15 nds32: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/nds32/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/nds32/kernel/setup.c +1 -4
@@ -294,10 +294,7 @@ void __init setup_arch(char **cmdline_p)setup_cpuinfo (); - init_mm.start_code = (unsigned long )&_stext; - init_mm.end_code = (unsigned long )&_etext; - init_mm.end_data = (unsigned long )&_edata; - init_mm.brk = (unsigned long )&_end; +setup_initial_init_mm (_stext, _etext, _edata, _end);/* setup bootmem allocator */ setup_memory ();
Signature · 1 line
2.26.2
PATCH v2 9/15 nios2: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/nios2/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/nios2/kernel/setup.c +1 -4
@@ -156,10 +156,7 @@ void __init setup_arch(char **cmdline_p) memory_start =memblock_start_of_DRAM (); memory_end =memblock_end_of_DRAM (); - init_mm.start_code = (unsigned long ) _stext; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long ) _end; +setup_initial_init_mm (_stext, _etext, _edata, _end); init_task.thread.kregs = &fake_regs;/* Keep a copy of command line */
Signature · 1 line
2.26.2
PATCH v2 10/15 openrisc: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/openrisc/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/openrisc/kernel/setup.c +1 -4
@@ -293,10 +293,7 @@ void __init setup_arch(char **cmdline_p)#endif /* process 1's initial memory region is the kernel code/data */ - init_mm.start_code = (unsigned long )_stext; - init_mm.end_code = (unsigned long )_etext; - init_mm.end_data = (unsigned long )_edata; - init_mm.brk = (unsigned long )_end; +setup_initial_init_mm (_stext, _etext, _edata, _end);#ifdef CONFIG_BLK_DEV_INITRD if (initrd_start == initrd_end) {
Signature · 1 line
2.26.2
PATCH v2 11/15 powerpc: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
Note klimit is (unsigned long) _end, with new helper, will use _end directly.
--- arch/powerpc/kernel/setup-common.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/powerpc/kernel/setup-common.c +1 -4
@@ -927,10 +927,7 @@ void __init setup_arch(char **cmdline_p)klp_init_thread_info (&init_task); - init_mm.start_code = (unsigned long )_stext; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = klimit; +setup_initial_init_mm (_stext, _etext, _edata, _end);mm_iommu_init (&init_mm);irqstack_early_init ();
Signature · 1 line
2.26.2
PATCH v2 12/15 riscv: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/riscv/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/riscv/kernel/setup.c +1 -4
@@ -264,10 +264,7 @@ static void __init parse_dtb(void)void __init setup_arch (char **cmdline_p) {parse_dtb (); - init_mm.start_code = (unsigned long ) _stext; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long ) _end; +setup_initial_init_mm (_stext, _etext, _edata, _end); *cmdline_p = boot_command_line;
Signature · 1 line
2.26.2
Re: [PATCH v2 12/15] riscv: convert to setup_initial_init_mm()
Quoted 15 lines · On Fri, 04 Jun 2021 00:06:30 PDT (-0700), [email protected] wrote:
Use
setup_initial_init_mm()helper to simplify code.Cc Paul Walmsley <[email protected]>Cc Palmer Dabbelt <[email protected]>Signed-off-by Kefeng Wang <[email protected]>--- arch/riscv/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)arch/riscv/kernel/setup.c +0
-0
arch/riscv/kernel/setup.c static void __init parse_dtb(void) · line 269
Quoted 10 lines
arch/riscv/kernel/setup.c +1
-4@@ -264,10 +264,7 @@ static void __init parse_dtb(void)void __init setup_arch (char **cmdline_p) {parse_dtb (); - init_mm.start_code = (unsigned long ) _stext; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long ) _end; +setup_initial_init_mm (_stext, _etext, _edata, _end); *cmdline_p = boot_command_line;
PATCH v2 13/15 s390: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/s390/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/s390/kernel/setup.c +1 -4
@@ -1119,10 +1119,7 @@ void __init setup_arch(char **cmdline_p)ROOT_DEV = Root_RAM0; - init_mm.start_code = (unsigned long ) _text; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long ) _end; +setup_initial_init_mm (_text, _etext, _edata, _end);if (IS_ENABLED (CONFIG_EXPOLINE_AUTO ))nospec_auto_detect ();
Signature · 1 line
2.26.2
PATCH v2 14/15 sh: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/sh/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/sh/kernel/setup.c +1 -4
@@ -294,10 +294,7 @@ void __init setup_arch(char **cmdline_p)if (!MOUNT_ROOT_RDONLY ) root_mountflags &= ~MS_RDONLY ; - init_mm.start_code = (unsigned long ) _text; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = (unsigned long ) _end; +setup_initial_init_mm (_text, _etext, _edata, _end); code_resource.start =virt_to_phys (_text); code_resource.end =virt_to_phys (_etext)-1 ;
Signature · 1 line
2.26.2
PATCH v2 15/15 x86: convert to setup_initial_init_mm()
In reply to Kefeng WangUse setup_initial_init_mm() helper to simplify code.
--- arch/x86/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/kernel/setup.c +1 -4
@@ -868,10 +868,7 @@ void __init setup_arch(char **cmdline_p)if (!boot_params.hdr.root_flags) root_mountflags &= ~MS_RDONLY ; - init_mm.start_code = (unsigned long ) _text; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = _brk_end; +setup_initial_init_mm (_text, _etext, _edata, _brk_end); code_resource.start =__pa_symbol (_text); code_resource.end =__pa_symbol (_etext)-1 ;
Signature · 1 line
2.26.2
Andrew Morton
maintainerRe: [PATCH v2 15/15] x86: convert to setup_initial_init_mm()
Quoted 8 lines · On Fri, 4 Jun 2021 15:06:33 +0800 Kefeng Wang <[email protected]>…
Use
setup_initial_init_mm()helper to simplify code....
arch/x86/kernel/setup.c +0
-0@@ -868,10 +868,7 @@ void __init setup_arch(char **cmdline_p)
arch/x86/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 874
Quoted 10 lines
arch/x86/kernel/setup.c +1
-4if (!boot_params.hdr.root_flags) root_mountflags &= ~MS_RDONLY ; - init_mm.start_code = (unsigned long ) _text; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = _brk_end; +setup_initial_init_mm (_text, _etext, _edata, _brk_end); code_resource.start =__pa_symbol (_text); code_resource.end =__pa_symbol (_etext)-1 ;
arch/x86/kernel/setup.c:873:47: warning: passing argument 4 of 'setup_initial_init_mm' makes pointer from integer without a cast [-Wint-conversion]
873 | setup_initial_init_mm(_text, _etext, _edata, _brk_end);
| ^~~~~~~~
| |
| long unsigned int
In file included from ./include/linux/pid_namespace.h:7,
from ./include/linux/ptrace.h:10,
from ./include/linux/elfcore.h:11,
from ./include/linux/crash_core.h:6,
from ./include/linux/kexec.h:18,
from ./include/linux/crash_dump.h:5,
from arch/x86/kernel/setup.c:9:
./include/linux/mm.h:248:29: note: expected 'void *' but argument is of type 'long unsigned int'
248 | void *end_data, void *brk);
| ~~~~~~^~~afaict the other architectures will warn this way, not sure.
Please check all that, refresh ,retest and resend?
Re: [PATCH v2 15/15] x86: convert to setup_initial_init_mm()
Quoted 37 lines · Andrew Morton
Quoted 8 lines · On Fri, 4 Jun 2021 15:06:33 +0800 Kefeng Wang <[email protected]>…
Use
setup_initial_init_mm()helper to simplify code....
arch/x86/kernel/setup.c +0
-0@@ -868,10 +868,7 @@ void __init setup_arch(char **cmdline_p)arch/x86/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 874
Quoted 10 lines
arch/x86/kernel/setup.c +1
-4if (!boot_params.hdr.root_flags) root_mountflags &= ~MS_RDONLY ; - init_mm.start_code = (unsigned long ) _text; - init_mm.end_code = (unsigned long ) _etext; - init_mm.end_data = (unsigned long ) _edata; - init_mm.brk = _brk_end; +setup_initial_init_mm (_text, _etext, _edata, _brk_end); code_resource.start =__pa_symbol (_text); code_resource.end =__pa_symbol (_etext)-1 ;
arch/x86/kernel/setup.c:873:47: warning: passing argument 4 of 'setup_initial_init_mm' makes pointer from integer without a cast [-Wint-conversion]873 | setup_initial_init_mm(_text, _etext, _edata, _brk_end); | ^~~~~~~~ | | | long unsigned int In file included from ./include/linux/pid_namespace.h:7, from ./include/linux/ptrace.h:10, from ./include/linux/elfcore.h:11, from ./include/linux/crash_core.h:6, from ./include/linux/kexec.h:18, from ./include/linux/crash_dump.h:5, from arch/x86/kernel/setup.c:9: ./include/linux/mm.h:248:29: note: expected 'void *' but argument is of type 'long unsigned int' 248 | void *end_data, void *brk); | ~~~~~~^~~
Quoted 1 line
afaict the other architectures will warn this way, not sure.
I check all archs again, the x86/m68k/powerpc/h8300 has use some value which is not pointer ,
other are changed, but forget this one. I do compile, but I don't know why I missed it, sorry about
this.
Quoted 4 lines
Please check all that, refresh ,retest and resend? .
Mike Rapoport
reviewerHello Kefeng,
Quoted 27 lines · Kefeng Wang
Add
setup_initial_init_mm()helper, then use it to cleanup the text, data and brk setup code.v2:
- change argument from "char *" to "void *"setup_initial_init_mm()suggested by Geert Uytterhoeven
- use NULL instead of (void *)0 on h8300 and m68k
- collect ACKsCc: linux-snps-arc at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-csky at vger.kernel.org
Cc: uclinux-h8-devel at lists.sourceforge.jp
Cc: linux-m68k at lists.linux-m68k.org
Cc: openrisc at lists.librecores.org
Cc: linuxppc-dev at lists.ozlabs.org
Cc: linux-riscv at lists.infradead.org
Cc: linux-sh at vger.kernel.org
Cc: linux-s390 at vger.kernel.org Kefeng Wang (15):
mm: addsetup_initial_init_mm()helper
arc: convert tosetup_initial_init_mm()
arm: convert tosetup_initial_init_mm()
arm64: convert tosetup_initial_init_mm()
csky: convert tosetup_initial_init_mm()
h8300: convert tosetup_initial_init_mm()
m68k: convert tosetup_initial_init_mm()
Quoted 8 lines
nds32: convert to
setup_initial_init_mm()
nios2: convert tosetup_initial_init_mm()
openrisc: convert tosetup_initial_init_mm()
powerpc: convert tosetup_initial_init_mm()
riscv: convert tosetup_initial_init_mm()
s390: convert tosetup_initial_init_mm()
sh: convert tosetup_initial_init_mm()
x86: convert tosetup_initial_init_mm()
I might be missing something, but AFAIU the init_mm.start_code and other fields are not used really early so the new setup_initial_init_mm() function can be called in the generic code outside setup_arch(), e.g in mm_init().
Quoted 26 lines
arch/arc/mm/init.c | 5 +---- arch/arm/kernel/setup.c | 5 +---- arch/arm64/kernel/setup.c | 5 +---- arch/csky/kernel/setup.c | 5 +---- arch/h8300/kernel/setup.c | 5 +---- arch/m68k/kernel/setup_mm.c | 5 +---- arch/m68k/kernel/setup_no.c | 5 +---- arch/nds32/kernel/setup.c | 5 +---- arch/nios2/kernel/setup.c | 5 +---- arch/openrisc/kernel/setup.c | 5 +---- arch/powerpc/kernel/setup-common.c | 5 +---- arch/riscv/kernel/setup.c | 5 +---- arch/s390/kernel/setup.c | 5 +---- arch/sh/kernel/setup.c | 5 +---- arch/x86/kernel/setup.c | 5 +---- include/linux/mm_types.h | 8 ++++++++ 16 files changed, 23 insertions(+), 60 deletions(-)Signature · 7 lines
2.26.2 _______________________________________________ linux-riscv mailing list linux-riscv at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
Signature · 2 lines
Sincerely yours, Mike.
Quoted 38 lines · Mike Rapoport
Hello Kefeng,
Quoted 27 lines · Kefeng Wang
Add
setup_initial_init_mm()helper, then use it to cleanup the text, data and brk setup code.v2:
- change argument from "char *" to "void *"setup_initial_init_mm()suggested by Geert Uytterhoeven
- use NULL instead of (void *)0 on h8300 and m68k
- collect ACKsCc: linux-snps-arc at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-csky at vger.kernel.org
Cc: uclinux-h8-devel at lists.sourceforge.jp
Cc: linux-m68k at lists.linux-m68k.org
Cc: openrisc at lists.librecores.org
Cc: linuxppc-dev at lists.ozlabs.org
Cc: linux-riscv at lists.infradead.org
Cc: linux-sh at vger.kernel.org
Cc: linux-s390 at vger.kernel.org Kefeng Wang (15):
mm: addsetup_initial_init_mm()helper
arc: convert tosetup_initial_init_mm()
arm: convert tosetup_initial_init_mm()
arm64: convert tosetup_initial_init_mm()
csky: convert tosetup_initial_init_mm()
h8300: convert tosetup_initial_init_mm()
m68k: convert tosetup_initial_init_mm()Quoted 8 lines
nds32: convert to
setup_initial_init_mm()
nios2: convert tosetup_initial_init_mm()
openrisc: convert tosetup_initial_init_mm()
powerpc: convert tosetup_initial_init_mm()
riscv: convert tosetup_initial_init_mm()
s390: convert tosetup_initial_init_mm()
sh: convert tosetup_initial_init_mm()
x86: convert tosetup_initial_init_mm()
Quoted 4 lines
I might be missing something, but AFAIU the init_mm.start_code and other fields are not used really early so the new
setup_initial_init_mm()function can be called in the generic code outsidesetup_arch(), e.g inmm_init().
Hi Mikeļ¼ each architecture has their own value, not the same, eg m68K and
h8300, also the name of the text/code/brk is different in some arch, so I keep
unchanged.
Quoted 27 lines
Quoted 27 lines
arch/arc/mm/init.c | 5 +---- arch/arm/kernel/setup.c | 5 +---- arch/arm64/kernel/setup.c | 5 +---- arch/csky/kernel/setup.c | 5 +---- arch/h8300/kernel/setup.c | 5 +---- arch/m68k/kernel/setup_mm.c | 5 +---- arch/m68k/kernel/setup_no.c | 5 +---- arch/nds32/kernel/setup.c | 5 +---- arch/nios2/kernel/setup.c | 5 +---- arch/openrisc/kernel/setup.c | 5 +---- arch/powerpc/kernel/setup-common.c | 5 +---- arch/riscv/kernel/setup.c | 5 +---- arch/s390/kernel/setup.c | 5 +---- arch/sh/kernel/setup.c | 5 +---- arch/x86/kernel/setup.c | 5 +---- include/linux/mm_types.h | 8 ++++++++ 16 files changed, 23 insertions(+), 60 deletions(-)Signature · 7 lines
2.26.2 _______________________________________________ linux-riscv mailing list linux-riscv at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
Hi Kefeng,
Le 07/06/2021 à 02:55, Kefeng Wang a écrit :
Quoted 45 lines · Mike Rapoport
Quoted 38 lines
Hello Kefeng,
Quoted 27 lines · Kefeng Wang
Add
setup_initial_init_mm()helper, then use it to cleanup the text, data and brk setup code.v2:
- change argument from "char *" to "void *"setup_initial_init_mm()suggested by Geert Uytterhoeven
- use NULL instead of (void *)0 on h8300 and m68k
- collect ACKsCc: linux-snps-arc at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-csky at vger.kernel.org
Cc: uclinux-h8-devel at lists.sourceforge.jp
Cc: linux-m68k at lists.linux-m68k.org
Cc: openrisc at lists.librecores.org
Cc: linuxppc-dev at lists.ozlabs.org
Cc: linux-riscv at lists.infradead.org
Cc: linux-sh at vger.kernel.org
Cc: linux-s390 at vger.kernel.org Kefeng Wang (15):
mm: addsetup_initial_init_mm()helper
arc: convert tosetup_initial_init_mm()
arm: convert tosetup_initial_init_mm()
arm64: convert tosetup_initial_init_mm()
csky: convert tosetup_initial_init_mm()
h8300: convert tosetup_initial_init_mm()
m68k: convert tosetup_initial_init_mm()Quoted 8 lines
nds32: convert to
setup_initial_init_mm()
nios2: convert tosetup_initial_init_mm()
openrisc: convert tosetup_initial_init_mm()
powerpc: convert tosetup_initial_init_mm()
riscv: convert tosetup_initial_init_mm()
s390: convert tosetup_initial_init_mm()
sh: convert tosetup_initial_init_mm()
x86: convert tosetup_initial_init_mm()Quoted 4 lines
I might be missing something, but AFAIU the init_mm.start_code and other fields are not used really early so the new
setup_initial_init_mm()function can be called in the generic code outsidesetup_arch(), e.g inmm_init().
Quoted 5 lines
Hi Mike, each architecture has their own value, not the same, eg m68K and
h8300, also the name of the text/code/brk is different in some arch, so I keep
unchanged.
What you could do is to define a __weak function that architectures can override and call that function from mm_init() as suggested by Mike,
Something like:
void __weak setup_initial_init_mm(void)
{
init_mm.start_code = (unsigned long)_stext;
init_mm.end_code = (unsigned long)_etext;
init_mm.end_data = (unsigned long)_edata;
init_mm.brk = (unsigned long)_end;
}Then only the few architecture that are different would override it.
I see a few archictectures are usigne PAGE_OFFSET to set .start_code, but it is likely that this is equivalent to _stext.
Christophe
Quoted 70 lines · Christophe Leroy
Hi Kefeng,
Le 07/06/2021 à 02:55, Kefeng Wang a écrit :
Quoted 46 lines · Mike Rapoport
Quoted 38 lines
Hello Kefeng,
Quoted 27 lines · Kefeng Wang
Add
setup_initial_init_mm()helper, then use it to cleanup the text, data and brk setup code.v2:
- change argument from "char *" to "void *"setup_initial_init_mm()suggested by Geert Uytterhoeven
- use NULL instead of (void *)0 on h8300 and m68k
- collect ACKsCc: linux-snps-arc at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-csky at vger.kernel.org
Cc: uclinux-h8-devel at lists.sourceforge.jp
Cc: linux-m68k at lists.linux-m68k.org
Cc: openrisc at lists.librecores.org
Cc: linuxppc-dev at lists.ozlabs.org
Cc: linux-riscv at lists.infradead.org
Cc: linux-sh at vger.kernel.org
Cc: linux-s390 at vger.kernel.org Kefeng Wang (15):
mm: addsetup_initial_init_mm()helper
arc: convert tosetup_initial_init_mm()
arm: convert tosetup_initial_init_mm()
arm64: convert tosetup_initial_init_mm()
csky: convert tosetup_initial_init_mm()
h8300: convert tosetup_initial_init_mm()
m68k: convert tosetup_initial_init_mm()Quoted 8 lines
nds32: convert to
setup_initial_init_mm()
nios2: convert tosetup_initial_init_mm()
openrisc: convert tosetup_initial_init_mm()
powerpc: convert tosetup_initial_init_mm()
riscv: convert tosetup_initial_init_mm()
s390: convert tosetup_initial_init_mm()
sh: convert tosetup_initial_init_mm()
x86: convert tosetup_initial_init_mm()Quoted 5 lines
I might be missing something, but AFAIU the init_mm.start_code and other
fields are not used really early so the newsetup_initial_init_mm()function can be called in the generic code outsidesetup_arch(), e.g inmm_init().Quoted 7 lines
Hi Mike, each architecture has their own value, not the same, eg m68K and
h8300, also the name of the text/code/brk is different in some arch, so I keep
unchanged.
What you could do is to define a
__weakfunction that architectures can override and call that function frommm_init()as suggested by Mike,Something like:
void
__weaksetup_initial_init_mm(void)
{
init_mm.start_code = (unsigned long)_stext;
init_mm.end_code = (unsigned long)_etext;
init_mm.end_data = (unsigned long)_edata;
init_mm.brk = (unsigned long)_end;
}
Quoted 4 lines
Then only the few architecture that are different would override it.
I see a few archictectures are usigne
PAGE_OFFSETto set .start_code, but it is likely that this is equivalent to_stext.
Yes, the __weak function is option, but the change is only covered 14 archs, there are 7 other archs(alpha hexagon ia64
microblaze mips sparc um xtensa)without related setup code. Also like x86, it has own brk , maybe there are some
other different in some arch, so I think let's keep unchanged for now, thanks.
Quoted 4 lines
Christophe
.
Russell King (Oracle)
maintainerQuoted 4 lines · Christophe Leroy
Hi Kefeng,
What you could do is to define a
__weakfunction that architectures can override and call that function frommm_init()as suggested by Mike,
The problem with weak functions is that they bloat the kernel. Each time a weak function is overriden, it becomes dead unreachable code within the kernel image.
At some point we're probabily going to have to enable -ffunction-sections to (hopefully) allow the dead code to be discarded.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!