From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754075AbdKAEPS (ORCPT ); Wed, 1 Nov 2017 00:15:18 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:46647 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750778AbdKAEPR (ORCPT ); Wed, 1 Nov 2017 00:15:17 -0400 X-Google-Smtp-Source: ABhQp+TYMtaMYS9lUHKpZd0Fk+AdjV6BJVvlTnZCzfU36CQ01z7yV15CiFEvGOmLxpG8NZ0UGGy3bQ== From: Rakib Mullick To: mingo@kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Linus Torvalds , Peter Zijlstra Subject: [PATCH] irq/core: Fix boot crash when the irqaffinity= boot parameter is passed on CPUMASK_OFFSTACK=y kernels(v1) Date: Wed, 1 Nov 2017 10:14:51 +0600 Message-Id: <20171101041451.12581-1-rakib.mullick@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Rakib Mullick Cc: Thomas Gleixner Cc: Linus Torvalds Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20171026045800.27087-1-rakib.mullick@gmail.com Signed-off-by: Ingo Molnar --- 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(-) diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 82afb7e..e97bbae 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -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); } -- 2.9.3