From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (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 BAE5C357CF4 for ; Thu, 3 Sep 2026 02:35:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.72 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788402907; cv=none; b=QUeDJAu9lqMr6hGqtP93ckXIKMve668T7dWQeD6kbHsAJAq187tC1NTmMGqeEdvLjn94oPKTezjn12r2GXMRTChutbEzupsrrobM6NGcvONRFpu6tYX249T78WVU/4Qhe/ssvqk6r+8+QSQR5jmy3PdHkGMJKg6TtxoztqrS4lU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788402907; c=relaxed/simple; bh=/wgIjAR3Nkn0dkLJ5F4noRZR2nevYpV3/NPEpvosUDQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PVjehcJNojY9qHSnmE0ZsBdfdiwMJJVeLYmrnzXyj7TMzgWPc+gXMIODcGuP58N/zy4Vdr9OiHLkN5rUMzByGktaWxmhTSmnzV5ESAht39+JfujW/DFhfWmcC/tvlpltD5o0YZxL2HDqumqUn7S60Tva2TvNa1u9pVjnmYyNbis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--loganodell.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=nF9C9FOZ; arc=none smtp.client-ip=209.85.216.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--loganodell.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="nF9C9FOZ" Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-385d2703b64so551899a91.1 for ; Wed, 02 Sep 2026 19:35:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788402898; x=1789007698; darn=lists.linux.dev; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=t1Sj3SZIoFO1IrO+MibWwCI7jpIestNZ9bFRqEQ8nhA=; b=nF9C9FOZ6HQKXPnmDuduRsyZD4DIoz3LlYhS1cATOOyMMEN/pYngpbAp+4808ste1X k7hezQMIA1/j1nleHm48Uv7y4Lxe0DEaLCuoRlJ7FUiHIBqXS/6GUuu9tDtv5+5bzb/i pumXInyFbjRcWNlere+n3geRQ4EWxf5H7DHSYGwqIZrhBmwOZH8pQ0ydfpc3cA84dovq zf6/GRN4qB4XIFC5YFfW2DpHTD0/BDfpaRY5De8I2bo6gDPqlndj5oLQZCnggUBYpqWt D1fOCcCGn5YjQyKGVes2LnhjztqqKuKME62RC8r1+5O7NX8zuWB698cxHLahESSWcerb mMOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788402898; x=1789007698; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=t1Sj3SZIoFO1IrO+MibWwCI7jpIestNZ9bFRqEQ8nhA=; b=ag7rcxeRFktJJ6Smt5xiA9cmuAAy1M04gPZmLO0blIZLVhCIB1G4F3yWK2UrfMMWNv W00HJrlmMTbGisEirtSc3xVsp5PDk0GozKftZ8kIDy0dAlAB9pObAj5jemjCpQzwyH64 KltT6eZocerm6VsFk7Sr1AAUL7+nRiOG+8XTDnoTUr2MkE7hs0rHjFH44decDI8Ag0jw QdWZCBEIIJITM5HmoHK8EsFsImCoKNDlUp5wFAI+LbWMp40uE0Bp6sRKYDTdExLcZoV0 cP9QzobEKdjJlUMQSWc6O3XqmFHT3jpokqGnQRjPxbW4BYOPS7PmQAG/ApSb1kKkQB7j Jpuw== X-Forwarded-Encrypted: i=1; AKwUvBy2fJad8RyIq7YLve4rvEf3YHMMfdgOQxV3XUpHqDnIkmkNTz1K1rWGnBkEfqtliHNySLulHg8=@lists.linux.dev X-Gm-Message-State: AFuF++kFNax+0a7ivq+TzNmHoTHTEM11BOYKQFbQ9ULWUwCljU8q0f8d etSqBrGU1sfBPJE7Io1pN0I+psTbRC4VKKaOxvIfkJTv9nHKjxGTWbfR/DLYZkFvhiz71OET5Zv KMYTQ6gx/02WR1IMjuUbQdw== X-Received: from dybdb19.prod.google.com ([2002:a05:7300:b093:b0:328:684d:3f7]) (user=loganodell job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4b04:b0:396:4ce0:6400 with SMTP id 98e67ed59e1d1-39b07f33963mr3591851a91.2.1788402897557; Wed, 02 Sep 2026 19:34:57 -0700 (PDT) Date: Wed, 2 Sep 2026 19:34:51 -0700 In-Reply-To: <20260903023452.721732-1-loganodell@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260903023452.721732-1-loganodell@google.com> X-Mailer: git-send-email 2.55.0.979.g7e5102b832-goog Message-ID: <20260903023452.721732-3-loganodell@google.com> Subject: [RFC PATCH 2/3] luo: Export feature support to vmlinux section From: Logan Odell To: arnd@arndb.de, pasha.tatashin@soleen.com, rppt@kernel.org, pratyush@kernel.org, graf@amazon.com, akpm@linux-foundation.org, pbonzini@redhat.com, maz@kernel.org, oupton@kernel.org, seanjc@google.com, bhelgaas@google.com, alex@shazbot.org, jgg@nvidia.com, kevin.tian@intel.com, dwmw2@infradead.org, baolu.lu@linux.intel.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-pci@vger.kernel.org, iommu@lists.linux.dev, Logan Odell Content-Type: text/plain; charset="UTF-8" Create a liveupdate_features section that contains the feature information for a given liveupdate component. Add the LUO component first. These can be compared between two kernels to determine live update compatibility. Features marked as required in the running kernel will need to have that feature marked as supported in the next kernel to be eligible for compatibility. Suggested-by: Pratyush Yadav Signed-off-by: Logan Odell --- include/asm-generic/vmlinux.lds.h | 12 +++++++++++ include/linux/kho/abi/luo.h | 34 +++++++++++++++++++++++++++++++ include/linux/liveupdate.h | 12 +++++++++++ kernel/liveupdate/luo_core.c | 16 +++++++++++++++ 4 files changed, 74 insertions(+) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 5659f4b5a125..aed4e282a78c 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -359,6 +359,17 @@ #define THERMAL_TABLE(name) #endif +#ifdef CONFIG_LIVEUPDATE +#define LIVEUPDATE_FEATURES \ + . = ALIGN(8); \ + .liveupdate_features : AT(ADDR(.liveupdate_features) - LOAD_OFFSET) { \ + KEEP(*(.liveupdate_sec_hdr)) \ + KEEP(*(.liveupdate_features)) \ + } +#else +#define LIVEUPDATE_FEATURES +#endif + #define KERNEL_DTB() \ STRUCT_ALIGN(); \ __dtb_start = .; \ @@ -554,6 +565,7 @@ RO_EXCEPTION_TABLE \ NOTES \ BTF \ + LIVEUPDATE_FEATURES \ \ . = ALIGN((align)); \ __end_rodata = .; diff --git a/include/linux/kho/abi/luo.h b/include/linux/kho/abi/luo.h index 0a7662a0cf9a..5b25e1b48cf5 100644 --- a/include/linux/kho/abi/luo.h +++ b/include/linux/kho/abi/luo.h @@ -230,4 +230,38 @@ struct luo_flb_ser { #define LIVEUPDATE_TEST_FLB_COMPATIBLE(i) "liveupdate-test-flb-v" #i #endif +#define LIVEUPDATE_VER_HDR_MAGIC 0x4c565550 /* 'LVUP' */ +#define LIVEUPDATE_VER_HDR_VER 1 + +/** + * struct liveupdate_ver_hdr - Header of vmlinux section with version lists + * @magic: Magic number ('LVUP'). + * @version: Version of the header format. + * + * This struct is the header for the vmlinux section ".liveupdate_features". The + * section contains the list of feature/version entries that the kernel supports. + */ +struct liveupdate_ver_hdr { + u32 magic; + u32 version; +} __packed; + +/** + * struct liveupdate_feature_entry - Live update feature/version entry + * @name: Name of the subsystem or feature ("luo" for core). + * @feat_bytes: Number of bytes covered by supp, req, and active bitmaps (e.g. 8). + * @reserved: Reserved / padding for alignment. + * @supp: Bitmask of supported features. + * @req: Bitmask of required features. + * @active: Bitmask of active features. + */ +struct liveupdate_feature_entry { + char name[LIVEUPDATE_HNDL_COMPAT_LENGTH]; + u32 feat_bytes; + u32 reserved; + u64 supp; + u64 req; + u64 active; +} __packed; + #endif /* _LINUX_KHO_ABI_LUO_H */ diff --git a/include/linux/liveupdate.h b/include/linux/liveupdate.h index 6051abc0612c..e058df23fed1 100644 --- a/include/linux/liveupdate.h +++ b/include/linux/liveupdate.h @@ -229,6 +229,16 @@ struct liveupdate_flb { #ifdef CONFIG_LIVEUPDATE +#define LIVEUPDATE_FEATURE_ENTRY(_id, _name, _supp, _req, _active) \ + static const struct liveupdate_feature_entry __lu_feat_##_id \ + __used __section(".liveupdate_features") __aligned(8) = { \ + .name = _name, \ + .feat_bytes = sizeof(u64), \ + .supp = (_supp), \ + .req = (_req), \ + .active = (_active), \ + } + /* Return true if live update orchestrator is enabled */ bool liveupdate_enabled(void); @@ -259,6 +269,8 @@ int liveupdate_get_token_outgoing(struct liveupdate_session *s, #else /* CONFIG_LIVEUPDATE */ +#define LIVEUPDATE_FEATURE_ENTRY(_id, _name, _supp, _req, _active) + static inline bool liveupdate_enabled(void) { return false; diff --git a/kernel/liveupdate/luo_core.c b/kernel/liveupdate/luo_core.c index 6add1ecc463f..27413f895174 100644 --- a/kernel/liveupdate/luo_core.c +++ b/kernel/liveupdate/luo_core.c @@ -64,6 +64,22 @@ #include "kexec_handover_internal.h" #include "luo_internal.h" +/* + * This is the header for the ".liveupdate_features" section in vmlinux. + * The linker makes sure that this header precedes the entries. + */ +static const struct liveupdate_ver_hdr ver_hdr + __used __section(".liveupdate_sec_hdr") __aligned(8) = { + .magic = LIVEUPDATE_VER_HDR_MAGIC, + .version = LIVEUPDATE_VER_HDR_VER, +}; + +/* Core LUO features */ +LIVEUPDATE_FEATURE_ENTRY(luo_core, "luo", + LUO_CORE_FEATURES_SUPP, + LUO_CORE_FEATURES_REQ, + LUO_CORE_FEATURES_ACTIVE); + static struct { bool enabled; struct luo_ser *luo_ser_out; -- 2.55.0.979.g7e5102b832-goog