Fix boot failure when irqaffinity is passed.
PATCH 1/1 Fix boot failure when irqaffinity is passed.
When irqaffinity kernel param is passed in a CPUMASK_OFFSTACK=y build kernel, it fails to boot. zalloc_cpumask_var() cannot be used before initializing mm stuff (slab allocator) to allocate cpumask. So, use alloc_bootmem_cpumask_var(). Also in init_irq_default_affinity() removes unneeded ifdef, these ifdef conditions are handled at defination site.
--- kernel/irq/irqdesc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/irq/irqdesc.c +1 -3
@@ -27,7 +27,7 @@ static struct lock_class_key irq_desc_lock_class;#if defined(CONFIG_SMP )static int __init irq_affinity_setup (char *str) { -zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); +alloc_bootmem_cpumask_var (&irq_default_affinity);cpulist_parse (str, irq_default_affinity);/* * Set at least the boot cpu. We don't want to end up with
@@ -40,10 +40,8 @@ __setup("irqaffinity=", irq_affinity_setup);static void __init init_irq_default_affinity (void ) { -#ifdef CONFIG_CPUMASK_OFFSTACK if (!irq_default_affinity)zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); -#endif if (cpumask_empty (irq_default_affinity))cpumask_setall (irq_default_affinity); }
Signature · 1 line
2.9.3
Quoted 25 lines · Rakib Mullick
When irqaffinity kernel param is passed in a CPUMASK_OFFSTACK=y build kernel, it fails to boot.
zalloc_cpumask_var()cannot be used before initializing mm stuff (slab allocator) to allocate cpumask. So, usealloc_bootmem_cpumask_var(). Also ininit_irq_default_affinity()removes unneeded ifdef, these ifdef conditions are handled at defination site.Signed-off-by Rakib Mullick <[email protected]>--- kernel/irq/irqdesc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)kernel/irq/irqdesc.c +1
-1@@ -27,7 +27,7 @@ static struct lock_class_key irq_desc_lock_class;#if defined(CONFIG_SMP )static int __init irq_affinity_setup (char *str) { -zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); +alloc_bootmem_cpumask_var (&irq_default_affinity);cpulist_parse (str, irq_default_affinity);/* * Set at least the boot cpu. We don't want to end up with
kernel/irq/irqdesc.c __setup("irqaffinity=", irq_affinity_setup); · line 47
Quoted 10 lines
kernel/irq/irqdesc.c +0
-2@@ -40,10 +40,8 @@ __setup("irqaffinity=", irq_affinity_setup);static void __init init_irq_default_affinity (void ) { -#ifdef CONFIG_CPUMASK_OFFSTACK if (!irq_default_affinity)zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); -#endif if (cpumask_empty (irq_default_affinity))cpumask_setall (irq_default_affinity); }
Not applied, because this patch causes the following build warning:
kernel/irq/irqdesc.c:43:6: warning: the address of ‘irq_default_affinity’ will always evaluate as ‘true’ [-Waddress]
Also, please pick up the improved changelog below for the next version of the patch.
Thanks,
Ingo
===============>
Quoted 1 line
From
57b19413bbe77f0da6f161a5b2b68a73b42ba157Mon Sep 17 00:00:00 2001
From: Rakib Mullick <[email protected]>
Date: Thu, 26 Oct 2017 10:58:00 +0600
Subject: [PATCH] irq/core: Fix boot crash when the irqaffinity= boot parameter is passed on CPUMASK_OFFSTACK=y kernels
When the irqaffinity= kernel parameter is passed in a CPUMASK_OFFSTACK=y kernel, it fails to boot, because zalloc_cpumask_var() cannot be used before initializing the slab allocator to allocate a cpumask.
So, use alloc_bootmem_cpumask_var() instead.
Also do some cleanups while at it: in init_irq_default_affinity() remove an unnecessary #ifdef.
--- kernel/irq/irqdesc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/irq/irqdesc.c +1 -3
@@ -27,7 +27,7 @@ static struct lock_class_key irq_desc_lock_class;#if defined(CONFIG_SMP )static int __init irq_affinity_setup (char *str) { -zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); +alloc_bootmem_cpumask_var (&irq_default_affinity);cpulist_parse (str, irq_default_affinity);/* * Set at least the boot cpu. We don't want to end up with
@@ -40,10 +40,8 @@ __setup("irqaffinity=", irq_affinity_setup);static void __init init_irq_default_affinity (void ) { -#ifdef CONFIG_CPUMASK_OFFSTACK if (!irq_default_affinity)zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); -#endif if (cpumask_empty (irq_default_affinity))cpumask_setall (irq_default_affinity); }
Quoted 6 lines · Ingo Molnar
Not applied, because this patch causes the following build warning:
kernel/irq/irqdesc.c:43:6: warning: the address of ‘irq_default_affinity’ will always evaluate as ‘true’ [-Waddress]
Ah, sorry I didn't look into the build log. It happened due to removal of #ifdef's. Now, it's been fixed by using cpumask_available().
Quoted 3 lines
Also, please pick up the improved changelog below for the next version of the patch.
Thanks for the improved changelog, I have sent a new version here:
https://lkml.org/lkml/2017/11/1/6.
Thanks,
Rakib.
PATCH 1/1 irq/core: Fix boot crash when the irqaffinity= boot parameter is passed on CPUMASK_OFFSTACK=y kernels(v1)
When the irqaffinity= kernel parameter is passed in a CPUMASK_OFFSTACK=y kernel, it fails to boot, because zalloc_cpumask_var() cannot be used before initializing the slab allocator to allocate a cpumask.
So, use alloc_bootmem_cpumask_var() instead.
Also do some cleanups while at it: in init_irq_default_affinity() remove an unnecessary #ifdef.
Change since v0:
* Fix build warning.
---
Patch created against -rc7 (commit 0b07194bb55ed836c2). I found tip had a merge conflict, so used -rc7 instead.
kernel/irq/irqdesc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/irq/irqdesc.c +2 -4
@@ -27,7 +27,7 @@ static struct lock_class_key irq_desc_lock_class;#if defined(CONFIG_SMP )static int __init irq_affinity_setup (char *str) { -zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); +alloc_bootmem_cpumask_var (&irq_default_affinity);cpulist_parse (str, irq_default_affinity);/* * Set at least the boot cpu. We don't want to end up with
@@ -40,10 +40,8 @@ __setup("irqaffinity=", irq_affinity_setup);static void __init init_irq_default_affinity (void ) { -#ifdef CONFIG_CPUMASK_OFFSTACK -if (!irq_default_affinity) +if (!cpumask_available (irq_default_affinity))zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); -#endif if (cpumask_empty (irq_default_affinity))cpumask_setall (irq_default_affinity); }
Signature · 1 line
2.9.3
tip-bot for Rakib Mullick
merge bot[tip:irq/core] irq/core: Fix boot crash when the irqaffinity= boot parameter is passed on CPUMASK_OFFSTACK=y kernels(v1)
irq/core: Fix boot crash when the irqaffinity= boot parameter is passed on CPUMASK_OFFSTACK=y kernels(v1)
Commit-ID: 10d94ff4d558b96bfc4f55bb0051ae4d938246fe Gitweb: https://git.kernel.org/tip/10d94ff4d558b96bfc4f55bb0051ae4d938246fe Author: Rakib Mullick <[email protected]> AuthorDate: Wed, 1 Nov 2017 10:14:51 +0600 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 1 Nov 2017 09:56:39 +0100
irq/core: Fix boot crash when the irqaffinity= boot parameter is passed on CPUMASK_OFFSTACK=y kernels(v1)
When the irqaffinity= kernel parameter is passed in a CPUMASK_OFFSTACK=y kernel, it fails to boot, because zalloc_cpumask_var() cannot be used before initializing the slab allocator to allocate a cpumask.
So, use alloc_bootmem_cpumask_var() instead.
Also do some cleanups while at it: in init_irq_default_affinity() remove an #ifdef via using cpumask_available().
--- kernel/irq/irqdesc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/irq/irqdesc.c +2 -4
@@ -27,7 +27,7 @@ static struct lock_class_key irq_desc_lock_class;#if defined(CONFIG_SMP )static int __init irq_affinity_setup (char *str) { -zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); +alloc_bootmem_cpumask_var (&irq_default_affinity);cpulist_parse (str, irq_default_affinity);/* * Set at least the boot cpu. We don't want to end up with
@@ -40,10 +40,8 @@ __setup("irqaffinity=", irq_affinity_setup);static void __init init_irq_default_affinity (void ) { -#ifdef CONFIG_CPUMASK_OFFSTACK -if (!irq_default_affinity) +if (!cpumask_available (irq_default_affinity))zalloc_cpumask_var (&irq_default_affinity,GFP_NOWAIT ); -#endif if (cpumask_empty (irq_default_affinity))cpumask_setall (irq_default_affinity); }