__meminit breaks cpu hotplug
Subsystems (2)
Recent __meminit additions broke cpu hotplug when the kernel is configured with HOTPLUG_CPU but not HOTPLUG_MEMORY.
Although __meminit replaced __devinit functions many places, all those functions looked like they should have been marked with __cpuinit to begin with. That is the reason I have changed the below to __cpuinit. I leave it to Matt if he wants to use __devinit here instead. (Depending on where he sees __meminit would be used.)
include/linux/init.h +4 -4
@@ -247,10 +247,10 @@ void __init parse_early_param(void);#define __memexit#define __memexitdata#else -#define __meminit __init -#define __meminitdata __initdata -#define __memexit __exit -#define __memexitdata __exitdata +#define __meminit __cpuinit +#define __meminitdata __cpuinitdata +#define __memexit __cpuexit +#define __memexitdata __cpuexitdata#endif /* Functions marked as __devexit may be discarded at kernel link time, depending
Quoted 18 lines · Ravikiran G Thirumalai
Recent
__meminitadditions broke cpu hotplug when the kernel is configured withHOTPLUG_CPUbut notHOTPLUG_MEMORY.
Although__meminitreplaced__devinitfunctions many places, all those functions looked like they should have been marked with__cpuinitto begin with. That is the reason I have changed the below to__cpuinit. I leave it to Matt if he wants to use__devinithere instead. (Depending on where he sees__meminitwould be used.)Signed-off-by Ravikiran Thirumalai <[email protected]>Signed-off-by Shai Fultheim <[email protected]>Index:
linux-2.6.16-rc1/include/linux/init.h
===================================================================include/linux/init.h +0
-0@@ -247,10 +247,10 @@ void __init parse_early_param(void);#define __memexit
include/linux/init.h void __init parse_early_param(void); · line 253
Quoted 10 lines
include/linux/init.h +4
-4#define __memexitdata#else -#define __meminit __init -#define __meminitdata __initdata -#define __memexit __exit -#define __memexitdata __exitdata +#define __meminit __cpuinit +#define __meminitdata __cpuinitdata +#define __memexit __cpuexit +#define __memexitdata __cpuexitdata
This looks wrong. The __meminit and __cpuinit definitions we have now are OK, aren't they? Surely the problem is that some functions/variables are incorrectly tagged?
If some function is needed by both HOTPLUG_CPU and HOTPLUG_MEMORY then we're rather messed up - I guess it'll need to be put inside #if defined(..) || defined(..) and put into plain old .text.
Quoted 12 lines · Andrew Morton
Review
Quoted 7 lines · Ravikiran G Thirumalai
(quoted diff) +4
-3-#define __meminitdata __initdata -#define __memexit __exit -#define __memexitdata __exitdata +#define __meminit __cpuinit +#define __meminitdata __cpuinitdata +#define __memexit __cpuexit +#define __memexitdata __cpuexitdataThis looks wrong. The
__meminitand__cpuinitdefinitions we have now are OK, aren't they? Surely the problem is that some functions/variables are incorrectly tagged?
I hit the bug on pageset_cpuup_callback, which is obviously __cpuinit, but has been marked __meminit. Yeah .. bad patch duh!
For some reason I thought all other functions marked with __meminit looked like __cpuinit candidates....while just pageset_cpuup_callback should be changed to __cpuinit
mm/page_alloc.c +1 -1
@@ -1923,7 +1923,7 @@ static inline void free_zone_pagesets(in } } -static int __meminit pageset_cpuup_callback (struct notifier_block *nfb, +static int __cpuinit pageset_cpuup_callback (struct notifier_block *nfb,unsigned long action,void *hcpu) {
Quoted 6 lines · Ravikiran G Thirumalai
I hit the bug on
pageset_cpuup_callback, which is obviously__cpuinit, but
has been marked__meminit. Yeah .. bad patch duh!
Quoted 6 lines
For some reason I thought all other functions marked with
__meminitlooked
like__cpuinitcandidates....while justpageset_cpuup_callbackshould be
changed to__cpuinit
Sorry i missed this while posting the other patch. There are other functions called by process_zones() from withing pageset_cpuup_callback() that are also marked __meminit. I sent a patch just now to cover that.
but as i mentioned i still have trouble getting cpuup to work right. cpu_down() seems to work ok so far.
Signature · 3 lines
Cheers, Ashok Raj - Open Source Technology Center