From nobody Sat Feb 7 17:56:21 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 B8E1830171C for ; Tue, 6 Jan 2026 06:22:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767680566; cv=none; b=sDjd3RKCSSUSDWW6fyRYVI7ePFj2fb70cmpyk6EUhMBwQXjcaE1VhizrXk0soAro13OXuNuO/UagpyHTl5+acWmHaozTS/yLdUspdoVXsZLq6Ie6+I/Tpl/u+UzmCkA6lZ5JBOQ/pzKX5zmjqcrmYxfxJVdj4mhoH9qoVmsFcgI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767680566; c=relaxed/simple; bh=WatYTnosXf5wTqbVsuOqKj6mILafMiKiMkLhYzWwNkI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=STdsGoz+OTKsS7z8hipxFzIH/us5QqQUxLzi6RWE6gOo4AmkPT1QhVXF/WbD6hJl7KEJ2HN44/EuqnlygDmWW7LjTevS0ZPrHKeT2411ddj5k3X7OmzkzJtl2Qlxu0pV9DxUW7JzfgUqErG1vaEBF09pIeVqdFveMOzREYaWoro= 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=TgSx9/N9; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=LMYa54cj; arc=none smtp.client-ip=170.10.129.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="TgSx9/N9"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="LMYa54cj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767680564; 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: in-reply-to:in-reply-to:references:references; bh=G1iCm8y4kbWCIcgUpU9S1KPoq4Lc5Fqr5q19Pt4lfz4=; b=TgSx9/N9ZtS+PYS42mHJyk/aMMpIbd6ChUSdLSaDBHbLnqu5DUMq73LoKfV+0V1rbnn6E3 2LxdbpALc60Pvg6LYOOvAScv/0ELTCSTjm4NF0v/l6rHnafLWpnEZbm7/Zdt8YLkTUhJDQ J2hXaPDiyYvpWHvNOyCWevTKfR/l6EE= Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-4SsO5efjODizq3s-kwtVnQ-1; Tue, 06 Jan 2026 01:22:42 -0500 X-MC-Unique: 4SsO5efjODizq3s-kwtVnQ-1 X-Mimecast-MFC-AGG-ID: 4SsO5efjODizq3s-kwtVnQ_1767680562 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2a07fa318fdso12004305ad.0 for ; Mon, 05 Jan 2026 22:22:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767680561; x=1768285361; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G1iCm8y4kbWCIcgUpU9S1KPoq4Lc5Fqr5q19Pt4lfz4=; b=LMYa54cj48g9gHIbMCQqNyiVBBcS/vlqsnPsEWL+KJrWf5f6biaHO+krKfvBL/xgIu qt5OWxC6wy0KgU2pwUxvO9Ug8Lx6OH02uT2PE+zX9QOZ940+YGTd8IE20ESjlRmlaJHU 1u7BF+P0DB9DOs3mvAh0Weza2ah2Q6kQhmMPVZTXJXBiU7UqMy7S461JgbhD0zeFeT5X tzs/BW9E1Fxym/uATIPod4Eq4m6aXlJWuW0uIgRQEc1uyQjcwcIVPtDeXy9KkKgFTZ+i N5ivODOYDRErS6zAzOKyxuEw+nIDZNXmFwIVzsY4T5PfjpGbUyQ3k5Fpcw+JFzvErNJ/ c5GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767680561; x=1768285361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=G1iCm8y4kbWCIcgUpU9S1KPoq4Lc5Fqr5q19Pt4lfz4=; b=Tc67zjV5t13i43Q+N7eEH+C4O1K0Ypo3P8lwG5xT+vQ4X8qKeoloC7LZAVfQZ9WbdC DJELAkvA2oMOUBl1FHmZ8yJn1oaWgd2AmYF+e4NlAv8h3xop+TIkFlvyr39RKMx4QL2B LQH5CfmMDOOlnAxEe1N4PY7YtoDvbVl1fueEhch4amerHYbj2CRopCGhDvKuwZyC+EfN MMyVkDEzaOpyhBNT9tfSQuNGGlzLQU+llLuQtJJ4GEd6PJHOMvZF0cohgO22KpteHG7/ PkBs31ih07QXIC23xVgqDX2AAhWmq+363bwkPCh3TR6UiNwGd/JYfDojQx6RGHoDekKG 9oSA== X-Forwarded-Encrypted: i=1; AJvYcCXn4Cq2Xyb2Ht3ol2flNpOFo2FtPJT7Iqs1NH6ultYw1iudGfA13TEArKvS7RzAnCQnNKnn+P4NPeKQ5GY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/Nqh2FaJpCWO26zXkmPYrcyxzc1Ir69OeHxLdW4dQYa4j59hf a5ukJ/PFUKILvx7aKWQ95aNCY6P+us45KLgAxi+33WiZPnldMnOcXqr4Ezbt/ifHN1fMo8O6ZQ2 RvA5UIl9RSTkfUJkxm+BRl1HCkLRS477nw6/7o3LAGcS1Zpw3Y6TQV3fixJy2xkyDgg== X-Gm-Gg: AY/fxX5V8VzxsYR2oXBAggoTyCQDYOHAFQ4U9g9GyzEr1n4NCueNiiCha3NIIBcdU8P gEEYkz2oCf95YADXcs3NDBS5knCgVly1CQxP+WxDRYZLVDNhhKUTXT0r4fXwOHFQAHkmC8E7xdP QT9oLHp2kaqd/OIxyj6DtJvqcxgvYnVjfG7J2PhiQhNBwPQ3Lyry2iQnbiJ0pABGu+gonxwEpwn lB/5CEzxjkyUTYp3KDlUSJGFaZD5zkv+SJzmPJ2OtSL+VcL0pkrjlGT9tx0I9mCcd4yxU5sXtIX IYUt2B9XdclwFIxDbdOj+wwGANv2n8zGeSW1n54P6lBmksuYlhiDEyeLgBC+RQU9AxM7w7xUFjB / X-Received: by 2002:a17:903:38cc:b0:295:fc0:5a32 with SMTP id d9443c01a7336-2a3e2c8edfemr18998185ad.3.1767680556204; Mon, 05 Jan 2026 22:22:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjkYzfagGmKLQPkTpXjihNKVxM4m77yLyUH+xkoj2AwvmqMvu52zZRrnKlXNZzGMaZuNwW/w== X-Received: by 2002:a17:903:38cc:b0:295:fc0:5a32 with SMTP id d9443c01a7336-2a3e2c8edfemr18997735ad.3.1767680555369; Mon, 05 Jan 2026 22:22:35 -0800 (PST) Received: from localhost ([209.132.188.88]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cb2f8asm10548925ad.57.2026.01.05.22.22.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 22:22:34 -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 , 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 v2] arm64/kdump: pass dm-crypt keys to kdump kernel Date: Tue, 6 Jan 2026 14:22:30 +0800 Message-ID: <20260106062231.448170-1-coxu@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251226141116.1379601-1-coxu@redhat.com> References: <20251226141116.1379601-1-coxu@redhat.com> 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" 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. [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 Signed-off-by: Coiby Xu --- v2 - Krzysztof - Use imperative mood for commit message - Add dt-schema ABI Documentation - Don't print dm-crypt keys address via pr_debug arch/arm64/kernel/machine_kexec_file.c | 9 +++++++++ drivers/of/fdt.c | 17 +++++++++++++++++ drivers/of/kexec.c | 19 +++++++++++++++++++ 3 files changed, 45 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..9b6a6a402cb7 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -866,6 +866,22 @@ 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); +} + static unsigned long chosen_node_offset =3D -FDT_ERR_NOTFOUND; =20 /* @@ -1097,6 +1113,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 --=20 2.52.0