From patchwork Tue Jul 23 02:07:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 13739278 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D018C3DA70 for ; Tue, 23 Jul 2024 02:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=waLkRF4lLZEL+yeXu0OzXvJ84ILGl3qQzWLup8dpBIU=; b=2OH0oLIYxrjwFL fGmwooivXYO9EVSXaiWdAOs05CUVSVGZFrx7fmJzHWxBZ5iG7JkX7UBU8QkVoG5898WjuUxzz1x+y 2tiupw1ZuW780fG8IrzODmXVAhg+J/W3qd2lAETeUz/ydybnaQK/itWFZRQjCU1iuH/yV2LGhqH/C kcTqqQhrMTOkOgQ+3inR4Qr0CB9aueeO6CVVoiZ0drsw5bIfijZk4ex4YmUhSwc20/+j/zEBZAgCe dJYU4zp16t+hkll1Ru6R0/dh/IK6AtmPWNtLA7E3kFilMpyAo14oGvtYCX9SPaVz/FLVyW93tNFLJ DkLSHkhYXzVqK0Xda0Hg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sW4ru-0000000B6EQ-0d9v; Tue, 23 Jul 2024 02:03:10 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sW4rU-0000000B694-43ZS; Tue, 23 Jul 2024 02:02:46 +0000 Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4WSgJn1PTbzyN3G; Tue, 23 Jul 2024 09:57:45 +0800 (CST) Received: from kwepemi100008.china.huawei.com (unknown [7.221.188.57]) by mail.maildlp.com (Postfix) with ESMTPS id 4257914038F; Tue, 23 Jul 2024 10:02:34 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi100008.china.huawei.com (7.221.188.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 23 Jul 2024 10:02:33 +0800 From: Jinjie Ruan To: , , , , , , , , , , CC: Subject: [PATCH v5] crash: Fix crash memory reserve exceed system memory bug Date: Tue, 23 Jul 2024 10:07:46 +0800 Message-ID: <20240723020746.3945016-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemi100008.china.huawei.com (7.221.188.57) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240722_190245_190378_8D3F5D76 X-CRM114-Status: GOOD ( 12.44 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On x86_32 Qemu machine with 1GB memory, the cmdline "crashkernel=4G" is ok as below: crashkernel reserved: 0x0000000020000000 - 0x0000000120000000 (4096 MB) It's similar on other architectures, such as ARM32 and RISCV32. The cause is that the crash_size is parsed and printed with "unsigned long long" data type which is 8 bytes but allocated used with "phys_addr_t" which is 4 bytes in memblock_phys_alloc_range(). Fix it by checking if crash_size is greater than system RAM size and return error if so. After this patch, there is no above confusing reserve success info. Signed-off-by: Jinjie Ruan Suggested-by: Baoquan He Suggested-by: Mike Rapoport Acked-by: Baoquan He --- v5: - Fix it in common parse_crashkernel() instead of per-arch. - Add suggested-by. v4: - Update the warn info to align with parse_crashkernel_mem(). - Rebased on the "ARM: Use generic interface to simplify crashkernel reservation" patch. - Also fix for riscv32. - Update the commit message. v3: - Handle the check in reserve_crashkernel() Baoquan suggested. - Split x86_32 and arm32. - Add Suggested-by. - Drop the wrong fix tag. v2: - Also fix for x86_32. - Update the fix method. - Peel off the other two patches. - Update the commit message. --- kernel/crash_reserve.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/crash_reserve.c b/kernel/crash_reserve.c index ad5b3f2c5487..5387269114f6 100644 --- a/kernel/crash_reserve.c +++ b/kernel/crash_reserve.c @@ -335,6 +335,9 @@ int __init parse_crashkernel(char *cmdline, if (!*crash_size) ret = -EINVAL; + if (*crash_size >= system_ram) + ret = -EINVAL; + return ret; }