Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp23753pxb; Tue, 12 Apr 2022 15:43:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTBizu4s/5OjHn6jp21/pVMr86xLgjylkDDokqx+dn5hcp3282n3CalCEn0cr10JvQr3zl X-Received: by 2002:a17:902:dac5:b0:158:5db6:3503 with SMTP id q5-20020a170902dac500b001585db63503mr13308408plx.76.1649803423463; Tue, 12 Apr 2022 15:43:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649803423; cv=none; d=google.com; s=arc-20160816; b=hOAkBeScO/WVaM1fwr9ObZnsAOibM/1kiRyKL8a7Cbk4Q7ctV5LJ8E1eqLupk3gcMy bDlD4h8x5U1TJRNHeuY/xr/nyK+IWjF850lxmrZ4m+cIBOuXvaQ3ALInikDEr/HLgBAt aZUalGPfQj2xLvfvnvNHTAvZjioLNU0KsZmT1VEraS6ZLMbFzalBR4naUDOeCoFheumH odop1U/LAgTH9zqiuo7aN2/kRtjRxcwkvgdJa56s92/zTGCo1/nKhWOdrbTRI/MOWuR9 bKIUgSzT16BO0otLfI5qxk0PYaRgIk6GUaUFFaf631tJ1jpiNW/9bGUq2a+K8CquUoeF otRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IxPMdwCyhoJBo9n3XXGt2fV6FQqVePzYfWRt3PtKmq8=; b=TVdiwGjZy3S2OvmWFXKFZTON1vuL7wdi8Q+POTZfK9otqwQMsKfEGi7+ei80f18aJc jyQVqb6RPd2r7hcE/gIKwlxXazFmDlJhtNOHdF0qwDGxkAqCyxG5Nc4PaZbxFSbWup6v V8OVHgRewI8jRN2E0gaKc76CZVaSWFIM+wvgjbknS85EMd6fY97qWvwdZS8GjI1ReJjn ibvCetDX4e5mmuGXFJLzWRiIp3aUXWCST2sUPOhvmfNVgMo6f8m2TnWN2MsCjBWo8ApR Pmrcnc1LMGtd15RvuZNJbcGlpIn0eav5OAurpZdAd47BJa7h6/xRfBi+SI2WJK6aX6/4 pVbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ypfeAQxB; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id b10-20020a170902bd4a00b00153b2d1641bsi7361576plx.35.2022.04.12.15.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:43:43 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ypfeAQxB; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5FDC51B29CE; Tue, 12 Apr 2022 14:25:31 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352008AbiDLHEf (ORCPT + 99 others); Tue, 12 Apr 2022 03:04:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351563AbiDLGx6 (ORCPT ); Tue, 12 Apr 2022 02:53:58 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A465518B0F; Mon, 11 Apr 2022 23:43:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4E365B818BD; Tue, 12 Apr 2022 06:43:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B12AAC385A6; Tue, 12 Apr 2022 06:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649745780; bh=SaQ5DwnW2tp4Y5ik6tomkdrStt8HxRtHUUmO/NqTM4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ypfeAQxBBZe4aDYm9foJkc9oDvOgM8A30pobAsBNRnu5penA6SbYOoq0vHn5KtBjj 30/cB7Xxg2lqbIwdN89ZS7eKjGqvsuvSJsD3jAVCYA9fW1FaSkbruMtRjweEnq1Ful U5sqz1nY9TmBhMupZQy8xor4xUcWPNf4HiUjqXt4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Abdul haleem , Sourabh Jain , Michael Ellerman , Sasha Levin Subject: [PATCH 5.15 044/277] powerpc: Set crashkernel offset to mid of RMA region Date: Tue, 12 Apr 2022 08:27:27 +0200 Message-Id: <20220412062943.325575963@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062942.022903016@linuxfoundation.org> References: <20220412062942.022903016@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sourabh Jain [ Upstream commit 7c5ed82b800d8615cdda00729e7b62e5899f0b13 ] On large config LPARs (having 192 and more cores), Linux fails to boot due to insufficient memory in the first memblock. It is due to the memory reservation for the crash kernel which starts at 128MB offset of the first memblock. This memory reservation for the crash kernel doesn't leave enough space in the first memblock to accommodate other essential system resources. The crash kernel start address was set to 128MB offset by default to ensure that the crash kernel get some memory below the RMA region which is used to be of size 256MB. But given that the RMA region size can be 512MB or more, setting the crash kernel offset to mid of RMA size will leave enough space for the kernel to allocate memory for other system resources. Since the above crash kernel offset change is only applicable to the LPAR platform, the LPAR feature detection is pushed before the crash kernel reservation. The rest of LPAR specific initialization will still be done during pseries_probe_fw_features as usual. This patch is dependent on changes to paca allocation for boot CPU. It expect boot CPU to discover 1T segment support which is introduced by the patch posted here: https://lists.ozlabs.org/pipermail/linuxppc-dev/2022-January/239175.html Reported-by: Abdul haleem Signed-off-by: Sourabh Jain Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20220204085601.107257-1-sourabhjain@linux.ibm.com Signed-off-by: Sasha Levin --- arch/powerpc/kernel/rtas.c | 6 ++++++ arch/powerpc/kexec/core.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index ff80bbad22a5..e18a725a8e5d 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -1235,6 +1235,12 @@ int __init early_init_dt_scan_rtas(unsigned long node, entryp = of_get_flat_dt_prop(node, "linux,rtas-entry", NULL); sizep = of_get_flat_dt_prop(node, "rtas-size", NULL); +#ifdef CONFIG_PPC64 + /* need this feature to decide the crashkernel offset */ + if (of_get_flat_dt_prop(node, "ibm,hypertas-functions", NULL)) + powerpc_firmware_features |= FW_FEATURE_LPAR; +#endif + if (basep && entryp && sizep) { rtas.base = *basep; rtas.entry = *entryp; diff --git a/arch/powerpc/kexec/core.c b/arch/powerpc/kexec/core.c index 48525e8b5730..71b1bfdadd76 100644 --- a/arch/powerpc/kexec/core.c +++ b/arch/powerpc/kexec/core.c @@ -147,11 +147,18 @@ void __init reserve_crashkernel(void) if (!crashk_res.start) { #ifdef CONFIG_PPC64 /* - * On 64bit we split the RMO in half but cap it at half of - * a small SLB (128MB) since the crash kernel needs to place - * itself and some stacks to be in the first segment. + * On the LPAR platform place the crash kernel to mid of + * RMA size (512MB or more) to ensure the crash kernel + * gets enough space to place itself and some stack to be + * in the first segment. At the same time normal kernel + * also get enough space to allocate memory for essential + * system resource in the first segment. Keep the crash + * kernel starts at 128MB offset on other platforms. */ - crashk_res.start = min(0x8000000ULL, (ppc64_rma_size / 2)); + if (firmware_has_feature(FW_FEATURE_LPAR)) + crashk_res.start = ppc64_rma_size / 2; + else + crashk_res.start = min(0x8000000ULL, (ppc64_rma_size / 2)); #else crashk_res.start = KDUMP_KERNELBASE; #endif -- 2.35.1