From nobody Sun Feb 8 02:41:37 2026 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2422D331A7B for ; Wed, 21 Jan 2026 16:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769013969; cv=none; b=hH1h3PanOA6IqVunL23nenOvyISfaTCDWng5OdtF3pcCTMgJAd1VLFAGeTxKOGv5GaH7A98tH1H3cXWRJFrVeBzxyrwhn6Oujy4vBEvEKSXC90PhljB5Hduul+Fv/6NEhVIj1KRxg96RLbnSR2kdUlq7pE3n44RrY3KF/Pp2gZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769013969; c=relaxed/simple; bh=hUYPRcba9zfyDjZaQs2u9sw+0GVuFqBCoC/amy5CRqs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=JUxFskrfq0uRNXNaDJ4ZSZXvs1LhGI3Ob+tXBjacHPfLyH9Ok+QyZlI6tGDpyTxPDu4qxcmPTPUMuKEaAhKy+9wzTKiK4HIQBsh9vjbEJKKAxU1bXWPxskAQw5PCl7A2C3eR9pzwBUAXbSK2VZGDKHon84ZAgg8bDCxidZckSjI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.160.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-5029fb0b977so65061cf.0 for ; Wed, 21 Jan 2026 08:46:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769013966; x=1769618766; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=8K6PyvxGfU1AMGKy34QhFpjB02JAayEePw3faIpbm3c=; b=BGsxp+4AMwY3Sf9XuKZ9N6vITj92gvLoubrl7so585kdjEjCsSgRLLMnd2uzxD1CYX BiewIyCVWaT5vSz9XvcJlYKN7YEU5Vh8Ieo0hoJ3RMfgPfHQrjpoXwO4HXae/G6ENcPr WLQa0GZSHKFVK/lj17SY2YoIspOEOiz/QyrzccRkuVRsxrVTRpRsl0URZkucV4beJWL/ DRJQ3clC082IFTvqGspGtcyedh8pcWx60skbKqWooa2IYGeWY/5dxvNPUGpLd9gB30ki /Zn2phGB/wPXo/zPAVW1/Qc5H2EPY/XPzibdUIwhwNNG92ABPbgOTbDmxCeX13r900lL yt+Q== X-Gm-Message-State: AOJu0Yw4/12ixIe9wQzP6yU5sm7eTY2EsXF/A9zQ5dyUNCjpfZOFTM+1 0lsIfHTN34zjZmywHJL0yWRP9kFKtPRHL3lZrvo1XsLxhkZ+dLay+JpB X-Gm-Gg: AZuq6aK9t4+WBsTbpPjtlaCq1TBUGtjNIzrnXn8yicMjoPWJllpgA8zc6T2kKHiixgb hJ8JF/salx7DrCYyTj+pRrTyQcUnu52fWQXenYAnDznoejB/ui/KmzgbtGU+OYNrAZNzksbPlxu Etw+AdrJiTgIQsJTEOfE+iePw3cCqIvymzNHv0vo2d4eBozaluWtV77N1cfIsNb9c8NuvatkbLP bNube9ybJt3ZvoQ4hu0DnmxjcZ69RbMcQySmcea/98Q/qkEfn0W1b4mzuFDMeiq8KqWP+1HQDMg OlM0PDSFSltoHvCh+/ICqXeQqMoEI8+xmPyaZs75N7R/2CimxaOxHcVJrOIOBjqwcTywCmCaOat UTvTagSM44eA08NskZHTKJNo1+n6/hN4fDCnyYau+GmBghNWbBKKvHkxFD9Sd0J3KBm/8Lbe2pl ET8w== X-Received: by 2002:a05:6820:1798:b0:659:9a49:8fef with SMTP id 006d021491bc7-6611796ece0mr9284384eaf.28.1769007054264; Wed, 21 Jan 2026 06:50:54 -0800 (PST) Received: from localhost ([2a03:2880:10ff:43::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-662b6c3ec82sm1497158eaf.17.2026.01.21.06.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 06:50:53 -0800 (PST) From: Breno Leitao Date: Wed, 21 Jan 2026 06:50:38 -0800 Subject: [PATCH v4] kho: kexec-metadata: track previous kernel chain Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260121-kho-v4-1-5c8fe77b6804@debian.org> X-B4-Tracking: v=1; b=H4sIAL7ncGkC/2XNwarCMBCF4VcJs3YkM4lN25XvIS4SM9rcC60kW hTpu0stguJy4Hz/PKBITlKgVQ/IMqaShh5aZVcKDp3vT4IpQquANW+Ijcb/bkDntJPasxxJYKX gnOWYbq/Kbr/c5Rr+5HCZ6bzoUrkM+f56M9K8+y6OhIQ2umbj2UbfyDZKSL5fD/kEc3LkN6o0a V4Qo0Zy1gXyxlOsfpD5RPWCDGoMFKvgfN0Yy19omqYngDDDgBMBAAA= X-Change-ID: 20251230-kho-7707e8a2ef1e To: Alexander Graf , Mike Rapoport , Pasha Tatashin , Pratyush Yadav Cc: linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, usamaarif642@gmail.com, rmikey@meta.com, clm@fb.com, riel@surriel.com, kernel-team@meta.com, Breno Leitao , SeongJae Park X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=7440; i=leitao@debian.org; h=from:subject:message-id; bh=hUYPRcba9zfyDjZaQs2u9sw+0GVuFqBCoC/amy5CRqs=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBpcOfNxE5Gja7tEx8/C45TJeRXvSRq4Q5AukReO pNqlM55YuSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaXDnzQAKCRA1o5Of/Hh3 bZ87D/9s8Zqi9foS429xPJJzR8//2drUdxcbvNbh85j9cvjJxmV1E9CFsRUC/Y/udMVEFTqkgxl YCkEPWKpnhFsbIdCKyabGr/EdbLYtPc9tlvgU3ruuCi/iApEAOvrouuiKVDCi2nOvdeWfnrAOKR NvmUZBmCj3VCoT1n+u6LmG7JlSTVN9o233+ZIG6W6mwt/hIabdYCKiOPE+NN5cU5sz4vmQJdryE CxTzXPkIAdcN9y9mj2Cnj7tGXmBZSy5zF8bxoEI7QllAPGtX48AiwPdqrtC+wg9gkDqWqBq8qZH MQLof7I8jy+GBF9gXXER6XYpDOnd4xlhgQmw6I4jl5m7vGBMCq2VLcqBY1OuiZEfJI9mOTgdhqN TzCoJKJOZlqJ6QJUy0Xj/Ia6vykQQ0skSF2t05ho71PrqktUDwfrb6L+mPWqYQz8I0NCLz5jyGK p5wJfDl4SSUj70wwSy6Ysw6GbKKyiedImTix1Pv/aqpMQ5aorwvdqWCTvEjcTEJ5FaKwd9y02fe bzKaZ8Nvoil2ZOdKd9I0miNiImNk2YBtI0iLSzrpPqyhE3jL7Y3vEzDlVLwHO/a4v08tcq3V6Ha HjAHVlGE/tHS5RrNR6r17nTHSh6V5S5D4ftTu9Gms4jTo/JDmJy2XMQ5tBqyfON+VxNqI7a8pkG yE73YjhXdQx6OEA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Use Kexec Handover (KHO) to pass the previous kernel's version string and the number of kexec reboots since the last cold boot to the next kernel, and print it at boot time. Example output: [ 0.000000] KHO: exec from: 6.19.0-rc4-next-20260107 (count 1) Motivation =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Bugs that only reproduce when kexecing from specific kernel versions are difficult to diagnose. These issues occur when a buggy kernel kexecs into a new kernel, with the bug manifesting only in the second kernel. Recent examples include the following commits: * eb2266312507 ("x86/boot: Fix page table access in 5-level to 4-level pag= ing transition") * 77d48d39e991 ("efistub/tpm: Use ACPI reclaim memory for event log to avo= id corruption") * 64b45dd46e15 ("x86/efi: skip memattr table on kexec boot") As kexec-based reboots become more common, these version-dependent bugs are appearing more frequently. At scale, correlating crashes to the previous kernel version is challenging, especially when issues only occur in specific transition scenarios. Implementation =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D The kexec metadata is stored as a plain C struct (struct kho_kexec_metadata) rather than FDT format, for simplicity and direct field access. It is registered via kho_add_subtree() as a separate subtree, keeping it independent from the core KHO ABI. This design choice: - Keeps the core KHO ABI minimal and stable - Allows the metadata format to evolve independently - Avoids requiring version bumps for all KHO consumers (LUO, etc.) when the metadata format changes The struct kho_metadata contains two fields: - previous_release: The kernel version that initiated the kexec - kexec_count: Number of kexec boots since last cold boot On cold boot, kexec_count starts at 0 and increments with each kexec. The count helps identify issues that only manifest after multiple consecutive kexec reboots. Signed-off-by: Breno Leitao Acked-by: SeongJae Park --- Changes in v4: - Squashed everything in a single commit - Moved from FDT to C structs (Pratyush) - Usage of subtress intead of FDT directly (Pratyush) - Renamed a bunch of variables and functions. - Link to v3: https://patch.msgid.link/20260108-kho-v3-0-b1d6b7a89342@debia= n.org Changes in v3: - Remove the extra CONFIG for this feature. - Reworded some identifiers, properties and printks. - Better documented the questions raised during v2. - Link to v2: https://patch.msgid.link/20260102-kho-v2-0-1747b1a3a1d6@debia= n.org Changes from v2 to v1 (RFC) - Track the number of kexecs since cold boot (Pasha) - Change the printk() order compared to KHO - Rewording of the commit summary - Link to RFC: https://patch.msgid.link/20251230-kho-v1-1-4d795a24da9e@debi= an.org --- include/linux/kho/abi/kexec_handover.h | 29 +++++++++++++++ kernel/liveupdate/kexec_handover.c | 65 ++++++++++++++++++++++++++++++= ++++ 2 files changed, 94 insertions(+) diff --git a/include/linux/kho/abi/kexec_handover.h b/include/linux/kho/abi= /kexec_handover.h index 285eda8a36e45..e18022a4e664d 100644 --- a/include/linux/kho/abi/kexec_handover.h +++ b/include/linux/kho/abi/kexec_handover.h @@ -11,6 +11,7 @@ #define _LINUX_KHO_ABI_KEXEC_HANDOVER_H =20 #include +#include =20 /** * DOC: Kexec Handover ABI @@ -84,6 +85,34 @@ /* The FDT property for sub-FDTs. */ #define KHO_FDT_SUB_TREE_PROP_NAME "fdt" =20 +/** + * DOC: Kexec Metadata ABI + * + * The "kexec-metadata" subtree stores optional metadata about the kexec c= hain. + * It is registered via kho_add_subtree(), keeping it independent from the= core + * KHO ABI. This allows the metadata format to evolve without affecting ot= her + * KHO consumers. + * + * The metadata is stored as a plain C struct rather than FDT format for + * simplicity and direct field access. + */ + +/** + * struct kho_kexec_metadata - Kexec metadata passed between kernels + * @previous_release: Kernel version string that initiated the kexec + * @kexec_count: Number of kexec boots since last cold boot + * + * This structure is preserved across kexec and allows the new kernel to + * identify which kernel it was booted from and how many kexec reboots + * have occurred. + */ +struct kho_kexec_metadata { + char previous_release[__NEW_UTS_LEN + 1]; + u32 kexec_count; +} __packed; + +#define KHO_METADATA_NODE_NAME "kexec-metadata" + /** * DOC: Kexec Handover ABI for vmalloc Preservation * diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_h= andover.c index 3cf2dc6840c92..3130444e183b3 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -1246,6 +1247,8 @@ struct kho_in { phys_addr_t fdt_phys; phys_addr_t scratch_phys; phys_addr_t mem_map_phys; + char previous_release[__NEW_UTS_LEN + 1]; + u32 kexec_count; struct kho_debugfs dbg; }; =20 @@ -1331,6 +1334,59 @@ static __init int kho_out_fdt_setup(void) return err; } =20 +static void __init kho_process_kexec_metadata(void) +{ + struct kho_kexec_metadata *metadata; + phys_addr_t metadata_phys; + int err; + + err =3D kho_retrieve_subtree(KHO_METADATA_NODE_NAME, &metadata_phys); + if (err) + /* This is fine, previous kernel didn't export metadata */ + return; + + metadata =3D phys_to_virt(metadata_phys); + + /* + * Copy data to the kernel structure that will persist during + * kernel lifetime. + */ + kho_in.kexec_count =3D metadata->kexec_count; + strscpy(kho_in.previous_release, metadata->previous_release, + sizeof(kho_in.previous_release)); + + pr_info("exec from: %s (count %u)\n", kho_in.previous_release, + kho_in.kexec_count); +} + +/* + * Create kexec metadata to pass kernel version and boot count to the + * next kernel. This keeps the core KHO ABI minimal and allows the + * metadata format to evolve independently. + */ +static __init int kho_populate_kexec_metadata(void) +{ + struct kho_kexec_metadata *metadata; + int err; + + metadata =3D kho_alloc_preserve(sizeof(*metadata)); + if (IS_ERR(metadata)) + return PTR_ERR(metadata); + + strscpy(metadata->previous_release, init_uts_ns.name.release, + sizeof(metadata->previous_release)); + /* kho_in.kexec_count is set to 0 on cold boot */ + metadata->kexec_count =3D kho_in.kexec_count + 1; + + err =3D kho_add_subtree(KHO_METADATA_NODE_NAME, metadata); + if (err) { + kho_unpreserve_free(metadata); + return err; + } + + return 0; +} + static __init int kho_init(void) { const void *fdt =3D kho_get_fdt(); @@ -1357,6 +1413,15 @@ static __init int kho_init(void) if (err) goto err_free_fdt; =20 + if (fdt) + kho_process_kexec_metadata(); + + /* Populate kexec metadata for the possible next kexec */ + err =3D kho_populate_kexec_metadata(); + if (err) + pr_warn("failed to initialize kexec-metadata subtree: %d\n", + err); + if (fdt) { kho_in_debugfs_init(&kho_in.dbg, fdt); return 0; --- base-commit: 5eec2b2e1f37acff8b926d2494eadaeef59be279 change-id: 20251230-kho-7707e8a2ef1e Best regards, -- =20 Breno Leitao