Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp815733pxb; Tue, 12 Apr 2022 14:13:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJ/W9u+IaJu87VOl9gSqgiFk95QtxoH3QWTG+v3CZhwFJOuNTx+5tdys1GzrpcLRdk0q/m X-Received: by 2002:a05:6a00:14c1:b0:4fd:f3ba:e488 with SMTP id w1-20020a056a0014c100b004fdf3bae488mr39409337pfu.12.1649798027020; Tue, 12 Apr 2022 14:13:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649798027; cv=none; d=google.com; s=arc-20160816; b=oiEbcomoTuozN60aKrHGzMjB6JP1MRWcsgp8X4EMlKR/KbSgK2AczS5jPxDODbWC1N 38Zj3LKH7JxTAQnuf8gSjq7MOfjgJuEGeYKCEQXN9O5QKyujtYeBw6hgIP2dbueue2VD iy4/R3MxyMsNzG9bAsvQm+fNouPqFgsRRg9Bl9i+1P0pMLIdCjfAomgPKYtuMYljkCch TURome5KAgj+TowSec+qEEBtIQRTRuYw71at4O8Fq+xqwxD8iEQDjcJs2x2rv6NWSXLb Vsat3dc+ZsNfkelNYtrsq6xrMPFWeGCgnE0Jg9V/u367iZgtL65JXRCE+ioY9NAyFV5P rlCQ== 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=JimMefGWv68x8aN+Kzbc5Gx3+CFUMIma03vVA1f0HgM=; b=g7YQnzdNgSeMSKJ/4PWhXmRQz5ERZ/eHa6U0zg3F/7kJRr17NBifHTcYLLQziEsnnP C6OjJjFrtrvBd5Vu4qii3bQ1x0gViLrPS88jHkwOO+HcmXV/m4DGQui0MA6y6M89+7yY r6zcO40QZi0XkTD38lmQoZqYcVSFqy7VpTKb6K4o0F7tXVu9qTnj0aZY9ur9y2YAZBuI aVnGoRW7/7MBn9S1c8oKMtjPao6iJpDlFVWd6sviNSJCS+KjDHGIAfp5QZirEvX1yMWG GO6ZluAIjHVYUxEYH8pCzGqJJ332hEROj/wZGczKXkpl1v2gl0Iij8gin8TpaHTVVupW 7GKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bV3WmzDG; 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 t14-20020a170902e84e00b001584ee3ba07si9714871plg.439.2022.04.12.14.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:13:47 -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=bV3WmzDG; 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 out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C9AE19683D; Tue, 12 Apr 2022 13:29:28 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349603AbiDLGis (ORCPT + 99 others); Tue, 12 Apr 2022 02:38:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349343AbiDLGg4 (ORCPT ); Tue, 12 Apr 2022 02:36:56 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90ED135AA9; Mon, 11 Apr 2022 23:33:59 -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 sin.source.kernel.org (Postfix) with ESMTPS id E0D02CE1C09; Tue, 12 Apr 2022 06:33:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 016DBC385AE; Tue, 12 Apr 2022 06:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649745236; bh=Yb0wFWbJfHyzzPvhxswgwD9zV7GMn5fuGUIWKit1ZHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bV3WmzDGq7j3NeA6Qd/akga8a3qUpj2rF1Sc3mP9Uw3cdVYXbNvXzx1cJAlKHuv8i AjkdBLQHgu7HLtvxvzUjTvjaEcNRlIPpnZgeX+PExXOcSSZYtBVv4hAOdLUFqmerBs AHGGM6UjAmJa1OlcSOn0pq/A+XNzU8otEjE7AJsU= 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.10 026/171] powerpc: Set crashkernel offset to mid of RMA region Date: Tue, 12 Apr 2022 08:28:37 +0200 Message-Id: <20220412062928.642250738@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062927.870347203@linuxfoundation.org> References: <20220412062927.870347203@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 cccb32cf0e08..cf421eb7f90d 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -1296,6 +1296,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 56da5eb2b923..80c79cb5010c 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