From nobody Sun Feb 8 00:38:51 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20DAC1D86DC for ; Fri, 26 Dec 2025 14:11:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766758289; cv=none; b=gV+KaXU98rk8Urz2V5/V2Az8JbrTQY+A9Z05RR2i/+yrLCmKK6wudauSxwDtD0xFVrb8MTQZ8B+u7zT1U6OaAJrx9Jz5cdbBNW/cBAr8k8z90mhiSjiOUxigzlt2g3lnERGMMJ7tjVr0Sii4MKdKD48z5FInzpN3fQENaLmyznM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766758289; c=relaxed/simple; bh=YPGPTfJr4MuF4Ty5fuTSsxk30cB643o9PypOOE1DnW4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=jSDgNZ0psZR1XnyqbvQv824CwtkhblFIqlzDr7pEPzAIbHA1NO0QbsSi4CNjEAH4gTVkRFaTNFpnWR7mBYRLZVJ+wFkeUyobTmutyHLej9fOOt2z7+M7aAEbIlmvY1rdIEtcPRACS/TFqJrwoj0UVGkVBcfTI+oGT7kRD0qbu9M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GFHkDADD; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=qFk+v06f; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GFHkDADD"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="qFk+v06f" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766758286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=C1Eb8Tbzs2NO6bPeBqhZrfOFwL0tG0ndVs0MF0jDIGQ=; b=GFHkDADDTeos/7qLlrWkr8+iL78tMU64o9D7s4v9YHXAAmLd+d4rQuh/6givAvARmaLZ/N S8WttdL6ORCmR4iXOt6aAQ6u98xErhGhHxHdiTqKMCNdKoCBUezlQfFBnJbhJMVR3SCC73 hgQdTnez2JTEkE3w7MzzXSyMNmexLSA= Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-w4Mx5ldGNJG_vGQmtnIPeQ-1; Fri, 26 Dec 2025 09:11:22 -0500 X-MC-Unique: w4Mx5ldGNJG_vGQmtnIPeQ-1 X-Mimecast-MFC-AGG-ID: w4Mx5ldGNJG_vGQmtnIPeQ_1766758281 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-29f1f79d6afso106291815ad.0 for ; Fri, 26 Dec 2025 06:11:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766758281; x=1767363081; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=C1Eb8Tbzs2NO6bPeBqhZrfOFwL0tG0ndVs0MF0jDIGQ=; b=qFk+v06ftnmUfNakMMkHh7LDWwIn9L3JifEpGpz6kd16np2RBim4FZm71jGkqdYdPn FaTB9arSm4UtB927VG0SGgdqPCfcftg51QB57qdmhrZRuhjlG4KZUdQQT5hjbJp/+1so wxUc2Ipx2JT1pdc6qO5ZJ9Jv7UJfgocf6u9dMxlPe6ZWUYxne3qRZi6u1MnkKNSJVl5h Xx1EyR0INPLk/93Al+1HP7DqyUhyci6A5mV0a+5mGg95DwU8TQl+/LuchG/2aagasEp/ osod49+NetjpAUG1zbmEwTq+BWlrAmpWyWV4e1lsv3oahVaxokaOdkAWZf4+WDofpgzQ am0w== 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=ffnwZjP8WM1A9YoeljYqDhEUTI2PkRxGC62LmlqtYlozYUUrw1TEXmAoT6pNCF0c1d 9kw+M3/WF+7V1bcY42/PEFp0W1PskfOLxhrCjJ9tTSTgqTjMQYvV3ur5GYODNTs42ZvU o0GKCspganNcYBWxjyyBsZ+qXfEaCljRc3cESlpN3aOEsGRT5WCh0Ig0EJGandi93S47 AdldX4zpOg3Vmv/i8cWxa46BQHB6dWMAokEHdYtAaaxOgZP3m5GMdq95weBkzIsy57Z1 aVaAUQOQX8Xjl9jwy13ecUyQvHphjTdLFWTZipa03/m8xQqCV0RVIic91q/rCf8bAA/C daHw== X-Forwarded-Encrypted: i=1; AJvYcCXrBfpKS9njJioPEtSmjmmq+hbW4yw/VmH36LDQo814kG2F8Kq1rDvvqt4e5unJ4wWtW6atws6/cP3WATI=@vger.kernel.org X-Gm-Message-State: AOJu0YxOeNZKdQ4I3y9n1feDk5tDHYIp7+oiQgOkSen3jAOLc0rOAk6q Ef+SCvts/4SufVQs6dtrIddBiZNjntqKxFPr5OyB+P7hPVStcEYTf2nCYb0SwfGzRNafITmiSfJ /KTHNGGm2Ojoj8ap3MfieFoqwE0r6ZepdoNxJ+klbiZpMS3ax+xdV0oHIIzBaOq6Hkw== X-Gm-Gg: AY/fxX7el9IZnnxXLIvowcSD6RfpCpKy6DFdhWeAkPXOJ/aTZwpzmLlAm0ABl2ii278 lLWIGfyQyOOiou6j+gHWQFiAx5U2jPu9a2pl7pjFwSATleJf5MQLmuNRybu+nISp69SpXyz3N12 owoezGobaRWEANzSukr9oUa3JoejeK+ptm6aFJ+yKGwgF2XbOPBvqrNUOczPkpDjgyLCl8e0XDZ YvaX4pexj6QrHhkpJ1iTLyinivaQOsc9QSJwb5eLAJYpnQVhx4t8dhSZ5PyZ2vP1mqC37JWgt7f VSofOx2lnePq3fwdJlOsadfE5KSTpjFuSlXQAgiUMpmjjOtZqZ4ctYXZsp2eY0FQSjtUpHsIfm9 u X-Received: by 2002:a17:902:c103:b0:2a0:97d2:a264 with SMTP id d9443c01a7336-2a2f2735214mr156670115ad.37.1766758280494; 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/mac= hine_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, =20 kexec_dprintk("Loaded elf core header at 0x%lx bufsz=3D0x%lx memsz=3D0x%= lx\n", image->elf_load_addr, kbuf.bufsz, kbuf.memsz); + + ret =3D crash_load_dm_crypt_keys(image); + + if (ret =3D=3D -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 =20 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); } =20 +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 =3D of_get_flat_dt_prop(node, "linux,dmcryptkeys", NULL); + if (!prop) + return; + + dm_crypt_keys_addr =3D dt_mem_next_cell(dt_root_addr_cells, &prop); + + pr_debug("dm_crypt_keys_addr=3D0x%llx\n", dm_crypt_keys_addr); +} + static unsigned long chosen_node_offset =3D -FDT_ERR_NOTFOUND; =20 /* @@ -1097,6 +1115,7 @@ int __init early_init_dt_scan_chosen(char *cmdline) =20 early_init_dt_check_for_initrd(node); early_init_dt_check_for_elfcorehdr(node); + early_init_dt_check_for_dmcryptkeys(node); =20 rng_seed =3D 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; =20 + if (image->dm_crypt_keys_addr !=3D 0) { + ret =3D 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 =3D 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 =3D fdt_appendprop_addrrange(fdt, 0, chosen_node, base-commit: ccd1cdca5cd433c8a5dff78b69a79b31d9b77ee1 prerequisite-patch-id: af871421d3653569c735073a3d2d4915412736d7 prerequisite-patch-id: 536241bdf9240e12a5b038415875d4ce417a0892 --=20 2.52.0