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 3E73CE8FDA7 for ; Fri, 26 Dec 2025 14:11:35 +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=C1Eb8Tbzs2NO6bPeBqhZrfOFwL0tG0ndVs0MF0jDIGQ=; b=rqnGLpPhGWUqvNxNch4wIc0hac vcR0u74qTsGdHVPgNtLWTR2mTrV4fHokeae6W8nXCGGlErQk8Mxr00l5OWLwSbv3fbY6bh7zE5XFC uiWqLN94kdcQShrdIIQKsdHifJTm8BCLM+0u+DPCyjR5Q/TGRDYwoMb9tYLFRCruQOMfVrLDpQCwm tMe8FKywDfKO686SR0AclW1bD0hq3tySJTOYcsZKa7duSVXIio1c6t4i4cWZ4uYAgD6W9XtTcRXdP Gjx54e54cMX7O5gIF+OwROoP7J+G03nhvAFISk+WMFGnlhjb6BbVW/l7DLqi2/UYj1i+TRRKgSxd+ NxBz0Hvg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vZ8XP-00000001EWd-2bih; Fri, 26 Dec 2025 14:11:27 +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 1vZ8XM-00000001EVW-2EP6 for linux-arm-kernel@lists.infradead.org; Fri, 26 Dec 2025 14:11:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766758283; 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=C1Eb8Tbzs2NO6bPeBqhZrfOFwL0tG0ndVs0MF0jDIGQ=; b=FM9lmZ62Z0k0QvOs7EsIaOF4L+zDjKwPDonVOngrvonjRVZRo89ltadHexLkUrjqXv4AfJ m3TjghHXQd8hbEK6jelB9np2C/VuDYPPLtazpivRMb+jbbVz1iHtr9vgiforpM+u4BfGjT R3j1EpXC5Nxb1zK6gqhIXEzaXqHmez4= Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-257-f479PhyyNdGLnoRDZc2TpA-1; Fri, 26 Dec 2025 09:11:21 -0500 X-MC-Unique: f479PhyyNdGLnoRDZc2TpA-1 X-Mimecast-MFC-AGG-ID: f479PhyyNdGLnoRDZc2TpA_1766758281 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-29f1f79d6afso106291825ad.0 for ; Fri, 26 Dec 2025 06:11:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766758281; x=1767363081; 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=C1Eb8Tbzs2NO6bPeBqhZrfOFwL0tG0ndVs0MF0jDIGQ=; b=VoCZH4N3VlpsGFbwg4Bq2BHVV/5q4QV6VSR4NjDj4Nn0InLZDUInM5h4L45w+o7gRw 7ELg3mF6cUiZ/cciJJDLcBNKHy/Lb8EqWoVLKnzQvact4k8bZnzYFwTKqxAjpx9E/2WV 4dh3xjtNuSYjmRLrNH/afskAsr1GgUJKJGzLX4MhHlkH7Y6Qu8bg6mzI3I6LEtWJZSfv Evl02+kv2V0lL5ytuO6xutvIUI7ZIyuaFcLOjIUWmKvVwobVABe2vvPfKEO1JKmtRxPm qXoHinypel+3oozLfsxRFSHJaCZeqvoWHXgM+khbIznQjcFblXMsU7yL1a/0G4RJRgzy 99+g== X-Forwarded-Encrypted: i=1; AJvYcCUfryg5uq6GxH0+xOncbUvTKZF1oBnBvYwWsFhi1sEX4OMesNJq8dnzCSOBh1SxS6HlgZZfxuq7+UX2B3bgmbBY@lists.infradead.org X-Gm-Message-State: AOJu0Yz9+chS0ku32VGj/b1mkXTvolDzjMbgoToaZJM8/HLSFCWAk+Q+ zCDzzEoCwgjkRttq4KR/NqkPOOGhWtphmS5YjgAbnNXaOxYQFAHVH20xQFnEcsK93Sjdker5r+6 h+UQ3BMVTNi528+z6jhX3glvYxuJvXeaDpQRJFf4T3/qY6WTuxLRgWSw4UaYPRFmFwoYIT4WKeS Dn X-Gm-Gg: AY/fxX70lYBI8kg7NsGz3xSFWA+rPXHoqI3nPNpOPHvP1N7XHfhdwsekkr5Z27b98LF JoBr8s5csRBeCe4KszREbVxJpKjp+HgTFJu0UQ4q6D9guoOyGbWUjTM5501nmYRver/s9DxDGgz VEyxctAy6DofZwIO9m41D6TpiNWQhsmzcsfGvJKCMVudCb/GmdwSAEwWJVOA7BQnMjdVKT1uIB7 tFF4iPyiPrpzzYym8BbhFggqU2qnXds+IYsURojBzhLLORgB2TVAdx9B5tt4QLLSVJ/+xz1l3Ww m7XuKj9QCURB0msiDyQjFTPZCWK02ehWewkmOB788QeTsE51Do8tC2LN/8Cuc8asOEDaaN+Wt0E q X-Received: by 2002:a17:902:c103:b0:2a0:97d2:a264 with SMTP id d9443c01a7336-2a2f2735214mr156670145ad.37.1766758280497; Fri, 26 Dec 2025 06:11:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEXwhad5jc3xv4cqcmnL6jgHZfUywv9Z9yVyVbU1Tg52LQN7cnj/6oCJmqPwsvSlt7Wg7i7lA== X-Received: by 2002:a17:902:c103:b0:2a0:97d2:a264 with SMTP id d9443c01a7336-2a2f2735214mr156669855ad.37.1766758279936; Fri, 26 Dec 2025 06:11:19 -0800 (PST) Received: from localhost ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2f3d5d663sm207266485ad.77.2025.12.26.06.11.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Dec 2025 06:11:19 -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 , Catalin Marinas , Will Deacon , Rob Herring , Saravana Kannan , linux-kernel@vger.kernel.org (open list), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH] arm64/kdump: pass dm-crypt keys to kdump kernel Date: Fri, 26 Dec 2025 22:11:15 +0800 Message-ID: <20251226141116.1379601-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: bxZuCi8jbrvS1a9R990Y5Wee2cELwZogkvCBTtX2OCw_1766758281 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-20251226_061124_644938_68472F89 X-CRM114-Status: GOOD ( 18.94 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Based on the CONFIG_CRASH_DM_CRYPT feature, this patch adds LUKS-encrypted device dump target support to ARM64 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. 1st kernel will add device tree property dmcryptkeys as similar to elfcorehdr to pass the memory address of the stored info of dm-crypt keys to the kdump kernel. [1] https://lore.kernel.org/all/20250502011246.99238-1-coxu@redhat.com/ Cc: Arnaud Lefebvre Cc: Baoquan he Cc: Dave Young Cc: Kairui Song Cc: Pingfan Liu Cc: Andrew Morton Signed-off-by: Coiby Xu --- arch/arm64/kernel/machine_kexec_file.c | 9 +++++++++ drivers/of/fdt.c | 19 +++++++++++++++++++ drivers/of/kexec.c | 19 +++++++++++++++++++ 3 files changed, 47 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..2b22dc7e2b5f 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -866,6 +866,24 @@ 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 __be32 *prop; + + if (!IS_ENABLED(CONFIG_CRASH_DM_CRYPT)) + return; + + pr_debug("Looking for dmcryptkeys property... "); + + prop = of_get_flat_dt_prop(node, "linux,dmcryptkeys", NULL); + if (!prop) + return; + + dm_crypt_keys_addr = dt_mem_next_cell(dt_root_addr_cells, &prop); + + pr_debug("dm_crypt_keys_addr=0x%llx\n", dm_crypt_keys_addr); +} + static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND; /* @@ -1097,6 +1115,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: ccd1cdca5cd433c8a5dff78b69a79b31d9b77ee1 prerequisite-patch-id: af871421d3653569c735073a3d2d4915412736d7 prerequisite-patch-id: 536241bdf9240e12a5b038415875d4ce417a0892 -- 2.52.0