2014-07-22 08:05:13

by Wanpeng Li

[permalink] [raw]
Subject: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

[ 220.262093] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
[ 220.262104] IP: [<ffffffff810e7ac9>] find_busiest_group+0x2b9/0xa30
[ 220.262111] PGD 5a9d5067 PUD 13067 PMD 0
[ 220.262117] Oops: 0000 [#3] SMP
[...]
[ 220.262245] Call Trace:
[ 220.262252] [<ffffffff810e8396>] load_balance+0x156/0x980
[ 220.262259] [<ffffffff816eeffe>] ? _raw_spin_unlock_irqrestore+0x2e/0xa0
[ 220.262266] [<ffffffff810e9aa3>] idle_balance+0xe3/0x150
[ 220.262270] [<ffffffff816ec4e7>] __schedule+0x797/0x8d0
[ 220.262277] [<ffffffff816ec934>] schedule+0x24/0x70
[ 220.262283] [<ffffffff816e9cd9>] schedule_timeout+0x119/0x1f0
[ 220.262294] [<ffffffff810bb6e0>] ? lock_timer_base+0x70/0x70
[ 220.262301] [<ffffffff816e9dc9>] schedule_timeout_uninterruptible+0x19/0x20
[ 220.262308] [<ffffffff810bd3e8>] msleep+0x18/0x20
[ 220.262317] [<ffffffff813aa11a>] lock_device_hotplug_sysfs+0x2a/0x50
[ 220.262323] [<ffffffff813aa16e>] online_store+0x2e/0x80
[ 220.262358] [<ffffffff813a873b>] dev_attr_store+0x1b/0x20
[ 220.262366] [<ffffffff812292fd>] sysfs_write_file+0xdd/0x160
[ 220.262377] [<ffffffff811b7e78>] vfs_write+0xc8/0x170
[ 220.262384] [<ffffffff811b83ca>] SyS_write+0x5a/0xa0
[ 220.262388] [<ffffffff816f76b9>] system_call_fastpath+0x16/0x1b

Last level cache shared map is built during cpu up and build sched domain
routine takes advantage of it to setup sched domain cpu topology, however,
llc shared map is unreleased during cpu disable which lead to invalid sched
domain cpu topology. This patch fix it by release llc shared map correctly
during cpu disable.

Signed-off-by: Wanpeng Li <[email protected]>
---
v1 -> v2:
* fix subject line

arch/x86/kernel/smpboot.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 5492798..0134ec7 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1292,6 +1292,9 @@ static void remove_siblinginfo(int cpu)

for_each_cpu(sibling, cpu_sibling_mask(cpu))
cpumask_clear_cpu(cpu, cpu_sibling_mask(sibling));
+ for_each_cpu(sibling, cpu_llc_shared_mask(cpu))
+ cpumask_clear_cpu(cpu, cpu_llc_shared_mask(sibling));
+ cpumask_clear(cpu_llc_shared_mask(cpu));
cpumask_clear(cpu_sibling_mask(cpu));
cpumask_clear(cpu_core_mask(cpu));
c->phys_proc_id = 0;
--
1.9.1


2014-07-22 09:17:30

by Chen, Gong

[permalink] [raw]
Subject: Re: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

On Tue, Jul 22, 2014 at 04:04:52PM +0800, Wanpeng Li wrote:
> Subject: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu
> hotplug

See this link:
https://lkml.org/lkml/2014/7/17/78


Attachments:
(No filename) (199.00 B)
signature.asc (819.00 B)
Digital signature
Download all attachments

2014-07-22 09:29:29

by Wanpeng Li

[permalink] [raw]
Subject: Re: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

On Tue, Jul 22, 2014 at 04:46:41AM -0400, Chen, Gong wrote:
>On Tue, Jul 22, 2014 at 04:04:52PM +0800, Wanpeng Li wrote:
>> Subject: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu
>> hotplug
>
>See this link:
>https://lkml.org/lkml/2014/7/17/78

Interesting, thanks for your pointing out.

Regards,
Wanpeng Li

2014-07-22 09:44:30

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

On Tue, Jul 22, 2014 at 05:30:23PM +0800, Wanpeng Li wrote:
> On Tue, Jul 22, 2014 at 04:46:41AM -0400, Chen, Gong wrote:
> >On Tue, Jul 22, 2014 at 04:04:52PM +0800, Wanpeng Li wrote:
> >> Subject: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu
> >> hotplug
> >
> >See this link:
> >https://lkml.org/lkml/2014/7/17/78
>
> Interesting, thanks for your pointing out.

Well, we might end up doing both.

Yasuaki's patch makes the core numbering stable which makes a lot of
sense in and of itself.

However, if some code somewhere relies implicitly on the fact that a set
bit in LLC mask means that core is online and goes and does stuff on it,
Wanpeng's reported splat will happen.

So probably we will have to have *stable* core numbers *and* clear the
LLC mask in order to be on the safe side of things.

Thanks.

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

2014-07-23 08:57:18

by Yasuaki Ishimatsu

[permalink] [raw]
Subject: Re: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

(2014/07/22 17:04), Wanpeng Li wrote:
> [ 220.262093] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
> [ 220.262104] IP: [<ffffffff810e7ac9>] find_busiest_group+0x2b9/0xa30
> [ 220.262111] PGD 5a9d5067 PUD 13067 PMD 0
> [ 220.262117] Oops: 0000 [#3] SMP
> [...]
> [ 220.262245] Call Trace:
> [ 220.262252] [<ffffffff810e8396>] load_balance+0x156/0x980
> [ 220.262259] [<ffffffff816eeffe>] ? _raw_spin_unlock_irqrestore+0x2e/0xa0
> [ 220.262266] [<ffffffff810e9aa3>] idle_balance+0xe3/0x150
> [ 220.262270] [<ffffffff816ec4e7>] __schedule+0x797/0x8d0
> [ 220.262277] [<ffffffff816ec934>] schedule+0x24/0x70
> [ 220.262283] [<ffffffff816e9cd9>] schedule_timeout+0x119/0x1f0
> [ 220.262294] [<ffffffff810bb6e0>] ? lock_timer_base+0x70/0x70
> [ 220.262301] [<ffffffff816e9dc9>] schedule_timeout_uninterruptible+0x19/0x20
> [ 220.262308] [<ffffffff810bd3e8>] msleep+0x18/0x20
> [ 220.262317] [<ffffffff813aa11a>] lock_device_hotplug_sysfs+0x2a/0x50
> [ 220.262323] [<ffffffff813aa16e>] online_store+0x2e/0x80
> [ 220.262358] [<ffffffff813a873b>] dev_attr_store+0x1b/0x20
> [ 220.262366] [<ffffffff812292fd>] sysfs_write_file+0xdd/0x160
> [ 220.262377] [<ffffffff811b7e78>] vfs_write+0xc8/0x170
> [ 220.262384] [<ffffffff811b83ca>] SyS_write+0x5a/0xa0
> [ 220.262388] [<ffffffff816f76b9>] system_call_fastpath+0x16/0x1b
>
> Last level cache shared map is built during cpu up and build sched domain
> routine takes advantage of it to setup sched domain cpu topology, however,
> llc shared map is unreleased during cpu disable which lead to invalid sched
> domain cpu topology. This patch fix it by release llc shared map correctly
> during cpu disable.
>

I posted a latest patch as follows:
https://lkml.org/lkml/2014/7/22/1018

Could you confirm the patch fixes your issue?

Thanks,
Yasuaki Ishimatsu

> Signed-off-by: Wanpeng Li <[email protected]>
> ---
> v1 -> v2:
> * fix subject line
>
> arch/x86/kernel/smpboot.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> index 5492798..0134ec7 100644
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@ -1292,6 +1292,9 @@ static void remove_siblinginfo(int cpu)
>
> for_each_cpu(sibling, cpu_sibling_mask(cpu))
> cpumask_clear_cpu(cpu, cpu_sibling_mask(sibling));
> + for_each_cpu(sibling, cpu_llc_shared_mask(cpu))
> + cpumask_clear_cpu(cpu, cpu_llc_shared_mask(sibling));
> + cpumask_clear(cpu_llc_shared_mask(cpu));
> cpumask_clear(cpu_sibling_mask(cpu));
> cpumask_clear(cpu_core_mask(cpu));
> c->phys_proc_id = 0;
>

2014-07-29 07:05:13

by Wanpeng Li

[permalink] [raw]
Subject: Re: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

Hi Yasuaki,
On Wed, Jul 23, 2014 at 05:56:07PM +0900, Yasuaki Ishimatsu wrote:
>(2014/07/22 17:04), Wanpeng Li wrote:
>> [ 220.262093] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
>> [ 220.262104] IP: [<ffffffff810e7ac9>] find_busiest_group+0x2b9/0xa30
>> [ 220.262111] PGD 5a9d5067 PUD 13067 PMD 0
>> [ 220.262117] Oops: 0000 [#3] SMP
>> [...]
>> [ 220.262245] Call Trace:
>> [ 220.262252] [<ffffffff810e8396>] load_balance+0x156/0x980
>> [ 220.262259] [<ffffffff816eeffe>] ? _raw_spin_unlock_irqrestore+0x2e/0xa0
>> [ 220.262266] [<ffffffff810e9aa3>] idle_balance+0xe3/0x150
>> [ 220.262270] [<ffffffff816ec4e7>] __schedule+0x797/0x8d0
>> [ 220.262277] [<ffffffff816ec934>] schedule+0x24/0x70
>> [ 220.262283] [<ffffffff816e9cd9>] schedule_timeout+0x119/0x1f0
>> [ 220.262294] [<ffffffff810bb6e0>] ? lock_timer_base+0x70/0x70
>> [ 220.262301] [<ffffffff816e9dc9>] schedule_timeout_uninterruptible+0x19/0x20
>> [ 220.262308] [<ffffffff810bd3e8>] msleep+0x18/0x20
>> [ 220.262317] [<ffffffff813aa11a>] lock_device_hotplug_sysfs+0x2a/0x50
>> [ 220.262323] [<ffffffff813aa16e>] online_store+0x2e/0x80
>> [ 220.262358] [<ffffffff813a873b>] dev_attr_store+0x1b/0x20
>> [ 220.262366] [<ffffffff812292fd>] sysfs_write_file+0xdd/0x160
>> [ 220.262377] [<ffffffff811b7e78>] vfs_write+0xc8/0x170
>> [ 220.262384] [<ffffffff811b83ca>] SyS_write+0x5a/0xa0
>> [ 220.262388] [<ffffffff816f76b9>] system_call_fastpath+0x16/0x1b
>>
>> Last level cache shared map is built during cpu up and build sched domain
>> routine takes advantage of it to setup sched domain cpu topology, however,
>> llc shared map is unreleased during cpu disable which lead to invalid sched
>> domain cpu topology. This patch fix it by release llc shared map correctly
>> during cpu disable.
>>
>
>I posted a latest patch as follows:
>https://lkml.org/lkml/2014/7/22/1018
>
>Could you confirm the patch fixes your issue?

Sorry for the late, there is still call trace w/ your patch applied. The
call trace is in attachment.

Regards,
Wanpeng Li

>
>Thanks,
>Yasuaki Ishimatsu
>
>> Signed-off-by: Wanpeng Li <[email protected]>
>> ---
>> v1 -> v2:
>> * fix subject line
>>
>> arch/x86/kernel/smpboot.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
>> index 5492798..0134ec7 100644
>> --- a/arch/x86/kernel/smpboot.c
>> +++ b/arch/x86/kernel/smpboot.c
>> @@ -1292,6 +1292,9 @@ static void remove_siblinginfo(int cpu)
>>
>> for_each_cpu(sibling, cpu_sibling_mask(cpu))
>> cpumask_clear_cpu(cpu, cpu_sibling_mask(sibling));
>> + for_each_cpu(sibling, cpu_llc_shared_mask(cpu))
>> + cpumask_clear_cpu(cpu, cpu_llc_shared_mask(sibling));
>> + cpumask_clear(cpu_llc_shared_mask(cpu));
>> cpumask_clear(cpu_sibling_mask(cpu));
>> cpumask_clear(cpu_core_mask(cpu));
>> c->phys_proc_id = 0;
>>
>


Attachments:
(No filename) (2.85 kB)
call trace.txt (13.65 kB)
Download all attachments

2014-07-29 07:32:41

by Yasuaki Ishimatsu

[permalink] [raw]
Subject: Re: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

Hi Wanpeng,

(2014/07/29 16:06), Wanpeng Li wrote:
> Hi Yasuaki,
> On Wed, Jul 23, 2014 at 05:56:07PM +0900, Yasuaki Ishimatsu wrote:
>> (2014/07/22 17:04), Wanpeng Li wrote:
>>> [ 220.262093] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
>>> [ 220.262104] IP: [<ffffffff810e7ac9>] find_busiest_group+0x2b9/0xa30
>>> [ 220.262111] PGD 5a9d5067 PUD 13067 PMD 0
>>> [ 220.262117] Oops: 0000 [#3] SMP
>>> [...]
>>> [ 220.262245] Call Trace:
>>> [ 220.262252] [<ffffffff810e8396>] load_balance+0x156/0x980
>>> [ 220.262259] [<ffffffff816eeffe>] ? _raw_spin_unlock_irqrestore+0x2e/0xa0
>>> [ 220.262266] [<ffffffff810e9aa3>] idle_balance+0xe3/0x150
>>> [ 220.262270] [<ffffffff816ec4e7>] __schedule+0x797/0x8d0
>>> [ 220.262277] [<ffffffff816ec934>] schedule+0x24/0x70
>>> [ 220.262283] [<ffffffff816e9cd9>] schedule_timeout+0x119/0x1f0
>>> [ 220.262294] [<ffffffff810bb6e0>] ? lock_timer_base+0x70/0x70
>>> [ 220.262301] [<ffffffff816e9dc9>] schedule_timeout_uninterruptible+0x19/0x20
>>> [ 220.262308] [<ffffffff810bd3e8>] msleep+0x18/0x20
>>> [ 220.262317] [<ffffffff813aa11a>] lock_device_hotplug_sysfs+0x2a/0x50
>>> [ 220.262323] [<ffffffff813aa16e>] online_store+0x2e/0x80
>>> [ 220.262358] [<ffffffff813a873b>] dev_attr_store+0x1b/0x20
>>> [ 220.262366] [<ffffffff812292fd>] sysfs_write_file+0xdd/0x160
>>> [ 220.262377] [<ffffffff811b7e78>] vfs_write+0xc8/0x170
>>> [ 220.262384] [<ffffffff811b83ca>] SyS_write+0x5a/0xa0
>>> [ 220.262388] [<ffffffff816f76b9>] system_call_fastpath+0x16/0x1b
>>>
>>> Last level cache shared map is built during cpu up and build sched domain
>>> routine takes advantage of it to setup sched domain cpu topology, however,
>>> llc shared map is unreleased during cpu disable which lead to invalid sched
>>> domain cpu topology. This patch fix it by release llc shared map correctly
>>> during cpu disable.
>>>
>>
>> I posted a latest patch as follows:
>> https://lkml.org/lkml/2014/7/22/1018
>>
>> Could you confirm the patch fixes your issue?
>
> Sorry for the late, there is still call trace w/ your patch applied. The
> call trace is in attachment.

Thank you for reporting the result. As Borislav said, your v2 patch
is necessary for fixing your issue.

>
> Regards,
> Wanpeng Li
>
>>
>> Thanks,
>> Yasuaki Ishimatsu
>>
>>> Signed-off-by: Wanpeng Li <[email protected]>

Reviewed-by: Yasuaki Ishimatsu <[email protected]>

Thanks,
Yasuaki Ishimatsu

>>> ---
>>> v1 -> v2:
>>> * fix subject line
>>>
>>> arch/x86/kernel/smpboot.c | 3 +++
>>> 1 file changed, 3 insertions(+)
>>>
>>> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
>>> index 5492798..0134ec7 100644
>>> --- a/arch/x86/kernel/smpboot.c
>>> +++ b/arch/x86/kernel/smpboot.c
>>> @@ -1292,6 +1292,9 @@ static void remove_siblinginfo(int cpu)
>>>
>>> for_each_cpu(sibling, cpu_sibling_mask(cpu))
>>> cpumask_clear_cpu(cpu, cpu_sibling_mask(sibling));
>>> + for_each_cpu(sibling, cpu_llc_shared_mask(cpu))
>>> + cpumask_clear_cpu(cpu, cpu_llc_shared_mask(sibling));
>>> + cpumask_clear(cpu_llc_shared_mask(cpu));
>>> cpumask_clear(cpu_sibling_mask(cpu));
>>> cpumask_clear(cpu_core_mask(cpu));
>>> c->phys_proc_id = 0;
>>>
>>

2014-07-29 08:34:08

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

On Tue, Jul 29, 2014 at 04:31:30PM +0900, Yasuaki Ishimatsu wrote:
> >>I posted a latest patch as follows:
> >>https://lkml.org/lkml/2014/7/22/1018
> >>
> >>Could you confirm the patch fixes your issue?
> >
> >Sorry for the late, there is still call trace w/ your patch applied. The
> >call trace is in attachment.
>
> Thank you for reporting the result. As Borislav said, your v2 patch
> is necessary for fixing your issue.

..

> >>>Signed-off-by: Wanpeng Li <[email protected]>
>
> Reviewed-by: Yasuaki Ishimatsu <[email protected]>

Ok, Wanpeng, please send a cleaner version of your patch with a
simplified backtrace in it - the addresses will make no sense anyway so
you can do this:

Call Trace:
load_balance
? _raw_spin_unlock_irqrestore
idle_balance
...

so that we can still see how it happens.

Thanks.

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

2014-07-29 09:01:39

by Wanpeng Li

[permalink] [raw]
Subject: Re: [PATCH v2] x86, hotplug: fix llc shared map unreleased during cpu hotplug

On Tue, Jul 29, 2014 at 10:33:59AM +0200, Borislav Petkov wrote:
>On Tue, Jul 29, 2014 at 04:31:30PM +0900, Yasuaki Ishimatsu wrote:
>> >>I posted a latest patch as follows:
>> >>https://lkml.org/lkml/2014/7/22/1018
>> >>
>> >>Could you confirm the patch fixes your issue?
>> >
>> >Sorry for the late, there is still call trace w/ your patch applied. The
>> >call trace is in attachment.
>>
>> Thank you for reporting the result. As Borislav said, your v2 patch
>> is necessary for fixing your issue.
>
>..
>
>> >>>Signed-off-by: Wanpeng Li <[email protected]>
>>
>> Reviewed-by: Yasuaki Ishimatsu <[email protected]>
>
>Ok, Wanpeng, please send a cleaner version of your patch with a
>simplified backtrace in it - the addresses will make no sense anyway so
>you can do this:
>
>Call Trace:
>load_balance
>? _raw_spin_unlock_irqrestore
>idle_balance
>...
>

Just send out the new version.

Regards,
Wanpeng Li

>so that we can still see how it happens.
>
>Thanks.
>
>--
>Regards/Gruss,
> Boris.
>
>Sent from a fat crate under my desk. Formatting is fine.
>--