Skip to contentSkip to conversation

init_mm: cleanup ARCH's text/data/brk setup code

PATCH RESEND Applied Kefeng Wang 3 participants 22 messages Jun 8, 2021

Subsystems (15)
lore
Share & tools
lore
#0 lore raw

v3 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.

v3:
- resend all and fix x86 warning
- make helper declaration in mm.h, implemention in init-mm.c, suggested by Mike
- collect ACKs

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

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.h                 | 3 +++
 mm/init-mm.c                       | 9 +++++++++
 17 files changed, 27 insertions(+), 60 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH RESEND v3 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.h | 3 +++
 mm/init-mm.c       | 9 +++++++++
 2 files changed, 12 insertions(+)
include/linux/mm.h +3 -0
index c274f75efcf9..02aa057540b7 100644
@@ -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
index 153162669f80..b4a6f38fb51d 100644
@@ -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
#2 lore raw

Re: [PATCH v3 resend 01/15] mm: add setup_initial_init_mm() helper

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.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
Cc x86 at kernel.org
---
 include/linux/mm.h | 3 +++
 mm/init-mm.c       | 9 +++++++++
 2 files changed, 12 insertions(+)
include/linux/mm.h +0 -0
index c274f75efcf9..02aa057540b7 100644

include/linux/mm.h int __add_to_page_cache_locked(struct page *page, struct address_space *mapping, · line 249

Quoted 6 lines
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);
+

Gentle query -> is there any limitation to add inline functions in setup_arch() functions ?

Quoted 24 lines
include/linux/mm.h +0 -0
 /*
  * Linux kernel virtual memory manager primitives.
  * The idea being to have a "virtual" mm in the same way
mm/init-mm.c +9 -1
index 153162669f80..b4a6f38fb51d 100644
@@ -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;
+}
--

2.26.2

#3 lore raw

Re: [PATCH v3 resend 01/15] mm: add setup_initial_init_mm() helper

Le 08/06/2021 à 16:53, Souptick Joarder a écrit :

Quoted 28 lines · Kefeng Wang
Quoted 27 lines

Add setup_initial_init_mm() helper to setup kernel text, data and brk.

Cc 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
Cc x86 at kernel.org
---
  include/linux/mm.h | 3 +++
  mm/init-mm.c       | 9 +++++++++
  2 files changed, 12 insertions(+)
include/linux/mm.h +0 -0
index c274f75efcf9..02aa057540b7 100644
@@ -244,6 +244,9 @@ int __add_to_page_cache_locked(struct page *page, struct address_space *mapping,
 
Quoted 8 lines

include/linux/mm.h int __add_to_page_cache_locked(struct page *page, struct address_space *mapping, · line 249

Quoted 5 lines
include/linux/mm.h +3 -0
  #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);
+

Gentle query -> is there any limitation to add inline functions in setup_arch() functions ?

Kefeng just followed comment from Mike I guess, see
https://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210604070633.32363-2-wangkefeng.wang at huawei.com/#2696253

Christophe

#4 lore raw

Re: [PATCH v3 resend 01/15] mm: add setup_initial_init_mm() helper

Quoted 41 lines · Christophe Leroy
Quoted 28 lines · Souptick Joarder
Quoted 27 lines · Kefeng Wang

Add setup_initial_init_mm() helper to setup kernel text, data and brk.

Cc 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
Cc x86 at kernel.org
---
  include/linux/mm.h | 3 +++
  mm/init-mm.c       | 9 +++++++++
  2 files changed, 12 insertions(+)
include/linux/mm.h +0 -0
index c274f75efcf9..02aa057540b7 100644
@@ -244,6 +244,9 @@ int __add_to_page_cache_locked(struct page *page, struct address_space *mapping,
 
Quoted 8 lines

include/linux/mm.h int __add_to_page_cache_locked(struct page *page, struct address_space *mapping, · line 249

Quoted 5 lines
include/linux/mm.h +3 -0
  #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);
+

Gentle query -> is there any limitation to add inline functions in setup_arch() functions ?

Quoted 2 lines

Kefeng just followed comment from Mike I guess, see
https://patchwork.ozlabs.org/project/linuxppc-dev/patch/20210604070633.32363-2-wangkefeng.wang at huawei.com/#2696253

Ok.

Quoted 3 lines

Christophe

#5 lore raw

PATCH RESEND v3 2/15 arc: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index e2ed355438c9..33b8fab89022 100644
@@ -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
#6 lore raw

PATCH RESEND v3 3/15 arm: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index 1a5edf562e85..81de1bf07ba6 100644
@@ -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
#7 lore raw

PATCH RESEND v3 4/15 arm64: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index 61845c0821d9..bfc98f893a1b 100644
@@ -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
#8 lore raw

PATCH RESEND v3 5/15 csky: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index e93bc6f74432..c64e7be2045b 100644
@@ -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
#9 lore raw

PATCH RESEND v3 6/15 h8300: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index 0281f92eea3d..f757056305df 100644
@@ -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
#10 lore raw

PATCH RESEND v3 7/15 m68k: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index 017bac3aab80..4b51bfd38e5f 100644
@@ -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
index d1b7988efc91..5e4104f07a44 100644
@@ -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
#11 lore raw

PATCH RESEND v3 8/15 nds32: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index af82e996f412..41725eaf8bac 100644
@@ -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
#12 lore raw

PATCH RESEND v3 9/15 nios2: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index d2f21957e99c..cf8d687a2644 100644
@@ -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
#13 lore raw

PATCH RESEND v3 10/15 openrisc: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index c6f9e7b9f7cb..8ae2da6ac097 100644
@@ -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
#14 lore raw

PATCH RESEND v3 11/15 powerpc: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use setup_initial_init_mm() helper to simplify code.

Note klimit is (unsigned long) _end, with new helper, will use _end directly.

Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
---
 arch/powerpc/kernel/setup-common.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/powerpc/kernel/setup-common.c +1 -4
index 74a98fff2c2f..96697c6e1e16 100644
@@ -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
#15 lore raw

Re: [PATCH v3 resend 11/15] powerpc: convert to setup_initial_init_mm()

Quoted 5 lines · Kefeng Wang

Use setup_initial_init_mm() helper to simplify code.

Note klimit is (unsigned long) _end, with new helper, will use _end directly.

With this change klimit left with no user in this file and can be moved to some appropriate header.
But in a separate series.

Quoted 29 lines
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
---
 arch/powerpc/kernel/setup-common.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/powerpc/kernel/setup-common.c +1 -5
index 74a98fff2c2f..96697c6e1e16 100644
@@ -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();
--

2.26.2

#16 lore raw

Re: [PATCH v3 resend 11/15] powerpc: convert to setup_initial_init_mm()

Le 08/06/2021 à 16:36, Souptick Joarder a écrit :

Quoted 10 lines · Kefeng Wang
Quoted 5 lines

Use setup_initial_init_mm() helper to simplify code.

Note klimit is (unsigned long) _end, with new helper, will use _end directly.

With this change klimit left with no user in this file and can be moved to some appropriate header.
But in a separate series.

I have a patch to remove klimit, see https://patchwork.ozlabs.org/project/linuxppc-dev/patch/9fa9ba6807c17f93f35a582c199c646c4a8bfd9c.1622800638.git.christophe.leroy@csgroup.eu/

Christophe

Quoted 30 lines
Quoted 30 lines
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
---
  arch/powerpc/kernel/setup-common.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
arch/powerpc/kernel/setup-common.c +1 -5
index 74a98fff2c2f..96697c6e1e16 100644
@@ -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();
--

2.26.2

#17 lore raw

Re: [PATCH v3 resend 11/15] powerpc: convert to setup_initial_init_mm()

Quoted 11 lines · Christophe Leroy
Quoted 7 lines · Souptick Joarder
Quoted 5 lines · Kefeng Wang

Use setup_initial_init_mm() helper to simplify code.

Note klimit is (unsigned long) _end, with new helper, will use _end directly.

Quoted 6 lines
Quoted 3 lines

With this change klimit left with no user in this file and can be moved to some appropriate header.
But in a separate series.

I have a patch to remove klimit, see
https://patchwork.ozlabs.org/project/linuxppc-dev/patch/9fa9ba6807c17f93f35a582c199c646c4a8bfd9c.1622800638.git.christophe.leroy@csgroup.eu/

Got it. Thanks :)

Quoted 34 lines

Christophe

Quoted 30 lines
Quoted 30 lines
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
---
  arch/powerpc/kernel/setup-common.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
arch/powerpc/kernel/setup-common.c +1 -5
index 74a98fff2c2f..96697c6e1e16 100644
@@ -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();
--

2.26.2

#18 lore raw

PATCH RESEND v3 12/15 riscv: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index 9a1b7a0603b2..8e318f207ac6 100644
@@ -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
#19 lore raw

PATCH RESEND v3 13/15 s390: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use setup_initial_init_mm() helper to simplify code.

Cc Heiko Carstens <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Christian Borntraeger <[email protected]>
---
 arch/s390/kernel/setup.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/s390/kernel/setup.c +1 -4
index 5aab59ad5688..e1793ed43510 100644
@@ -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
#20 lore raw

PATCH RESEND v3 14/15 sh: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index 4144be650d41..1fcb6659822a 100644
@@ -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
#21 lore raw

PATCH RESEND v3 15/15 x86: convert to setup_initial_init_mm()

In reply to Kefeng Wang

Use 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
index 1e720626069a..7ca94d062c79 100644
@@ -870,10 +870,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, (void *)_brk_end);
 
 	code_resource.start = __pa_symbol(_text);
 	code_resource.end = __pa_symbol(_etext)-1;
Signature · 1 line
2.26.2