From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.218.70 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792596336; b=ARdKf8iDmv6ILnT/MknR2h1E1DUdR6mIuWEg27/82VEBAxPWPY40xBxj1sF7taLWeFJs Ee8qIRZlMeRkiNWWtgBAHohEjrxG4V7Xv2hvzD4h7EJX92LPEJGm38m+TZc9sBkj3qrGa tz7KYkw1EYGJQNVH4jDK0wGX+5nRmnTMmfgwh8xHSTT/AGK0e9lp7GeAmolr7w3/5Ajpf fb28EVmLFK4MXw2Kskdz4WpwVDbz5zOAjGpT2WUs0mEzBhqSp/7xEivuRP1IVj83MPwuX SZuTGUR0JpEAJO7KiU39fTLSeLjIZiFtHVOg2iEuhbb495Qwe/tgPw9nDq4P/3bO5bA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792596336; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=yVHoNG/F+MSh1AvSZ4DFO2pLKQWPL8PGoHBteE3nowI=; b=tuBexobN1VrbhyUbRNHcFf48ON1SVO0+6fPpBpSJD7PdkpU5p/6cqePv0shk09oIHes2 Us5lqVahltN50J3jthqdJ0reax44oDHCySgw+6psKK7nmNofrBMxIJk8cZjIAswFsfwMZ O9o0PVOkyWaBsy/FEi8Qk1qzBv99wK8gjnvXC9jJNArrj5VViP8XfMkHuAa2vWBagDOe0 7mkl3pDstH1XiGFM2xsUDGBWaXSHvM285a8zCo0e0ZTOn4AejzSA92CQe5RGedEAvqPyF miuIru1oYETSSTl/Qwybt5RvxiGFjakRvfhZM/7RbsdtCi3O/+z+B1nGndsA6eYHbfw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--tarunsahu.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=iO8NDuIw; arc=none smtp.remote-ip=209.85.218.70 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B9D960A261F for ; Wed, 21 Oct 2026 15:25:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 8B9D960A261F 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--tarunsahu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=iO8NDuIw Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-c41b03cd1dcso79611266b.3 for ; Wed, 21 Oct 2026 08:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792596334; x=1793201134; 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=yVHoNG/F+MSh1AvSZ4DFO2pLKQWPL8PGoHBteE3nowI=; b=iO8NDuIwLJuvXU/uqOq6FY3rSZNDK+ekeNytAYT3SOUcIQIl0ya+8KySv+uR8eAF0T TIfo40b1tGSS7JPBDizbsfp2OK4d5EstQMv/hdyYdgcdfq09jNyzoN+Hdqbj6sqEIPpZ WERqN1TT5F/nW6lval3JKXN05UhJ4dMMsTc11GV2jv+aFxpRYvl1SSjVFcSXCePFUl/Q UqEayD0mqx8A1Th5JOiWVWVrSFRkl9Ra/7coW2MBYUkDOZSKPn4Wu7I6aLG9rk3I6J30 Ya+aUu6C1XeEgQqFV3+2dayZU2zwojeagTy4WxInOFiedgAy2xKygpGdRq7JxAmGPTEK DqPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792596334; x=1793201134; 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=yVHoNG/F+MSh1AvSZ4DFO2pLKQWPL8PGoHBteE3nowI=; b=eGZL7s+6t0ST0ZtHK/GwNps/GrhysckO9NPZVDSgbx6PDplYAClxBVClpYjdWA5p8E 8SZnpxaE2D++33TmFs+9dVoKwjsOLbX21gE8/3sY5jyqL/3EBX8JgItnBFKA9V2K5UtR 3PLYTQgbWuAo+0yDtjyO6dqewkF2lAXKmLz4T7kmJKB3j0bCPJsTy/3JpnXOQZWyeK1D 7BAghzuOGAEwRk6ZmYxLiFxqZ5y5ceO34Ewkk1+C5UVHlVmmtop7Esi/0Vx4j4imFPxE eKT99Es0TNcA2/8GkMhp43ZT43yz6aj/jp2bL62cWA7kgFrFnBWteBp28MRlmIM0EeDs oIiA== X-Forwarded-Encrypted: i=1; AKwUvBwgqFq3laYsDYxx+6TE5IN9zYUpCBhHtIl3ZJNfjc87mA6GPwFkVt1MuPHRqSrNmVreT3K2kg==@lists.linux.dev X-Gm-Message-State: AFq9FYLw18zB1W6jDK5qHxGiu6BOPP1iRw79xgKyN1Kayo1H2D84wQnH Fyo5yaf7mh6a7ex4eancQlpaSrFLR/zSUcHJL2nV1BRaFb/NggyiH8hZVqHSlId1hf8XyjRuBCk 7THRgyIMa27XwK+DUsQ== X-Received: from ejeck13-n2.prod.google.com ([2002:a17:907:e1cd:20b0:c2e:8317:2af9]) (user=tarunsahu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:c64b:10b0:c46:7fa4:922b with SMTP id a640c23a62f3a-c467fa4a587mr117629166b.33.1792596333890; Wed, 21 Oct 2026 08:25:33 -0700 (PDT) Date: Wed, 21 Oct 2026 15:25:27 +0000 In-Reply-To: <20261021152527.375070-1-tarunsahu@google.com> X-Mailing-List: iommu@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261021152527.375070-1-tarunsahu@google.com> X-Mailer: git-send-email 2.56.0.212.g129ede20d9-goog Message-ID: <20261021152527.375070-5-tarunsahu@google.com> Subject: [RFC PATCH v2 4/4] mm: memfd_luo: Add the 2-bit pair feature header From: Tarun Sahu To: Andrew Morton , joro@8bytes.org, Mike Rapoport , Pratyush Yadav , maz@kernel.org, arnd@arndb.de, David Matlack , jgg@nvidia.com, robin.murphy@arm.com, loganodell@google.com, oupton@kernel.org, kevin.tian@intel.com, alex@shazbot.org, dwmw2@infradead.org, pbonzini@redhat.com, seanjc@google.com, will@kernel.org, Pasha Tatashin , Alexander Graf , Bjorn Helgaas , baolu.lu@linux.intel.com Cc: linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, sagis@google.com, linux-mm@kvack.org, kvmarm@lists.linux.dev, iommu@lists.linux.dev, linux-pci@vger.kernel.org, kexec@lists.infradead.org, skhawaja@google.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Tarun Sahu Content-Type: text/plain; charset="UTF-8" Embed the fixed-size 128-byte struct luo_feature_hdr at the start of struct memfd_luo_ser and define enum memfd_luo_feature (MEMFD_LUO_FEAT_CORE and MEMFD_LUO_FEAT_MAX) for memfd preservation. All current struct memfd_luo_ser fields (pos, size, seals, flags, nr_folios, folios) and MEMFD_LUO_ALL_SEALS belong to MEMFD_LUO_FEAT_CORE (LUO_FEAT_REQUIRED in memfd_luo_features). Future changes add new entries to enum memfd_luo_feature before MEMFD_LUO_FEAT_MAX and append any new fields to the end of struct memfd_luo_ser so existing field offsets never shift. Signed-off-by: Logan Odell Signed-off-by: Tarun Sahu --- include/linux/kho/abi/memfd.h | 35 ++++++++++++++++++++++++++++++----- mm/memfd_luo.c | 14 ++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/include/linux/kho/abi/memfd.h b/include/linux/kho/abi/memfd.h index 371ffd108a79..f0b5235a408d 100644 --- a/include/linux/kho/abi/memfd.h +++ b/include/linux/kho/abi/memfd.h @@ -13,6 +13,7 @@ #include #include +#include /** * DOC: memfd Live Update ABI @@ -21,11 +22,20 @@ * reboot using the LUO. * * The state is serialized into a packed structure `struct memfd_luo_ser` - * which is handed over to the next kernel via the KHO mechanism. + * which is handed over to the target kernel via the KHO mechanism. * - * This interface is a contract. Any modification to the structure layout - * constitutes a breaking change. Such changes require incrementing the - * version number in the MEMFD_LUO_FH_COMPATIBLE string. + * This interface is a contract. `struct memfd_luo_ser` starts with a fixed + * 128-byte `struct luo_feature_hdr`. The relative order and offsets of + * fields must remain unchanged as features are added or retired: new fields + * are appended at the end of `struct memfd_luo_ser` under a new feature + * flag in `enum memfd_luo_feature` (before `MEMFD_LUO_FEAT_MAX`), and + * retired fields are kept in place so subsequent offsets never shift. In + * the target kernel, fields of a `LUO_FEAT_REQUIRED` feature are guaranteed + * present once `luo_feature_hdr_validate()` succeeds, whereas fields of a + * `LUO_FEAT_OPTIONAL` feature should be accessed only after checking + * `luo_feature_is_active()`. All current fields (`pos`, `size`, `seals`, + * `flags`, `nr_folios`, `folios`) and `MEMFD_LUO_ALL_SEALS` belong to + * `MEMFD_LUO_FEAT_CORE` (`LUO_FEAT_REQUIRED` in `memfd_luo_features`). */ /** @@ -58,7 +68,7 @@ struct memfd_luo_folio_ser { /* * The set of seals this version supports preserving. If support for any new - * seals is needed, add it here and bump version. + * seals is needed, gate them behind a new feature flag. */ #define MEMFD_LUO_ALL_SEALS (F_SEAL_SEAL | \ F_SEAL_SHRINK | \ @@ -67,8 +77,22 @@ struct memfd_luo_folio_ser { F_SEAL_FUTURE_WRITE | \ F_SEAL_EXEC) +/** + * enum memfd_luo_feature - Feature indices for &struct memfd_luo_ser. + * @MEMFD_LUO_FEAT_CORE: Core feature covering `pos`, `size`, `seals`, `flags`, + * `nr_folios`, `folios`, and %MEMFD_LUO_ALL_SEALS. + * @MEMFD_LUO_FEAT_MAX: Number of defined &enum memfd_luo_feature features. + */ +enum memfd_luo_feature { + MEMFD_LUO_FEAT_CORE = 0, + MEMFD_LUO_FEAT_MAX, +}; + +static_assert((int)MEMFD_LUO_FEAT_MAX <= LUO_FEAT_MAX); + /** * struct memfd_luo_ser - Main serialization structure for a memfd. + * @features: ABI feature and size header for memfd_luo_ser. * @pos: The file's current position (f_pos). * @size: The total size of the file in bytes (i_size). * @seals: The seals present on the memfd. The seals are uABI so it is safe @@ -79,6 +103,7 @@ struct memfd_luo_folio_ser { * struct memfd_luo_folio_ser. */ struct memfd_luo_ser { + struct luo_feature_hdr features; u64 pos; u64 size; u32 seals; diff --git a/mm/memfd_luo.c b/mm/memfd_luo.c index 64f8b8cb75bd..ea1f4c8cd259 100644 --- a/mm/memfd_luo.c +++ b/mm/memfd_luo.c @@ -84,6 +84,10 @@ #include "internal.h" +static const u8 memfd_luo_features[MEMFD_LUO_FEAT_MAX] = { + [MEMFD_LUO_FEAT_CORE] = LUO_FEAT_REQUIRED, +}; + static int memfd_luo_preserve_folios(struct file *file, struct kho_vmalloc *kho_vmalloc, struct memfd_luo_folio_ser **out_folios_ser, @@ -284,6 +288,8 @@ static int memfd_luo_preserve(struct liveupdate_file_op_args *args) goto err_free_ser; } + luo_feature_hdr_init(&ser->features, sizeof(*ser), + memfd_luo_features); ser->pos = args->file->f_pos; inode_size = i_size_read(inode); @@ -525,6 +531,14 @@ static int memfd_luo_retrieve(struct liveupdate_file_op_args *args) if (!ser) return -EINVAL; + err = luo_feature_hdr_validate(&ser->features, memfd_luo_features); + if (err) { + pr_err("memfd_luo_ser feature header validation failed (size=%llu, flags[0]=%#llx): %pe\n", + ser->features.size, ser->features.flags[0], + ERR_PTR(err)); + goto free_ser; + } + /* Make sure the file only has seals supported by this version. */ if (ser->seals & ~MEMFD_LUO_ALL_SEALS) { err = -EOPNOTSUPP; -- 2.56.0.212.g129ede20d9-goog