powerpc/mm: Fix section mismatch warning in stop_machine_change_mapping()

Mauricio Faria de Oliveira · mpe · commit bde709a70884 · 2018-03-27T23:44:55.000+11:00
Fix the warning messages for stop_machine_change_mapping(), and a number
of other affected functions in its call chain.

All modified functions are under CONFIG_MEMORY_HOTPLUG, so __meminit
is okay (keeps them / does not discard them).

Boot-tested on powernv/power9/radix-mmu and pseries/power8/hash-mmu.

    $ make -j$(nproc) CONFIG_DEBUG_SECTION_MISMATCH=y vmlinux
    ...
      MODPOST vmlinux.o
    WARNING: vmlinux.o(.text+0x6b130): Section mismatch in reference from the function stop_machine_change_mapping() to the function .meminit.text:create_physical_mapping()
    The function stop_machine_change_mapping() references
    the function __meminit create_physical_mapping().
    This is often because stop_machine_change_mapping lacks a __meminit
    annotation or the annotation of create_physical_mapping is wrong.

    WARNING: vmlinux.o(.text+0x6b13c): Section mismatch in reference from the function stop_machine_change_mapping() to the function .meminit.text:create_physical_mapping()
    The function stop_machine_change_mapping() references
    the function __meminit create_physical_mapping().
    This is often because stop_machine_change_mapping lacks a __meminit
    annotation or the annotation of create_physical_mapping is wrong.
    ...

Signed-off-by: Mauricio Faria de Oliveira &lt;mauricfo@linux.vnet.ibm.com&gt;
Acked-by: Balbir Singh &lt;bsingharora@gmail.com&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
@@ -127,7 +127,7 @@ int __weak remove_section_mapping(unsigned long start, unsigned long end)
 	return -ENODEV;
 }
 
-int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,
+int __meminit arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,
 		bool want_memblock)
 {
 	unsigned long start_pfn = start >> PAGE_SHIFT;
@@ -148,7 +148,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,
 }
 
 #ifdef CONFIG_MEMORY_HOTREMOVE
-int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)
+int __meminit arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)
 {
 	unsigned long start_pfn = start >> PAGE_SHIFT;
 	unsigned long nr_pages = size >> PAGE_SHIFT;
diff --git a/arch/powerpc/mm/pgtable-book3s64.c b/arch/powerpc/mm/pgtable-book3s64.c
@@ -155,15 +155,15 @@ void mmu_cleanup_all(void)
 }
 
 #ifdef CONFIG_MEMORY_HOTPLUG
-int create_section_mapping(unsigned long start, unsigned long end)
+int __meminit create_section_mapping(unsigned long start, unsigned long end)
 {
 	if (radix_enabled())
 		return radix__create_section_mapping(start, end);
 
 	return hash__create_section_mapping(start, end);
 }
 
-int remove_section_mapping(unsigned long start, unsigned long end)
+int __meminit remove_section_mapping(unsigned long start, unsigned long end)
 {
 	if (radix_enabled())
 		return radix__remove_section_mapping(start, end);
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
@@ -695,7 +695,7 @@ struct change_mapping_params {
 	unsigned long aligned_end;
 };
 
-static int stop_machine_change_mapping(void *data)
+static int __meminit stop_machine_change_mapping(void *data)
 {
 	struct change_mapping_params *params =
 			(struct change_mapping_params *)data;
@@ -742,7 +742,7 @@ static void remove_pte_table(pte_t *pte_start, unsigned long addr,
 /*
  * clear the pte and potentially split the mapping helper
  */
-static void split_kernel_mapping(unsigned long addr, unsigned long end,
+static void __meminit split_kernel_mapping(unsigned long addr, unsigned long end,
 				unsigned long size, pte_t *pte)
 {
 	unsigned long mask = ~(size - 1);
@@ -835,7 +835,7 @@ static void remove_pud_table(pud_t *pud_start, unsigned long addr,
 	}
 }
 
-static void remove_pagetable(unsigned long start, unsigned long end)
+static void __meminit remove_pagetable(unsigned long start, unsigned long end)
 {
 	unsigned long addr, next;
 	pud_t *pud_base;
@@ -863,12 +863,12 @@ static void remove_pagetable(unsigned long start, unsigned long end)
 	radix__flush_tlb_kernel_range(start, end);
 }
 
-int __ref radix__create_section_mapping(unsigned long start, unsigned long end)
+int __meminit radix__create_section_mapping(unsigned long start, unsigned long end)
 {
 	return create_physical_mapping(start, end);
 }
 
-int radix__remove_section_mapping(unsigned long start, unsigned long end)
+int __meminit radix__remove_section_mapping(unsigned long start, unsigned long end)
 {
 	remove_pagetable(start, end);
 	return 0;
@@ -888,7 +888,7 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,
 }
 
 #ifdef CONFIG_MEMORY_HOTPLUG
-void radix__vmemmap_remove_mapping(unsigned long start, unsigned long page_size)
+void __meminit radix__vmemmap_remove_mapping(unsigned long start, unsigned long page_size)
 {
 	remove_pagetable(start, start + page_size);
 }

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ int __weak remove_section_mapping(unsigned long start, unsigned long end)`
`127`	`127`	`return -ENODEV;`
`128`	`128`	`}`
`129`	`129`
`130`		`-int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,`
	`130`	`+int __meminit arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,`
`131`	`131`	`bool want_memblock)`
`132`	`132`	`{`
`133`	`133`	`unsigned long start_pfn = start >> PAGE_SHIFT;`
`@@ -148,7 +148,7 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap,`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`#ifdef CONFIG_MEMORY_HOTREMOVE`
`151`		`-int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)`
	`151`	`+int __meminit arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)`
`152`	`152`	`{`
`153`	`153`	`unsigned long start_pfn = start >> PAGE_SHIFT;`
`154`	`154`	`unsigned long nr_pages = size >> PAGE_SHIFT;`
Original file line number	Diff line number	Diff line change
`@@ -155,15 +155,15 @@ void mmu_cleanup_all(void)`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`#ifdef CONFIG_MEMORY_HOTPLUG`
`158`		`-int create_section_mapping(unsigned long start, unsigned long end)`
	`158`	`+int __meminit create_section_mapping(unsigned long start, unsigned long end)`
`159`	`159`	`{`
`160`	`160`	`if (radix_enabled())`
`161`	`161`	`return radix__create_section_mapping(start, end);`
`162`	`162`
`163`	`163`	`return hash__create_section_mapping(start, end);`
`164`	`164`	`}`
`165`	`165`
`166`		`-int remove_section_mapping(unsigned long start, unsigned long end)`
	`166`	`+int __meminit remove_section_mapping(unsigned long start, unsigned long end)`
`167`	`167`	`{`
`168`	`168`	`if (radix_enabled())`
`169`	`169`	`return radix__remove_section_mapping(start, end);`
Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ struct change_mapping_params {`
`695`	`695`	`unsigned long aligned_end;`
`696`	`696`	`};`
`697`	`697`
`698`		`-static int stop_machine_change_mapping(void *data)`
	`698`	`+static int __meminit stop_machine_change_mapping(void *data)`
`699`	`699`	`{`
`700`	`700`	`struct change_mapping_params *params =`
`701`	`701`	`(struct change_mapping_params *)data;`
`@@ -742,7 +742,7 @@ static void remove_pte_table(pte_t *pte_start, unsigned long addr,`
`742`	`742`	`/*`
`743`	`743`	`* clear the pte and potentially split the mapping helper`
`744`	`744`	`*/`
`745`		`-static void split_kernel_mapping(unsigned long addr, unsigned long end,`
	`745`	`+static void __meminit split_kernel_mapping(unsigned long addr, unsigned long end,`
`746`	`746`	`unsigned long size, pte_t *pte)`
`747`	`747`	`{`
`748`	`748`	`unsigned long mask = ~(size - 1);`
`@@ -835,7 +835,7 @@ static void remove_pud_table(pud_t *pud_start, unsigned long addr,`
`835`	`835`	`}`
`836`	`836`	`}`
`837`	`837`
`838`		`-static void remove_pagetable(unsigned long start, unsigned long end)`
	`838`	`+static void __meminit remove_pagetable(unsigned long start, unsigned long end)`
`839`	`839`	`{`
`840`	`840`	`unsigned long addr, next;`
`841`	`841`	`pud_t *pud_base;`
`@@ -863,12 +863,12 @@ static void remove_pagetable(unsigned long start, unsigned long end)`
`863`	`863`	`radix__flush_tlb_kernel_range(start, end);`
`864`	`864`	`}`
`865`	`865`
`866`		`-int __ref radix__create_section_mapping(unsigned long start, unsigned long end)`
	`866`	`+int __meminit radix__create_section_mapping(unsigned long start, unsigned long end)`
`867`	`867`	`{`
`868`	`868`	`return create_physical_mapping(start, end);`
`869`	`869`	`}`
`870`	`870`
`871`		`-int radix__remove_section_mapping(unsigned long start, unsigned long end)`
	`871`	`+int __meminit radix__remove_section_mapping(unsigned long start, unsigned long end)`
`872`	`872`	`{`
`873`	`873`	`remove_pagetable(start, end);`
`874`	`874`	`return 0;`
`@@ -888,7 +888,7 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,`
`888`	`888`	`}`
`889`	`889`
`890`	`890`	`#ifdef CONFIG_MEMORY_HOTPLUG`
`891`		`-void radix__vmemmap_remove_mapping(unsigned long start, unsigned long page_size)`
	`891`	`+void __meminit radix__vmemmap_remove_mapping(unsigned long start, unsigned long page_size)`
`892`	`892`	`{`
`893`	`893`	`remove_pagetable(start, start + page_size);`
`894`	`894`	`}`