From mboxrd@z Thu Jan 1 00:00:00 1970 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 D617CD72349 for ; Fri, 23 Jan 2026 08:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:content-type: Content-Transfer-Encoding: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=nA8sXD0FqzkneEAx9yV9Y9lTP0hUm1k+5svU6+Gfnes=; b=iBrDYM5pS3jh03iYoAxyD8cxXA PU2ZaUrTzW7Dlrshbs4KRluuvPNLam/wFrs7TY+YIe5AveF0ixH6OfiO2JjVq1EsMF8W2ZNHWUicY bIV7IDpDdHyLVftmHA3m6AYbJFMf0ClJ8acYZkdLy5hcA4IC4GWEMSlMsiCfA5kFeTxbcYq6SZrZ6 lYesizbRKwpygqcDaK7W4C1YIR5d4ldy8lajlsJCKdORCGRjPqKPe2GfC9UPf2poSf04vA7KdTA/W UeeYv3LC7j6UtASqjx6CUs6fKgtkzueAUBpsCWdIB7gjXVPkoddjuPd2PSfWrVHOB9gQuClswCmkM h+3U53hg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vjCIW-00000008RTc-30WT; Fri, 23 Jan 2026 08:13:40 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vjCIT-00000008RRn-1zS8 for kexec@lists.infradead.org; Fri, 23 Jan 2026 08:13:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769156014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nA8sXD0FqzkneEAx9yV9Y9lTP0hUm1k+5svU6+Gfnes=; b=H45uW5nOem5idoEJZA9qSFYVZW2IkNeq4aFFOc2vU4a96zUFCeJZmfJwSqURFfwtphdgNO AZ11E4bPF8AfNkQIHAnTvnXbeGNoGrBfHAj75shaW8y07KSaWapDpKKtS/HeCYyTHI2fHD y06TUkr5E+jrWWpFiF1fFsl0lRJlOrU= Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-suUiiuyfOTWyb1Yl614WIw-1; Fri, 23 Jan 2026 03:13:32 -0500 X-MC-Unique: suUiiuyfOTWyb1Yl614WIw-1 X-Mimecast-MFC-AGG-ID: suUiiuyfOTWyb1Yl614WIw_1769156011 Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-822f926eff5so832537b3a.1 for ; Fri, 23 Jan 2026 00:13:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769156011; x=1769760811; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=nA8sXD0FqzkneEAx9yV9Y9lTP0hUm1k+5svU6+Gfnes=; b=XpBMisH7iE162B9dnWvX7crj6T+ppSj51eVsswioW+sNwprEwvKADsR/oM7DHVEx3N zn0RW3rzxZCklkOMosSXly0n/7eKCMlyC1yMa53nDMbQCCTavox4UOwh0BSU5eivrWjJ h42l8TcnDIMLfZHEp2eZuW6OlM30dy9JhdcEgSWQQgUES2cS3D2WFlnF87YlXsZIUdMV 2d+9lO6jHm82aQhdFzXaAOxx6ZB4I3WtV8Q9y1dwfuvFa/LQ/0S2vF2nk5rHwUVfcXnT CPE0IFmRpon9UeIwarTmtYF2qWise48Q/mu0BtcBzifgtzqBE1Ct96M96zS8Aef/jKI/ dw9w== X-Gm-Message-State: AOJu0YyEKgaJ05/FTCxQDm2pcjJq+jKkEXt+8ocFNPk7hnRFVhcniZdg LaSF7XEbed2EMgvjzePgp1ZjgWuiCfbr4H9xTKOOLExZuE7Pg7qzjENn4q/FD3nTxXbhxGdZ2AO meanBW+TQLgZsjuVHZDyjhc8wcwbFckzqHQm5djOJ9V2919yf+kMbNuRoiOfPRk5AWhtZ1xaV9l SpMuif2YMAp4fyu6sx0yxqkz688lHnaDgPdm6aQoMe5Pl+xA== X-Gm-Gg: AZuq6aJrH1r90b73v6q1ebM58dgwhAdV1kv97Ci6ErrP5kLMLJJpGZZErKzAiGLQ0iK XpA5SPLc2UopMcxfkeAxgAjxaIsA9KbRzL1HyrHxY6sBWYRew+UM/L3AakDBp1O7ifhCl28rBMb QarOAXu7KfnmHxbMuvoTjjqU26tryg2Ju19r/SwTWRBynt4Q9Supg1gXs4j1VaP6a0RAJbWzNvQ +rzZLwGPApfyw/aD+qTVG1Y++iWjJJ6KFRnaCG7DZt+nLLlRoxoB51qpX6JSP7OBQlKbSPD+Qng E+mXkXWRlBRQWG1uTtqVTz2N76Mhsxgk8V11vppjGl3bhiFQme9fqJ9VAvoiTfF472qy/c+qh6z n X-Received: by 2002:a05:6a00:1885:b0:81f:46ba:1817 with SMTP id d2e1a72fcca58-8232178898amr325096b3a.66.1769156011065; Fri, 23 Jan 2026 00:13:31 -0800 (PST) X-Received: by 2002:a05:6a00:1885:b0:81f:46ba:1817 with SMTP id d2e1a72fcca58-8232178898amr325043b3a.66.1769156010374; Fri, 23 Jan 2026 00:13:30 -0800 (PST) Received: from localhost ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8231876f736sm1443202b3a.64.2026.01.23.00.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 00:13:29 -0800 (PST) From: Coiby Xu To: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: Arnaud Lefebvre , Baoquan he , Dave Young , Kairui Song , Pingfan Liu , Andrew Morton , Krzysztof Kozlowski , Rob Herring , Catalin Marinas , Will Deacon , Saravana Kannan , linux-kernel@vger.kernel.org (open list), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v3] arm64/kdump: pass dm-crypt keys to kdump kernel Date: Fri, 23 Jan 2026 16:13:25 +0800 Message-ID: <20260123081326.1362666-1-coxu@redhat.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: C51JPOaHNJPxHAgZiWUJMXXTTlOH5nqXCjfZgrHCr9Y_1769156011 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260123_001337_585105_58E89FE8 X-CRM114-Status: GOOD ( 19.48 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org CONFIG_CRASH_DM_CRYPT has been introduced to support LUKS-encrypted device dump target by addressing two challenges [1], - Kdump kernel may not be able to decrypt the LUKS partition. For some machines, a system administrator may not have a chance to enter the password to decrypt the device in kdump initramfs after the 1st kernel crashes - LUKS2 by default use the memory-hard Argon2 key derivation function which is quite memory-consuming compared to the limited memory reserved for kdump. To also enable this feature for ARM64, we only need to add device tree property dmcryptkeys [2] as similar to elfcorehdr to pass the memory address of the stored info of dm-crypt keys to the kdump kernel. Since this property is only needed by the kdump kenrel, it won't be exposed to user space. [1] https://lore.kernel.org/all/20250502011246.99238-1-coxu@redhat.com/ [2] https://github.com/devicetree-org/dt-schema/pull/181 Cc: Arnaud Lefebvre Cc: Baoquan he Cc: Dave Young Cc: Kairui Song Cc: Pingfan Liu Cc: Andrew Morton Cc: Krzysztof Kozlowski Cc: Rob Herring Signed-off-by: Coiby Xu --- v3 - Delete the property after reading it [Rob Herring] v2 - Krzysztof - Use imperative mood for commit message - Add dt-schema ABI Documentation https://github.com/devicetree-org/dt-schema/pull/181 - Don't print dm-crypt keys address via pr_debug arch/arm64/kernel/machine_kexec_file.c | 9 +++++++++ drivers/of/fdt.c | 21 +++++++++++++++++++++ drivers/of/kexec.c | 19 +++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 410060ebd86d..5f3bad8ca96d 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -134,6 +134,15 @@ int load_other_segments(struct kimage *image, kexec_dprintk("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n", image->elf_load_addr, kbuf.bufsz, kbuf.memsz); + + ret = crash_load_dm_crypt_keys(image); + + if (ret == -ENOENT) { + kexec_dprintk("No dm crypt key to load\n"); + } else if (ret) { + pr_err("Failed to load dm crypt keys\n"); + goto out_err; + } } #endif diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 331646d667b9..2967e4aff807 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -866,6 +866,26 @@ static void __init early_init_dt_check_for_elfcorehdr(unsigned long node) elfcorehdr_addr, elfcorehdr_size); } +static void __init early_init_dt_check_for_dmcryptkeys(unsigned long node) +{ + const char *prop_name = "linux,dmcryptkeys"; + const __be32 *prop; + + if (!IS_ENABLED(CONFIG_CRASH_DM_CRYPT)) + return; + + pr_debug("Looking for dmcryptkeys property... "); + + prop = of_get_flat_dt_prop(node, prop_name, NULL); + if (!prop) + return; + + dm_crypt_keys_addr = dt_mem_next_cell(dt_root_addr_cells, &prop); + + /* Property only accessible to crash dump kernel */ + fdt_delprop(initial_boot_params, node, prop_name); +} + static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND; /* @@ -1097,6 +1117,7 @@ int __init early_init_dt_scan_chosen(char *cmdline) early_init_dt_check_for_initrd(node); early_init_dt_check_for_elfcorehdr(node); + early_init_dt_check_for_dmcryptkeys(node); rng_seed = of_get_flat_dt_prop(node, "rng-seed", &l); if (rng_seed && l > 0) { diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c index 1ee2d31816ae..4bfb1ea5744e 100644 --- a/drivers/of/kexec.c +++ b/drivers/of/kexec.c @@ -432,6 +432,25 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, if (ret) goto out; + if (image->dm_crypt_keys_addr != 0) { + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, + "linux,dmcryptkeys", + image->dm_crypt_keys_addr, + image->dm_crypt_keys_sz); + + if (ret) + goto out; + + /* + * Avoid dmcryptkeys from being stomped on in kdump kernel by + * setting up memory reserve map. + */ + ret = fdt_add_mem_rsv(fdt, image->dm_crypt_keys_addr, + image->dm_crypt_keys_sz); + if (ret) + goto out; + } + #ifdef CONFIG_CRASH_DUMP /* add linux,usable-memory-range */ ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, base-commit: c072629f05d7bca1148ab17690d7922a31423984 -- 2.52.0