From patchwork Mon Nov 8 16:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 1552443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OnsNZZ9N; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OnsNZZ9N; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hnxrt31frz9s1l for ; Tue, 9 Nov 2021 03:48:45 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Hnxrr10Wbz2ymk for ; Tue, 9 Nov 2021 03:48:44 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OnsNZZ9N; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OnsNZZ9N; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=longman@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OnsNZZ9N; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OnsNZZ9N; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4HnxrW6Rccz2xDr for ; Tue, 9 Nov 2021 03:48:25 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636390100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=z7LY8TgzSzRlxstIDXAu/WaXnqAVsKrKahWLI0s7ntI=; b=OnsNZZ9NsHbtKFEkruU9myByKBe7z4ivAq6pH9Uc2v8OYZTXzVCFIvsc0K55u295HGnzbN TsACOH4wSejVoi+vdV3AlSTplagAEnDQrGWN9Tc699ehS1zap9yy6fk7zWkc1NbRPDEFsP ebVXZ6CvatWyPk+qi37y4PnohetgMio= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636390100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=z7LY8TgzSzRlxstIDXAu/WaXnqAVsKrKahWLI0s7ntI=; b=OnsNZZ9NsHbtKFEkruU9myByKBe7z4ivAq6pH9Uc2v8OYZTXzVCFIvsc0K55u295HGnzbN TsACOH4wSejVoi+vdV3AlSTplagAEnDQrGWN9Tc699ehS1zap9yy6fk7zWkc1NbRPDEFsP ebVXZ6CvatWyPk+qi37y4PnohetgMio= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-324-hH6Qm3GHMyesr4xqUckv2Q-1; Mon, 08 Nov 2021 11:48:18 -0500 X-MC-Unique: hH6Qm3GHMyesr4xqUckv2Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E36E1835ADC; Mon, 8 Nov 2021 16:48:12 +0000 (UTC) Received: from llong.com (unknown [10.22.18.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAA9460BF4; Mon, 8 Nov 2021 16:48:09 +0000 (UTC) From: Waiman Long To: Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Daniel Henrique Barboza , Nathan Lynch , "Aneesh Kumar K.V" Subject: [PATCH] powerpc/pseries/cpuhp: Use alloc_cpumask_var() in pseries_cpu_hotplug_init() Date: Mon, 8 Nov 2021 11:47:51 -0500 Message-Id: <20211108164751.65565-1-longman@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Nicholas Piggin , Waiman Long , Laurent Dufour , Zhang Xiaoxu Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" It was found that the following warning message could be printed out when booting the kernel on PowerPC systems that support LPAR: [ 0.129584] WARNING: CPU: 0 PID: 1 at mm/memblock.c:1451 memblock_alloc_internal+0x5c/0x104 [ 0.129593] Modules linked in: [ 0.129598] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.14.0-11.el9.ppc64le+debug #1 [ 0.129605] NIP: c000000002040134 LR: c00000000204011c CTR: c0000000020241a8 [ 0.129610] REGS: c000000005637760 TRAP: 0700 Not tainted (5.14.0-11.el9.ppc64le+debug) [ 0.129616] MSR: 8000000002029033 CR: 48000222 XER: 00000002 [ 0.129635] CFAR: c0000000004d1cf4 IRQMASK: 0 [ 0.129635] GPR00: c00000000204011c c000000005637a00 c000000002c94d00 0000000000000001 [ 0.129635] GPR04: 0000000000000080 0000000000000000 0000000000000000 ffffffffffffffff [ 0.129635] GPR08: 0000000000000000 0000000000000003 c00000000205ac64 0000000000080000 [ 0.129635] GPR12: 0000000000000000 c0000000049d0000 c000000000013078 0000000000000000 [ 0.129635] GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 [ 0.129635] GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 [ 0.129635] GPR24: c000000002003808 c00000000146f7b8 0000000000000000 0000000000000100 [ 0.129635] GPR28: c000000002d7cf80 0000000000000000 0000000000000008 0000000000000000 [ 0.129710] NIP [c000000002040134] memblock_alloc_internal+0x5c/0x104 [ 0.129717] LR [c00000000204011c] memblock_alloc_internal+0x44/0x104 [ 0.129723] Call Trace: [ 0.129726] [c000000005637a00] [c000000005637a40] 0xc000000005637a40 (unreliable) [ 0.129735] [c000000005637a60] [c0000000020404d8] memblock_alloc_try_nid+0x94/0xcc [ 0.129743] [c000000005637af0] [c00000000205ac64] alloc_bootmem_cpumask_var+0x4c/0x9c [ 0.129751] [c000000005637b60] [c0000000020242e0] __machine_initcall_pseries_pseries_cpu_hotplug_init+0x138/0x1d8 [ 0.129760] [c000000005637bf0] [c000000000012404] do_one_initcall+0xa4/0x4f0 [ 0.129768] [c000000005637cd0] [c000000002005358] do_initcalls+0x140/0x18c [ 0.129776] [c000000005637d80] [c0000000020055b8] kernel_init_freeable+0x178/0x1d0 [ 0.129783] [c000000005637db0] [c0000000000130a0] kernel_init+0x30/0x190 [ 0.129790] [c000000005637e10] [c00000000000cef4] ret_from_kernel_thread+0x5c/0x64 The warning is printed in memblock_alloc_internal() because the slab has been initialized when the initcalls are being processed. To avoid the warning, change alloc_bootmem_cpumask_var() call in pseries_cpu_hotplug_init() to alloc_cpumask_var() instead. Also change cpumask_or() to cpumask_copy() or we will have to use zalloc_cpumask_var(). Fixes: bd1dd4c5f528 ("powerpc/pseries: Prevent free CPU ids being reused on another node") Signed-off-by: Waiman Long --- arch/powerpc/platforms/pseries/hotplug-cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index 5ab44600c8d3..e8e08d916b16 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -864,12 +864,12 @@ static int __init pseries_cpu_hotplug_init(void) /* Processors can be added/removed only on LPAR */ if (firmware_has_feature(FW_FEATURE_LPAR)) { for_each_node(node) { - alloc_bootmem_cpumask_var(&node_recorded_ids_map[node]); + alloc_cpumask_var(&node_recorded_ids_map[node], + GFP_KERNEL|GFP_NOWAIT); /* Record ids of CPU added at boot time */ - cpumask_or(node_recorded_ids_map[node], - node_recorded_ids_map[node], - cpumask_of_node(node)); + cpumask_copy(node_recorded_ids_map[node], + cpumask_of_node(node)); } of_reconfig_notifier_register(&pseries_smp_nb);