On Thu, May 14 2026, Pasha Tatashin wrote: > Transition the LUO to ABI v2, which centralizes state management into a > single struct luo_ser header. > > Previously, LUO state was spread across multiple FDT properties and > subnodes. ABI v2 simplifies this by placing all core state, including > the liveupdate number and physical addresses for sessions and FLB > headers into a centralized struct luo_ser.
Makes a lot of sense I think. But nit: this brings about a semantic difference: now sessions and FLB serialization format is no longer independent of LUO. I think that makes sense but can you please spell that out in the commit message. > > Signed-off-by: Pasha Tatashin <[email protected]> > --- > include/linux/kho/abi/luo.h | 91 +++++++++++--------------------- > kernel/liveupdate/luo_core.c | 59 ++++++++++++++------- > kernel/liveupdate/luo_flb.c | 65 ++++------------------- > kernel/liveupdate/luo_internal.h | 8 +-- > kernel/liveupdate/luo_session.c | 57 +++----------------- > 5 files changed, 93 insertions(+), 187 deletions(-) > > diff --git a/include/linux/kho/abi/luo.h b/include/linux/kho/abi/luo.h > index 46750a0ddf88..1b2f865a771a 100644 > --- a/include/linux/kho/abi/luo.h > +++ b/include/linux/kho/abi/luo.h > @@ -30,52 +30,25 @@ > * .. code-block:: none > * > * / { > - * compatible = "luo-v1"; > - * liveupdate-number = <...>; > - * > - * luo-session { > - * compatible = "luo-session-v1"; > - * luo-session-header = <phys_addr_of_session_header_ser>; > - * }; > - * > - * luo-flb { > - * compatible = "luo-flb-v1"; > - * luo-flb-header = <phys_addr_of_flb_header_ser>; > - * }; > + * compatible = "luo-v2"; > + * luo-abi-header = <phys_addr_of_luo_ser>; While you are at it, perhaps also get rid of the LUO FDT entirely? With this change it only holds the compatible and a pointer to a blob. Might as well move the compatible string to the blob and use it directly. Do you see any benefits of sticking with the FDT here? We have already removed it from memfd for example (and AFAIK the upcoming PCI and VFIO patches also do not use it). > * }; > * > * Main LUO Node (/): > * > - * - compatible: "luo-v1" > + * - compatible: "luo-v2" > * Identifies the overall LUO ABI version. > - * - liveupdate-number: u64 > - * A counter tracking the number of successful live updates performed. > @@ -109,13 +82,26 @@ > > /* > * The LUO FDT hooks all LUO state for sessions, fds, etc. > - * In the root it also carries "liveupdate-number" 64-bit property that > - * corresponds to the number of live-updates performed on this machine. > */ > #define LUO_FDT_SIZE PAGE_SIZE > #define LUO_FDT_KHO_ENTRY_NAME "LUO" > -#define LUO_FDT_COMPATIBLE "luo-v1" > -#define LUO_FDT_LIVEUPDATE_NUM "liveupdate-number" > +#define LUO_FDT_COMPATIBLE "luo-v2" > +#define LUO_FDT_ABI_HEADER "luo-abi-header" Nit: If we do go with FDT, I suppose "luo-ser-pa" (or "luo-ser"?) would be more descriptive? > + > +/** > + * struct luo_ser - Centralized LUO ABI header. > diff --git a/kernel/liveupdate/luo_flb.c b/kernel/liveupdate/luo_flb.c > index 8f5c5dd01cd0..7ccc59981297 100644 > --- a/kernel/liveupdate/luo_flb.c > +++ b/kernel/liveupdate/luo_flb.c > @@ -159,8 +159,8 @@ static void luo_flb_file_unpreserve_one(struct > liveupdate_flb *flb) > > static int luo_flb_retrieve_one(struct liveupdate_flb *flb) > { > - struct luo_flb_private *private = luo_flb_get_private(flb); > struct luo_flb_header *fh = &luo_flb_global.incoming; > + struct luo_flb_private *private = luo_flb_get_private(flb); Nit: this doesn't seem to do anything. Is this a stray change? > struct liveupdate_flb_op_args args = {0}; > bool found = false; > int err; > -int __init luo_flb_setup_incoming(void *fdt_in) > +void __init luo_flb_setup_incoming(u64 flbs_pa) > { > struct luo_flb_header_ser *header_ser; > - int err, header_size, offset; > - const void *ptr; > - u64 header_ser_pa; > - > - offset = fdt_subnode_offset(fdt_in, 0, LUO_FDT_FLB_NODE_NAME); > - if (offset < 0) { > - pr_err("Unable to get FLB node [%s]\n", LUO_FDT_FLB_NODE_NAME); > > - return -ENOENT; > + if (flbs_pa) { > + header_ser = phys_to_virt(flbs_pa); > + luo_flb_global.incoming.header_ser = header_ser; > + luo_flb_global.incoming.ser = (void *)(header_ser + 1); > + luo_flb_global.incoming.active = true; Nit: Not getting FLB data resulted in a error print. I suppose we should keep that here as well. > } > - > - err = fdt_node_check_compatible(fdt_in, offset, > - LUO_FDT_FLB_COMPATIBLE); > - if (err) { > - pr_err("FLB node is incompatible with '%s' [%d]\n", > - LUO_FDT_FLB_COMPATIBLE, err); > - > - return -EINVAL; > - } > - > - header_size = 0; > - ptr = fdt_getprop(fdt_in, offset, LUO_FDT_FLB_HEADER, &header_size); > - if (!ptr || header_size != sizeof(u64)) { > - pr_err("Unable to get FLB header property '%s' [%d]\n", > - LUO_FDT_FLB_HEADER, header_size); > - > - return -EINVAL; > - } > - > - header_ser_pa = get_unaligned((u64 *)ptr); > - header_ser = phys_to_virt(header_ser_pa); > - > - luo_flb_global.incoming.header_ser = header_ser; > - luo_flb_global.incoming.ser = (void *)(header_ser + 1); > - luo_flb_global.incoming.active = true; > - > - return 0; > } > > /** > -int __init luo_session_setup_incoming(void *fdt_in) > +int __init luo_session_setup_incoming(u64 sessions_pa) > { > struct luo_session_header_ser *header_ser; > - int err, header_size, offset; > - u64 header_ser_pa; > - const void *ptr; > - > - offset = fdt_subnode_offset(fdt_in, 0, LUO_FDT_SESSION_NODE_NAME); > - if (offset < 0) { > - pr_err("Unable to get session node: [%s]\n", > - LUO_FDT_SESSION_NODE_NAME); > - return -EINVAL; > - } > > - err = fdt_node_check_compatible(fdt_in, offset, > - LUO_FDT_SESSION_COMPATIBLE); > - if (err) { > - pr_err("Session node incompatible [%s]\n", > - LUO_FDT_SESSION_COMPATIBLE); > - return -EINVAL; > - } > - > - header_size = 0; > - ptr = fdt_getprop(fdt_in, offset, LUO_FDT_SESSION_HEADER, &header_size); > - if (!ptr || header_size != sizeof(u64)) { > - pr_err("Unable to get session header '%s' [%d]\n", > - LUO_FDT_SESSION_HEADER, header_size); > - return -EINVAL; > + if (sessions_pa) { Nit: same thing about the error print here. > + header_ser = phys_to_virt(sessions_pa); > + luo_session_global.incoming.header_ser = header_ser; > + luo_session_global.incoming.ser = (void *)(header_ser + 1); > + luo_session_global.incoming.active = true; > } > > - header_ser_pa = get_unaligned((u64 *)ptr); > - header_ser = phys_to_virt(header_ser_pa); > - > - luo_session_global.incoming.header_ser = header_ser; > - luo_session_global.incoming.ser = (void *)(header_ser + 1); > - luo_session_global.incoming.active = true; > - > return 0; > } -- Regards, Pratyush Yadav
