* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case @ 2015-11-23 11:59 nyushchenko at dev.rtsoft.ru 2015-11-23 12:03 ` Russell King - ARM Linux 0 siblings, 1 reply; 16+ messages in thread From: nyushchenko at dev.rtsoft.ru @ 2015-11-23 11:59 UTC (permalink / raw) To: linux-arm-kernel From: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> While running an imx6s boasrd, I got following message in boot log: [ 0.032414] CPU1: failed to boot: -38 This looked strange: imx6s is singe-core and kernel perfectly knows that. However, for some reason it tries to initialize CPU 1? I found this to be caused by - CONFIG_SMP_ON_UP successfully detects that system is single core, - this causes is_smp() to return false, - this causes setup_arch() to skip smp_init_cpus() call, - this skips board-specific code that sets cpu_possible mask. By looking at the code, I don't understand why several initialization routines are called only in is_smp() case - while other kernel CONFIG_SMP code does not check is_smp() every time and uses what should have been initialized by skipped routines. Thus I propose making these init calls regardless of is_smp() check. Calls are already conditional on CONFIG_SMP. This will make init and usage sides consistent. Signed-off-by: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> --- arch/arm/kernel/setup.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 20edd34..8a14fce 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -980,16 +980,14 @@ void __init setup_arch(char **cmdline_p) psci_dt_init(); xen_early_init(); #ifdef CONFIG_SMP - if (is_smp()) { - if (!mdesc->smp_init || !mdesc->smp_init()) { - if (psci_smp_available()) - smp_set_ops(&psci_smp_ops); - else if (mdesc->smp) - smp_set_ops(mdesc->smp); - } - smp_init_cpus(); - smp_build_mpidr_hash(); + if (!mdesc->smp_init || !mdesc->smp_init()) { + if (psci_smp_available()) + smp_set_ops(&psci_smp_ops); + else if (mdesc->smp) + smp_set_ops(mdesc->smp); } + smp_init_cpus(); + smp_build_mpidr_hash(); #endif if (!is_smp()) -- 2.1.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 11:59 [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case nyushchenko at dev.rtsoft.ru @ 2015-11-23 12:03 ` Russell King - ARM Linux 2015-11-23 12:06 ` Nikita Yushchenko 0 siblings, 1 reply; 16+ messages in thread From: Russell King - ARM Linux @ 2015-11-23 12:03 UTC (permalink / raw) To: linux-arm-kernel On Mon, Nov 23, 2015 at 02:59:06PM +0300, nyushchenko at dev.rtsoft.ru wrote: > From: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> > > While running an imx6s boasrd, I got following message in boot log: > > [ 0.032414] CPU1: failed to boot: -38 > > This looked strange: imx6s is singe-core and kernel perfectly knows > that. However, for some reason it tries to initialize CPU 1? > > I found this to be caused by > - CONFIG_SMP_ON_UP successfully detects that system is single core, > - this causes is_smp() to return false, > - this causes setup_arch() to skip smp_init_cpus() call, > - this skips board-specific code that sets cpu_possible mask. Right, so you should end up with the possible and present masks containing just one CPU, which should prevent the kernel trying to bring any secondary CPUs online. -- FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 12:03 ` Russell King - ARM Linux @ 2015-11-23 12:06 ` Nikita Yushchenko 2015-11-23 12:12 ` Russell King - ARM Linux 2015-11-23 12:32 ` Vladimir Murzin 0 siblings, 2 replies; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-23 12:06 UTC (permalink / raw) To: linux-arm-kernel 23.11.2015 15:03, Russell King - ARM Linux ?????: > On Mon, Nov 23, 2015 at 02:59:06PM +0300, nyushchenko at dev.rtsoft.ru wrote: >> From: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> >> >> While running an imx6s boasrd, I got following message in boot log: >> >> [ 0.032414] CPU1: failed to boot: -38 >> >> This looked strange: imx6s is singe-core and kernel perfectly knows >> that. However, for some reason it tries to initialize CPU 1? >> >> I found this to be caused by >> - CONFIG_SMP_ON_UP successfully detects that system is single core, >> - this causes is_smp() to return false, >> - this causes setup_arch() to skip smp_init_cpus() call, >> - this skips board-specific code that sets cpu_possible mask. > > Right, so you should end up with the possible and present masks > containing just one CPU, which should prevent the kernel trying to > bring any secondary CPUs online. Kernel that is running here still tries to init CPU 1 for some reason. Will try to check mainline (although not sure if that will be possible on available custom hardware) ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 12:06 ` Nikita Yushchenko @ 2015-11-23 12:12 ` Russell King - ARM Linux 2015-11-23 12:19 ` Russell King - ARM Linux 2015-11-23 12:32 ` Vladimir Murzin 1 sibling, 1 reply; 16+ messages in thread From: Russell King - ARM Linux @ 2015-11-23 12:12 UTC (permalink / raw) To: linux-arm-kernel On Mon, Nov 23, 2015 at 03:06:52PM +0300, Nikita Yushchenko wrote: > 23.11.2015 15:03, Russell King - ARM Linux ?????: > > On Mon, Nov 23, 2015 at 02:59:06PM +0300, nyushchenko at dev.rtsoft.ru wrote: > >> From: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> > >> > >> While running an imx6s boasrd, I got following message in boot log: > >> > >> [ 0.032414] CPU1: failed to boot: -38 > >> > >> This looked strange: imx6s is singe-core and kernel perfectly knows > >> that. However, for some reason it tries to initialize CPU 1? > >> > >> I found this to be caused by > >> - CONFIG_SMP_ON_UP successfully detects that system is single core, > >> - this causes is_smp() to return false, > >> - this causes setup_arch() to skip smp_init_cpus() call, > >> - this skips board-specific code that sets cpu_possible mask. > > > > Right, so you should end up with the possible and present masks > > containing just one CPU, which should prevent the kernel trying to > > bring any secondary CPUs online. > > Kernel that is running here still tries to init CPU 1 for some reason. > > Will try to check mainline (although not sure if that will be possible > on available custom hardware) iMX6 is fairly well supported in mainline. The only reason to use a custom kernel is if you want to use some feature which mainline does not support (or support very well) such as video decode, the full IPU facilities, GPUs or CEC (sorry, I don't have an expansive list.) The GPU problem for the GC320/GC880/GC2000 is fairly close to being solved in a functional (but maybe not yet performant) manner. -- FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 12:12 ` Russell King - ARM Linux @ 2015-11-23 12:19 ` Russell King - ARM Linux 2015-11-23 12:46 ` Nikita Yushchenko 0 siblings, 1 reply; 16+ messages in thread From: Russell King - ARM Linux @ 2015-11-23 12:19 UTC (permalink / raw) To: linux-arm-kernel On Mon, Nov 23, 2015 at 12:12:16PM +0000, Russell King - ARM Linux wrote: > iMX6 is fairly well supported in mainline. The only reason to use a > custom kernel is if you want to use some feature which mainline does > not support (or support very well) such as video decode, the full IPU > facilities, GPUs or CEC (sorry, I don't have an expansive list.) > > The GPU problem for the GC320/GC880/GC2000 is fairly close to being > solved in a functional (but maybe not yet performant) manner. For reference, iMX6S in mainline behaves like this: Calibrating delay loop (skipped), value calculated using timer frequency.. 6.00 BogoMIPS (lpj=12000) pid_max: default: 32768 minimum: 301 Mount-cache hash table entries: 1024 (order: 0, 4096 bytes) Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes) Initializing cgroup subsys net_cls CPU: Testing write buffer coherency: ok CPU0: thread -1, cpu 0, socket 0, mpidr 80000000 Setting up static identity map for 0x100082c0 - 0x10008318 Brought up 1 CPUs SMP: Total of 1 processors activated (6.00 BogoMIPS). CPU: All CPU(s) started in SVC mode. -- FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 12:19 ` Russell King - ARM Linux @ 2015-11-23 12:46 ` Nikita Yushchenko 0 siblings, 0 replies; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-23 12:46 UTC (permalink / raw) To: linux-arm-kernel 23.11.2015 15:19, Russell King - ARM Linux ?????: > On Mon, Nov 23, 2015 at 12:12:16PM +0000, Russell King - ARM Linux wrote: >> iMX6 is fairly well supported in mainline. The only reason to use a >> custom kernel is if you want to use some feature which mainline does >> not support (or support very well) such as video decode, the full IPU >> facilities, GPUs or CEC (sorry, I don't have an expansive list.) >> >> The GPU problem for the GC320/GC880/GC2000 is fairly close to being >> solved in a functional (but maybe not yet performant) manner. > > For reference, iMX6S in mainline behaves like this: > > Calibrating delay loop (skipped), value calculated using timer frequency.. 6.00 BogoMIPS (lpj=12000) > pid_max: default: 32768 minimum: 301 > Mount-cache hash table entries: 1024 (order: 0, 4096 bytes) > Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes) > Initializing cgroup subsys net_cls > CPU: Testing write buffer coherency: ok > CPU0: thread -1, cpu 0, socket 0, mpidr 80000000 > Setting up static identity map for 0x100082c0 - 0x10008318 > Brought up 1 CPUs > SMP: Total of 1 processors activated (6.00 BogoMIPS). > CPU: All CPU(s) started in SVC mode. Indeed, somehow booted mainline and it does not try to initialize CPU 1. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 12:06 ` Nikita Yushchenko 2015-11-23 12:12 ` Russell King - ARM Linux @ 2015-11-23 12:32 ` Vladimir Murzin 2015-11-23 12:42 ` Nikita Yushchenko 1 sibling, 1 reply; 16+ messages in thread From: Vladimir Murzin @ 2015-11-23 12:32 UTC (permalink / raw) To: linux-arm-kernel On 23/11/15 12:06, Nikita Yushchenko wrote: > 23.11.2015 15:03, Russell King - ARM Linux ?????: >> On Mon, Nov 23, 2015 at 02:59:06PM +0300, nyushchenko at dev.rtsoft.ru wrote: >>> From: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> >>> >>> While running an imx6s boasrd, I got following message in boot log: >>> >>> [ 0.032414] CPU1: failed to boot: -38 >>> >>> This looked strange: imx6s is singe-core and kernel perfectly knows >>> that. However, for some reason it tries to initialize CPU 1? >>> >>> I found this to be caused by >>> - CONFIG_SMP_ON_UP successfully detects that system is single core, >>> - this causes is_smp() to return false, >>> - this causes setup_arch() to skip smp_init_cpus() call, >>> - this skips board-specific code that sets cpu_possible mask. >> >> Right, so you should end up with the possible and present masks >> containing just one CPU, which should prevent the kernel trying to >> bring any secondary CPUs online. > > Kernel that is running here still tries to init CPU 1 for some reason. I *guess* cpus node [1] in your dts has more than one cpu entry, could you check please? [1] Documentation/devicetree/bindings/arm/cpus.txt Vladimir > > Will try to check mainline (although not sure if that will be possible > on available custom hardware) > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 12:32 ` Vladimir Murzin @ 2015-11-23 12:42 ` Nikita Yushchenko 2015-11-23 12:47 ` Nikita Yushchenko 0 siblings, 1 reply; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-23 12:42 UTC (permalink / raw) To: linux-arm-kernel >>>> While running an imx6s boasrd, I got following message in boot log: >>>> >>>> [ 0.032414] CPU1: failed to boot: -38 >>>> >>>> This looked strange: imx6s is singe-core and kernel perfectly knows >>>> that. However, for some reason it tries to initialize CPU 1? >>>> >>>> I found this to be caused by >>>> - CONFIG_SMP_ON_UP successfully detects that system is single core, >>>> - this causes is_smp() to return false, >>>> - this causes setup_arch() to skip smp_init_cpus() call, >>>> - this skips board-specific code that sets cpu_possible mask. >>> >>> Right, so you should end up with the possible and present masks >>> containing just one CPU, which should prevent the kernel trying to >>> bring any secondary CPUs online. >> >> Kernel that is running here still tries to init CPU 1 for some reason. > > I *guess* cpus node [1] in your dts has more than one cpu entry, could > you check please? Indeed looks so: # ls /proc/device-tree/cpus #address-cells #size-cells cpu at 0 cpu at 1 name But my custom device tree just includes imx6dl.dtsi So it is imx6dl.dtsi in linux-imx tree broken?.. Still, if I apply change from the patch, issue diappears, since in this case imx_smp_init_cpus() gets called and initializes possible_cpu mask properly. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 12:42 ` Nikita Yushchenko @ 2015-11-23 12:47 ` Nikita Yushchenko 2015-11-23 13:04 ` Russell King - ARM Linux 0 siblings, 1 reply; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-23 12:47 UTC (permalink / raw) To: linux-arm-kernel >>>>> While running an imx6s boasrd, I got following message in boot log: >>>>> >>>>> [ 0.032414] CPU1: failed to boot: -38 >>>>> >>>>> This looked strange: imx6s is singe-core and kernel perfectly knows >>>>> that. However, for some reason it tries to initialize CPU 1? >>>>> >>>>> I found this to be caused by >>>>> - CONFIG_SMP_ON_UP successfully detects that system is single core, >>>>> - this causes is_smp() to return false, >>>>> - this causes setup_arch() to skip smp_init_cpus() call, >>>>> - this skips board-specific code that sets cpu_possible mask. >>>> >>>> Right, so you should end up with the possible and present masks >>>> containing just one CPU, which should prevent the kernel trying to >>>> bring any secondary CPUs online. >>> >>> Kernel that is running here still tries to init CPU 1 for some reason. >> >> I *guess* cpus node [1] in your dts has more than one cpu entry, could >> you check please? > > Indeed looks so: > > # ls /proc/device-tree/cpus > #address-cells #size-cells cpu at 0 cpu at 1 name > > But my custom device tree just includes imx6dl.dtsi > > So it is imx6dl.dtsi in linux-imx tree broken?.. Just booted mainline... unline linux-imx, it does not try to init cpu1. However, imx6dl.dtsi from mainline also has both cpu at 0 and cpu at 1 So missing piece in linux-imx is elsewhere :( ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 12:47 ` Nikita Yushchenko @ 2015-11-23 13:04 ` Russell King - ARM Linux 2015-11-24 14:52 ` Nikita Yushchenko 0 siblings, 1 reply; 16+ messages in thread From: Russell King - ARM Linux @ 2015-11-23 13:04 UTC (permalink / raw) To: linux-arm-kernel On Mon, Nov 23, 2015 at 03:47:34PM +0300, Nikita Yushchenko wrote: > >>>>> While running an imx6s boasrd, I got following message in boot log: > >>>>> > >>>>> [ 0.032414] CPU1: failed to boot: -38 > >>>>> > >>>>> This looked strange: imx6s is singe-core and kernel perfectly knows > >>>>> that. However, for some reason it tries to initialize CPU 1? > >>>>> > >>>>> I found this to be caused by > >>>>> - CONFIG_SMP_ON_UP successfully detects that system is single core, > >>>>> - this causes is_smp() to return false, > >>>>> - this causes setup_arch() to skip smp_init_cpus() call, > >>>>> - this skips board-specific code that sets cpu_possible mask. > >>>> > >>>> Right, so you should end up with the possible and present masks > >>>> containing just one CPU, which should prevent the kernel trying to > >>>> bring any secondary CPUs online. > >>> > >>> Kernel that is running here still tries to init CPU 1 for some reason. > >> > >> I *guess* cpus node [1] in your dts has more than one cpu entry, could > >> you check please? > > > > Indeed looks so: > > > > # ls /proc/device-tree/cpus > > #address-cells #size-cells cpu at 0 cpu at 1 name > > > > But my custom device tree just includes imx6dl.dtsi > > > > So it is imx6dl.dtsi in linux-imx tree broken?.. > > Just booted mainline... unline linux-imx, it does not try to init cpu1. > > However, imx6dl.dtsi from mainline also has both cpu at 0 and cpu at 1 > > So missing piece in linux-imx is elsewhere :( It works as you mentioned - and it relies upon the code you tried to modify. The early boot code detects that the boot CPU is not SMP capable, so through SMP_ON_UP, it "turns off" SMP support by fixing up the code and making is_smp() return false. This prevents smp_init_cpus() being called, which in turn prevents imx_smp_init_cpus() executing, which prevents the CPU possible mask including any CPU but the boot CPU. As only the boot CPU is possible, this prevents the SMP code trying to bring any secondary CPUs online. Applying your patch which removes the is_smp() check will break this logic. -- FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-23 13:04 ` Russell King - ARM Linux @ 2015-11-24 14:52 ` Nikita Yushchenko 2015-11-24 15:05 ` Nikita Yushchenko 2015-11-24 15:33 ` Russell King - ARM Linux 0 siblings, 2 replies; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-24 14:52 UTC (permalink / raw) To: linux-arm-kernel >> Just booted mainline... unline linux-imx, it does not try to init cpu1. >> >> However, imx6dl.dtsi from mainline also has both cpu at 0 and cpu at 1 >> >> So missing piece in linux-imx is elsewhere :( > > It works as you mentioned - and it relies upon the code you tried to > modify. > > The early boot code detects that the boot CPU is not SMP capable, so > through SMP_ON_UP, it "turns off" SMP support by fixing up the code > and making is_smp() return false. > > This prevents smp_init_cpus() being called, which in turn prevents > imx_smp_init_cpus() executing, which prevents the CPU possible mask > including any CPU but the boot CPU. > > As only the boot CPU is possible, this prevents the SMP code trying > to bring any secondary CPUs online. I'm still trying to understand what is going on, and my printk()s show that this is not entirely true. When smp_init() is entered on mainline om imx6s, cpu_possible_mask and cpu_present_mask both contain two cpus. These get initialized in arm_dt_init_cpu_maps() and stay unmodified since then. But cpu_online() returns 1 for cpu0 and 0 from cpu1 - thus it is cpu_online() check, not possible_mask or present_mask, that prevents cpu1 initialization attempt. Not sure I understand logic behind this. With the current code, resulting cpu_possible_mask depends on CONFIG_SMP_ON_UP: - if it is set, cpu_possible_mask contains (0 1), as initialized in arm_dt_init_cpu_maps() - if it is not set, cpu_possible_mask contains (0), since imx_smp_init_cpus() removes 1 from there. This does not seem to be intended difference. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-24 14:52 ` Nikita Yushchenko @ 2015-11-24 15:05 ` Nikita Yushchenko 2015-11-24 15:28 ` Nikita Yushchenko 2015-11-24 15:33 ` Russell King - ARM Linux 1 sibling, 1 reply; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-24 15:05 UTC (permalink / raw) To: linux-arm-kernel > I'm still trying to understand what is going on, and my printk()s show > that this is not entirely true. > > When smp_init() is entered on mainline om imx6s, cpu_possible_mask and > cpu_present_mask both contain two cpus. These get initialized in > arm_dt_init_cpu_maps() and stay unmodified since then. > > But cpu_online() returns 1 for cpu0 and 0 from cpu1 - thus it is > cpu_online() check, not possible_mask or present_mask, that prevents > cpu1 initialization attempt. Sorry was too quick to type. cpu_online(0) is true and cpu_online(1) is false. It is natural, since cpu0 is already running. Thus cpu_up(1) is entered! ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-24 15:05 ` Nikita Yushchenko @ 2015-11-24 15:28 ` Nikita Yushchenko 0 siblings, 0 replies; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-24 15:28 UTC (permalink / raw) To: linux-arm-kernel 24.11.2015 18:05, Nikita Yushchenko ?????: >> I'm still trying to understand what is going on, and my printk()s show >> that this is not entirely true. >> >> When smp_init() is entered on mainline om imx6s, cpu_possible_mask and >> cpu_present_mask both contain two cpus. These get initialized in >> arm_dt_init_cpu_maps() and stay unmodified since then. >> >> But cpu_online() returns 1 for cpu0 and 0 from cpu1 - thus it is >> cpu_online() check, not possible_mask or present_mask, that prevents >> cpu1 initialization attempt. > > Sorry was too quick to type. > > cpu_online(0) is true and cpu_online(1) is false. > It is natural, since cpu0 is already running. > Thus cpu_up(1) is entered! ... and then code executes into __cpu_up() from arch/arm/kernel/smp.c, and stops via if (!smp_ops.smp_boot_secondary) return -ENOSYS; (smp_ops zeroed due to SMP_ON_UP, as far as I understand). In linux-imx 3.14.28 based tree, there is no such check in __cpu_up, thus boot_secondary() is called int boot_secondary(unsigned int cpu, struct task_struct *idle) { if (smp_ops.smp_boot_secondary) return smp_ops.smp_boot_secondary(cpu, idle); return -ENOSYS; } at this point zeroed smp_ops plays, -ENOSYS (-38) is returned, and pr_err() in __cpu_up() prints the message that caused the entire analysis. So conclusion is that - behaviour of mainline and linux-imx tres is almost the same, there is attempt to bring up non-existing cpu 1, difference is only in where zeroed smp_ops is detected and if error is logged or not. Not sure that my proposed patch was correct, it fixes imx6s case but can have bad effect on other arm targets. But I think that something needs to be done to make cpu masks correct in SMP_ON_UP case. ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-24 14:52 ` Nikita Yushchenko 2015-11-24 15:05 ` Nikita Yushchenko @ 2015-11-24 15:33 ` Russell King - ARM Linux 2015-11-28 11:13 ` Nikita Yushchenko 1 sibling, 1 reply; 16+ messages in thread From: Russell King - ARM Linux @ 2015-11-24 15:33 UTC (permalink / raw) To: linux-arm-kernel On Tue, Nov 24, 2015 at 05:52:14PM +0300, Nikita Yushchenko wrote: > I'm still trying to understand what is going on, and my printk()s show > that this is not entirely true. > > When smp_init() is entered on mainline om imx6s, cpu_possible_mask and > cpu_present_mask both contain two cpus. These get initialized in > arm_dt_init_cpu_maps() and stay unmodified since then. > > But cpu_online() returns 1 for cpu0 and 0 from cpu1 - thus it is > cpu_online() check, not possible_mask or present_mask, that prevents > cpu1 initialization attempt. No. cpu_online() reports whether the CPU is currently online or not. It's the current state of the system wrt which CPUs are running and not running. Initially, only the boot CPU will be marked online, and the code which brings all CPUs online (see smp_init() in kernel/smp.c) will check whether the CPU is already online prior to trying to bring it up. It will attempt it for any present CPU, up to the maximum number of online CPUs (set by nosmp or maxcpus kernel options.) > Not sure I understand logic behind this. With the current code, > resulting cpu_possible_mask depends on CONFIG_SMP_ON_UP: > - if it is set, cpu_possible_mask contains (0 1), as initialized in > arm_dt_init_cpu_maps() > - if it is not set, cpu_possible_mask contains (0), since > imx_smp_init_cpus() removes 1 from there. Right, adding debug to arch/arm/kernel/setup.c, just before the "if (is_smp())" shows: is_smp() 0 possible 3 present 1 online 1 which is totally wrong: if is_smp() is false, we should not be setting up any possible CPUs. See a patch below to fix that. However, this doesn't matter much, because the code in setup.c won't initialise the SMP operations struct: if (is_smp()) { if (!mdesc->smp_init || !mdesc->smp_init()) { if (psci_smp_available()) smp_set_ops(&psci_smp_ops); else if (mdesc->smp) smp_set_ops(mdesc->smp); } smp_init_cpus(); smp_build_mpidr_hash(); } and this in turn means that __cpu_up() will return -ENOSYS due to this check: if (!smp_ops.smp_boot_secondary) return -ENOSYS; That causes _cpu_up() in kernel/cpu.c to bail out, along with cpu_up(). Notice that the call to smp_init() in kernel/smp.c is silent. Hence, kernel/smp.c will try to bring CPU 1 online (because it is marked present), but it'll _silently_ fail with -ENOSYS. Here's the patch to fix the DT code, which should not be setting present CPUs when is_smp() is false. arch/arm/kernel/devtree.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 65addcbf5b30..bd72ce91d7a2 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -170,15 +170,18 @@ void __init arm_dt_init_cpu_maps(void) return; } - /* - * Since the boot CPU node contains proper data, and all nodes have - * a reg property, the DT CPU list can be considered valid and the - * logical map created in smp_setup_processor_id() can be overridden - */ - for (i = 0; i < cpuidx; i++) { - set_cpu_possible(i, true); - cpu_logical_map(i) = tmp_map[i]; - pr_debug("cpu logical map 0x%x\n", cpu_logical_map(i)); + if (is_smp()) { + /* + * Since the boot CPU node contains proper data, and all + * nodes have a reg property, the DT CPU list can be + * considered valid and the logical map created in + * smp_setup_processor_id() can be overridden + */ + for (i = 0; i < cpuidx; i++) { + set_cpu_possible(i, true); + cpu_logical_map(i) = tmp_map[i]; + pr_debug("cpu logical map 0x%x\n", cpu_logical_map(i)); + } } } -- FTTC broadband for 0.8mile line: currently@9.6Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-24 15:33 ` Russell King - ARM Linux @ 2015-11-28 11:13 ` Nikita Yushchenko 2015-11-30 8:25 ` Nikita Yushchenko 0 siblings, 1 reply; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-28 11:13 UTC (permalink / raw) To: linux-arm-kernel >> Not sure I understand logic behind this. With the current code, >> resulting cpu_possible_mask depends on CONFIG_SMP_ON_UP: >> - if it is set, cpu_possible_mask contains (0 1), as initialized in >> arm_dt_init_cpu_maps() >> - if it is not set, cpu_possible_mask contains (0), since >> imx_smp_init_cpus() removes 1 from there. > > Right, adding debug to arch/arm/kernel/setup.c, just before the > "if (is_smp())" shows: > > is_smp() 0 possible 3 present 1 online 1 > > which is totally wrong: if is_smp() is false, we should not be setting > up any possible CPUs. See a patch below to fix that. > > However, this doesn't matter much, because the code in setup.c won't > initialise the SMP operations struct ... But cpu start code is not the only place in the kernel that uses cpu_present_mask. Are you sure that running with invalid cpu_present_mask has no side effects? > Here's the patch to fix the DT code, which should not be setting > present CPUs when is_smp() is false. I see that this fixes the issue as well. But I still don't understand rationale behind all these is_smp() checks. This makes init sequence different with and without CONFIG_SMP_ON_UP. Isn't kernel intended to run ok without CONFIG_SMP_ON_UP? And if yes - then why not run the same init sequence in both cases? ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case 2015-11-28 11:13 ` Nikita Yushchenko @ 2015-11-30 8:25 ` Nikita Yushchenko 0 siblings, 0 replies; 16+ messages in thread From: Nikita Yushchenko @ 2015-11-30 8:25 UTC (permalink / raw) To: linux-arm-kernel 28.11.2015 14:13, Nikita Yushchenko ?????: >>> Not sure I understand logic behind this. With the current code, >>> resulting cpu_possible_mask depends on CONFIG_SMP_ON_UP: >>> - if it is set, cpu_possible_mask contains (0 1), as initialized in >>> arm_dt_init_cpu_maps() >>> - if it is not set, cpu_possible_mask contains (0), since >>> imx_smp_init_cpus() removes 1 from there. >> >> Right, adding debug to arch/arm/kernel/setup.c, just before the >> "if (is_smp())" shows: >> >> is_smp() 0 possible 3 present 1 online 1 >> >> which is totally wrong: if is_smp() is false, we should not be setting >> up any possible CPUs. See a patch below to fix that. >> >> However, this doesn't matter much, because the code in setup.c won't >> initialise the SMP operations struct ... > > But cpu start code is not the only place in the kernel that uses cpu_present_mask. > > Are you sure that running with invalid cpu_present_mask has no side effects? At least LTP suite does not like it: while running /opt/ltp/runtest/cpuhotplug, we see things like the above <<<test_start>>> tag=cpuhotplug02 stime=1446628761 cmdline="cpuhotplug02.sh -c 1 -l 1" contacts="" analysis=exit <<<test_output>>> Name: cpuhotplug02 Date: Wed Nov 4 09:19:21 UTC 2015 Desc: What happens to a process when its CPU is offlined? CPU is 1 /opt/ltp/testcases/bin/cpuhotplug_hotplug.sh: line 76: echo: write error: Function not implemented cpuhotplug02 1 TBROK : CPU1 cannot be onlined <<<execution_status>>> initiation_status="ok" duration=1 termination_type=exited termination_id=2 corefile=no cutime=4 cstime=6 <<<test_end>>> ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-11-30 8:25 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-11-23 11:59 [RFC/PATCH] arm: do not skip SMP init calls on SMP_ON_UP case nyushchenko at dev.rtsoft.ru 2015-11-23 12:03 ` Russell King - ARM Linux 2015-11-23 12:06 ` Nikita Yushchenko 2015-11-23 12:12 ` Russell King - ARM Linux 2015-11-23 12:19 ` Russell King - ARM Linux 2015-11-23 12:46 ` Nikita Yushchenko 2015-11-23 12:32 ` Vladimir Murzin 2015-11-23 12:42 ` Nikita Yushchenko 2015-11-23 12:47 ` Nikita Yushchenko 2015-11-23 13:04 ` Russell King - ARM Linux 2015-11-24 14:52 ` Nikita Yushchenko 2015-11-24 15:05 ` Nikita Yushchenko 2015-11-24 15:28 ` Nikita Yushchenko 2015-11-24 15:33 ` Russell King - ARM Linux 2015-11-28 11:13 ` Nikita Yushchenko 2015-11-30 8:25 ` Nikita Yushchenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).