Received: by 2002:a05:6358:bb9e:b0:b9:5105:a5b4 with SMTP id df30csp4517006rwb; Tue, 6 Sep 2022 08:34:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR7CLFYccZEzQbvt8NnIGWoX4P/Nx1JS4nQfaOzvuWGcSQIctXb0pbnL5WKEGtwfad37X2VU X-Received: by 2002:a17:90b:1d81:b0:200:52da:7b5c with SMTP id pf1-20020a17090b1d8100b0020052da7b5cmr13030244pjb.228.1662478466951; Tue, 06 Sep 2022 08:34:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662478466; cv=none; d=google.com; s=arc-20160816; b=UkQ/UhW572kO3g+hoyurTXl4JtRsMUq+0I3PWqaIJC1WYvHtyOOMm4KSwuV/yQrm9n hBTVomhXEu7J6mWxFvhBGhqk5gu8RbCmFA0HoeLejYcKuQP3gYi/r3VD/tDvnzEUM8wY /BZqRrv7Be9QiKTwNRTAAnxPYkYPV1NaD6VFV1LbEiwtrGaHRTBvGSsaLEsCGPiKOm2X 2Voyw/sGsSfZ0fLHw1Tk9CJlTfW/dfWdr2IMmRWzM++6PaCfL1ta7LAXeXQZcW3W951A Zw8bV0FC/nWDhr424lohdwr/q2iYDScLXOKFesOgzWLnmR5N/Uif4tgmqH+6TBG7YJD8 3OAw== 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=GdjehKm9yvZTJhcQzfu2gC3HwTFFBA5cfjWEiXL2KEU=; b=XGFAHBqkItz3mlGn73Bg4pWWaHnhpyUGjHJyVhTOq841/1Q/nyNSA6WiTAp33Z7y/h 3uHz6Z6nUHRzdCZ7HvWgOBtPOPGr/iGpoZPjzDae5tjLrXRgndrXv2rErmmcZ/xvLuE+ bBOSIU0gW+9FEDlH8NQ/x9VRVu1JulMykgBeLWcJMS2HGTD3BsQ7r3PxMfFa/ykpbeb0 OU1MVSE0k0R+cVTTxaMdf9y6qNlzRaXebm9cG8CD5i75aijzFC8o6qEDBGP1eOg+f+Xg QILIj/oPPgYdc9tIKKKNa2lFKzm+QdL+G4+HQOav/l3vLbpB3LV4x4o9gv07omAXlX0x 1CEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qTquXGC9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t24-20020a62d158000000b005387a258917si13490279pfl.145.2022.09.06.08.34.15; Tue, 06 Sep 2022 08:34:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qTquXGC9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241614AbiIFOVC (ORCPT + 99 others); Tue, 6 Sep 2022 10:21:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241679AbiIFOSl (ORCPT ); Tue, 6 Sep 2022 10:18:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31DCB192BA; Tue, 6 Sep 2022 06:49:46 -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 dfw.source.kernel.org (Postfix) with ESMTPS id C04C160F89; Tue, 6 Sep 2022 13:48:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C56F4C433D6; Tue, 6 Sep 2022 13:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662472130; bh=bOH//3r1sn7VoNf/+feYB6lm64dlFs6/NrJkt6m8cEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qTquXGC9A7IIyXWlinWLEiFburh+3ankMPuKGV999maRfVXTIbHty5hwCpeE4oIsX tDb7adnWRtC2slJgxzCoN7qVf5Bbcuc9/rrrnBzpMDouYACn4Gr1aEiJ+tqqK2nfdr ZAVs+BRohGxi8TYtRFTQHFAAONJG8rQC7NIlsfgI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Levi Yun , Baoquan He , Catalin Marinas , Will Deacon Subject: [PATCH 5.19 137/155] arm64/kexec: Fix missing extra range for crashkres_low. Date: Tue, 6 Sep 2022 15:31:25 +0200 Message-Id: <20220906132835.261723901@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220906132829.417117002@linuxfoundation.org> References: <20220906132829.417117002@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: Levi Yun commit 4831be702b95047c89b3fa5728d07091e9e9f7c9 upstream. Like crashk_res, Calling crash_exclude_mem_range function with crashk_low_res area would need extra crash_mem range too. Add one more extra cmem slot in case of crashk_low_res is used. Signed-off-by: Levi Yun Fixes: 944a45abfabc ("arm64: kdump: Reimplement crashkernel=X") Cc: # 5.19.x Acked-by: Baoquan He Reviewed-by: Catalin Marinas Link: https://lore.kernel.org/r/20220831103913.12661-1-ppbuk5246@gmail.com Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/machine_kexec_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -47,7 +47,7 @@ static int prepare_elf_headers(void **ad u64 i; phys_addr_t start, end; - nr_ranges = 1; /* for exclusion of crashkernel region */ + nr_ranges = 2; /* for exclusion of crashkernel region */ for_each_mem_range(i, &start, &end) nr_ranges++;