2010-11-20 02:17:28

by Colin Cross

Subject: [PATCH] ARM: Fix spinlock bad magic on disabling nonboot cpu

The init_mm.context.id_lock spinlock is not initialized, which
causes a spinlock bad magic warning when nonboot cpus are disabled,
either through hotplug or during suspend.

Signed-off-by: Colin Cross <[email protected]>
---
arch/arm/include/asm/mmu.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h
index 68870c7..1556f6a 100644
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
@@ -13,6 +13,8 @@ typedef struct {

#ifdef CONFIG_CPU_HAS_ASID
#define ASID(mm) ((mm)->context.id & 255)
+#define INIT_MM_CONTEXT(name) \
+ .context.id_lock = __SPIN_LOCK_UNLOCKED(name.context.id_lock),
#else
#define ASID(mm) (0)
#endif
--
1.7.3.1

2010-11-20 03:02:58

by Kyungmin Park

Subject: Re: [PATCH] ARM: Fix spinlock bad magic on disabling nonboot cpu

Hi,

I wonder why this patch is not merged previous rc cycles.

it's already reported by Mr. Ham (a month or more ago) and get some
acked for merge.

To Rusell, Catalin,
How to include or commit the latest kernel?

Thank you,
Kyungmin Park

On Sat, Nov 20, 2010 at 11:16 AM, Colin Cross <[email protected]> wrote:
> The init_mm.context.id_lock spinlock is not initialized, which
> causes a spinlock bad magic warning when nonboot cpus are disabled,
> either through hotplug or during suspend.
>
> Signed-off-by: Colin Cross <[email protected]>
> ---
> ?arch/arm/include/asm/mmu.h | ? ?2 ++
> ?1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h
> index 68870c7..1556f6a 100644
> --- a/arch/arm/include/asm/mmu.h
> +++ b/arch/arm/include/asm/mmu.h
> @@ -13,6 +13,8 @@ typedef struct {
>
> ?#ifdef CONFIG_CPU_HAS_ASID
> ?#define ASID(mm) ? ? ? ((mm)->context.id & 255)
> +#define INIT_MM_CONTEXT(name) ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \
> + ? ? ? ?.context.id_lock = __SPIN_LOCK_UNLOCKED(name.context.id_lock),
> ?#else
> ?#define ASID(mm) ? ? ? (0)
> ?#endif
> --
> 1.7.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at ?http://www.tux.org/lkml/
>

2010-11-20 08:18:23

by Catalin Marinas

Subject: Re: [PATCH] ARM: Fix spinlock bad magic on disabling nonboot cpu

On Saturday, November 20, 2010, Kyungmin Park <[email protected]> wrote:
> Hi,b
>
> I wonder why this patch is not merged previous rc cycles.
>
> it's already reported by Mr. Ham (a month or more ago) and get some
> acked for merge.
>
> To Rusell, Catalin,
> How to include or commit the latest kernel?

Just send the patch to Russell's patch system and Russell will pick it
up. I recall I already acked this patch.


--
Catalin