From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.208.72 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794286947; b=pZg2qA94HqQY6IGxKqR+0J1/ksqdw6Hqn6IXApFs1Sh/rmAdySHDfrr624Lti6AXBxMM +XwO3dmMPMcOzxSFTG+YMRZwsk9e4fgKVLGFJXScPVxeyG0QUwIi+Ghg5Pfd6tJv21v6t Eabaedu3ji5mfREAzRtyy3lp9NIOm4i+QG0pWFQO8bPEp2vSFY7j7YU4tk+Xl+6pmd98B bWK4F2lWv5LgKhHEZC15b07qW9jvqvMw8UHvVy4/W/e9s7hGbH1E9Hq60IUQrYv3h21cU lOnthsoRz88ixAodxcbNAo+KpGx5ytd4IKm8KGdiR6hPvIWVwDESVx00zXvBYM/Fz4g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794286947; 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=CgBCpjKfzBqNZpJUjcpaoZF5kynIHAd0/p/NXGzkOjc=; b=Yn+wBzVRtlhYxwEQWwdQHYXKF8MP3dr0jz6gR/FeL0YlyLSSApqpbN8zw8JCnZIDH1x9 C7NkP9sotwjDB/DGYX5qgT+n8fQJaH2qii9ZUtDY2CSlmHZc2x1yFjDdJ/vBI9p39c4UE rOaECyvllse/86OYA/YsauOjt1hXNu5KUS9xNYBONSIyy1I5qB0ekNLVWNEFKWmXF/5P7 N+3IELvkc6PcXzmdBTFdZl0OHiKhh9T2tVXxLNvKcop4likUCliS2awrRklRQ6OJMDu3b 6NpKjUMibGQ2zGQjtPUPvb3PpZXO4CnhYGSQKLxyQ/VTA40BM+7TmahBxd6tDFMbvrA== 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=20260707 header.b="lNZ/Bmo1"; arc=none smtp.remote-ip=209.85.208.72 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 DD2CF606E495 for ; Tue, 10 Nov 2026 05:02:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org DD2CF606E495 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) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=lNZ/Bmo1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-6b76329afcdso43497a12.2 for ; Mon, 09 Nov 2026 21:02:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794286944; x=1794891744; darn=vger.kernel.org; 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=CgBCpjKfzBqNZpJUjcpaoZF5kynIHAd0/p/NXGzkOjc=; b=lNZ/Bmo1B5y2EaXYYAVuaMVIjPQaf0oOdvrpwSasoz6u5vTy/z+s4fr8W3wcvM74hV PaIpbKX0Zy0GO/WpCVuxnl6CIkmyb2Z7JhqF88PI/zT6il+h64sSv3oldqJe8UbM7SLD h/O1D4qaSAzV9xwZ7wV/yEo47kj6LKtxAVWAc+Urh4R2csyjH+d6FrgmNKsXCn+a8cFf hzAO3YKZH2J6mNoE4D57WnD5hoSVzTNT+Y+CyRAYNjmHITTcLWAEmST8KJwRNqm9SkeJ cw01d/rm0O7ajm0OSMfPpPXT0+uHLzEX7H+Vq3OznKrXqgMRG7XhDUID7zQIe5xPufj4 mAAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794286944; x=1794891744; 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=CgBCpjKfzBqNZpJUjcpaoZF5kynIHAd0/p/NXGzkOjc=; b=rRgvjEayIDi6Og7YqE5IdiQuUAdP4Z0eCtpmPLA6ZPtUGZz8W+WpdXYB+sf0/QnGMt S/xu9BtgR4aJ1RACb+JnY/4SfBuL8ETq+F99mHPCnfPyFlWjASO+EnL/36NvWeY3JjN3 +HwCHDhTpUjeq0PIPRYPCkT8vXhuwp0wKaH1+t84pNQOWUBWTNtuNXjPcEcyp9I2ZAkQ CWiYO2NTWRuXhGBNqzAM9haZwHBZgx6UI0SbLAKHweJUPfxVQ9zNMfSvx4Hqn10d/iX7 eCrN/ZPLDlwa7UXCg5l7ZMpO6UK15FaK0V0E795hFkaxNr33KIPERn27yjP8qyq3rSUP dMdQ== X-Forwarded-Encrypted: i=1; AL+hErH/TL2Yjrc2yf0asQQucK6veX9x16n6otQzQkBwcM3OFrPMXKxJsJYtbHCQCsdqA8In44aFh64WIiXxGyc=@vger.kernel.org X-Gm-Message-State: APuU4Z/sDW+zAyiEQDLfo+kEfNPbb/gTF93Zz8p4PjDxjOul8X54UYxT 85C8JM04lb0ii6QWsg7WMZNvLwrqctDPz0kzE2pm0cR8ap8Mnq1CnKM03r25a46PEOGZNLAMNMl sm1kycgKP1XDbgc+D5A== X-Received: from edtj4.prod.google.com ([2002:aa7:ca44:0:b0:6b7:3b3e:5148]) (user=tarunsahu job=prod-delivery.src-stubby-dispatcher) by 2002:aa7:d496:0:b0:6ac:934e:a9ca with SMTP id 4fb4d7f45d1cf-6b755626f5fmr907953a12.0.1794286944079; Mon, 09 Nov 2026 21:02:24 -0800 (PST) Date: Tue, 10 Nov 2026 05:02:00 +0000 In-Reply-To: <20261110050202.529473-1-tarunsahu@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261110050202.529473-1-tarunsahu@google.com> X-Mailer: git-send-email 2.56.0.506.g506a7eabc5-goog Message-ID: <20261110050202.529473-18-tarunsahu@google.com> Subject: [PATCH v4 17/19] mm: memfd_luo: Add feature header to struct memfd_luo_ser From: Tarun Sahu To: Pasha Tatashin , Mike Rapoport , robin.murphy@arm.com, maz@kernel.org, will@kernel.org, David Matlack , Alexander Graf , seanjc@google.com, jgg@nvidia.com, loganodell@google.com, arnd@arndb.de, dwmw2@infradead.org, baolu.lu@linux.intel.com, Bjorn Helgaas , oupton@kernel.org, alex@shazbot.org, gle.com@google.com, pbonzini@redhat.com, Andrew Morton , kevin.tian@intel.com, joro@8bytes.org Cc: kvmarm@lists.linux.dev, linux-pci@vger.kernel.org, Pratyush Yadav , kexec@lists.infradead.org, kvm@vger.kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, skhawaja@google.com, sagis@google.com, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tarun Sahu Content-Type: text/plain; charset="UTF-8" Precede struct memfd_luo_ser with struct kho_ser_hdr using DECLARE_KHO_SER. Later memfd features can be appended under new feature indices without breaking compatibility between adjacent kernels. Allocate both the memfd_luo_ser feature header and the kho_vmalloc feature header in the same preserved folio. On restore and retrieve, validate incoming required features before accessing payload fields. Signed-off-by: Tarun Sahu --- include/linux/kho/abi/memfd.h | 7 ++-- mm/memfd_luo.c | 67 ++++++++++++++++++++++++----------- 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/include/linux/kho/abi/memfd.h b/include/linux/kho/abi/memfd.h index b0597c438973..27f8880ee593 100644 --- a/include/linux/kho/abi/memfd.h +++ b/include/linux/kho/abi/memfd.h @@ -83,6 +83,8 @@ static_assert(!IS_ENABLED(CONFIG_64BIT) || * @nr_folios: Number of folios in the folios array. * @folios_fhdr: Pointer to KHO vmalloc descriptor for the array of * struct memfd_luo_folio_ser. + * + * Preceded by &struct kho_ser_hdr. */ struct memfd_luo_ser { u64 pos; @@ -93,9 +95,8 @@ struct memfd_luo_ser { DECLARE_KHOSER_PTR(folios_fhdr, DECLARE_KHO_SER_HDR(kho_vmalloc, *)); }; -static_assert(sizeof(struct memfd_luo_ser) == 40); -static_assert(!IS_ENABLED(CONFIG_64BIT) || - __alignof__(struct memfd_luo_ser) == 8); +/* Register memfd_luo_ser with KHO serialization accessors */ +DECLARE_KHO_SER(memfd_luo_ser, 40, 0, 0); /* The compatibility string for memfd file handler */ #define MEMFD_LUO_FH_COMPATIBLE "memfd-v3" diff --git a/mm/memfd_luo.c b/mm/memfd_luo.c index 74c1ff5877c3..94510f73a606 100644 --- a/mm/memfd_luo.c +++ b/mm/memfd_luo.c @@ -256,16 +256,21 @@ static void memfd_luo_unpreserve_folios(DECLARE_KHO_SER_HDR(kho_vmalloc, *folios static size_t memfd_luo_ser_size(void) { - return sizeof(struct memfd_luo_ser) + kho_ser_size(kho_vmalloc); + return kho_ser_size(memfd_luo_ser) + kho_ser_size(kho_vmalloc); } -static struct memfd_luo_ser *memfd_luo_ser_init(void *mem) +static struct memfd_luo_ser * +memfd_luo_ser_init(DECLARE_KHO_SER_HDR(memfd_luo_ser, *fhdr)) { DECLARE_KHO_SER_HDR(kho_vmalloc, *folios_fhdr); - struct memfd_luo_ser *ser = mem; + struct memfd_luo_ser *ser; + + kho_ser_init(fhdr, memfd_luo_ser); + folios_fhdr = (void *)fhdr + kho_ser_size(memfd_luo_ser); - folios_fhdr = mem + sizeof(struct memfd_luo_ser); + ser = kho_ser_payload(fhdr, memfd_luo_ser); KHOSER_STORE_PTR(ser->folios_fhdr, folios_fhdr); + return ser; } @@ -273,6 +278,7 @@ static int memfd_luo_preserve(struct liveupdate_file_op_args *args) { struct inode *inode = file_inode(args->file); struct memfd_luo_folio_ser *folios_ser; + DECLARE_KHO_SER_HDR(memfd_luo_ser, *fhdr); struct memfd_luo_ser *ser; int err = 0, seals; u64 inode_size; @@ -304,12 +310,12 @@ static int memfd_luo_preserve(struct liveupdate_file_op_args *args) } /* Allocate the main serialization structure in preserved memory */ - ser = kho_alloc_preserve(memfd_luo_ser_size()); - if (IS_ERR(ser)) { - err = PTR_ERR(ser); + fhdr = kho_alloc_preserve(memfd_luo_ser_size()); + if (IS_ERR(fhdr)) { + err = PTR_ERR(fhdr); goto err_unlock; } - ser = memfd_luo_ser_init(ser); + ser = memfd_luo_ser_init(fhdr); ser->pos = args->file->f_pos; ser->size = inode_size; @@ -323,12 +329,12 @@ static int memfd_luo_preserve(struct liveupdate_file_op_args *args) inode_unlock(inode); args->private_data = folios_ser; - args->serialized_data = virt_to_phys(ser); + args->serialized_data = virt_to_phys(fhdr); return 0; err_free_ser: - kho_unpreserve_free(ser); + kho_unpreserve_free(fhdr); err_unlock: shmem_freeze(inode, false); inode_unlock(inode); @@ -337,12 +343,14 @@ static int memfd_luo_preserve(struct liveupdate_file_op_args *args) static int memfd_luo_freeze(struct liveupdate_file_op_args *args) { + DECLARE_KHO_SER_HDR(memfd_luo_ser, *fhdr); struct memfd_luo_ser *ser; if (WARN_ON_ONCE(!args->serialized_data)) return -EINVAL; - ser = phys_to_virt(args->serialized_data); + fhdr = phys_to_virt(args->serialized_data); + ser = kho_ser_payload(fhdr, memfd_luo_ser); /* * The pos might have changed since prepare. Everything else stays the @@ -356,6 +364,7 @@ static int memfd_luo_freeze(struct liveupdate_file_op_args *args) static void memfd_luo_unpreserve(struct liveupdate_file_op_args *args) { struct inode *inode = file_inode(args->file); + DECLARE_KHO_SER_HDR(memfd_luo_ser, *fhdr); struct memfd_luo_ser *ser; if (WARN_ON_ONCE(!args->serialized_data)) @@ -364,13 +373,14 @@ static void memfd_luo_unpreserve(struct liveupdate_file_op_args *args) inode_lock(inode); shmem_freeze(inode, false); - ser = phys_to_virt(args->serialized_data); + fhdr = phys_to_virt(args->serialized_data); + ser = kho_ser_payload(fhdr, memfd_luo_ser); memfd_luo_unpreserve_folios(KHOSER_LOAD_PTR(ser->folios_fhdr), args->private_data, ser->nr_folios); - kho_unpreserve_free(ser); + kho_unpreserve_free(fhdr); inode_unlock(inode); } @@ -402,6 +412,7 @@ static void memfd_luo_discard_folios(const struct memfd_luo_folio_ser *folios_se static void memfd_luo_finish(struct liveupdate_file_op_args *args) { struct memfd_luo_folio_ser *folios_ser; + DECLARE_KHO_SER_HDR(memfd_luo_ser, *fhdr); struct memfd_luo_ser *ser; /* @@ -412,10 +423,16 @@ static void memfd_luo_finish(struct liveupdate_file_op_args *args) if (args->retrieve_status) return; - ser = phys_to_virt(args->serialized_data); - if (!ser) + if (WARN_ON_ONCE(!args->serialized_data)) return; + fhdr = phys_to_virt(args->serialized_data); + if (kho_ser_validate(fhdr, memfd_luo_ser)) { + pr_warn("invalid feature header, folios not discarded\n"); + goto out; + } + + ser = kho_ser_payload(fhdr, memfd_luo_ser); if (ser->nr_folios) { folios_ser = kho_restore_vmalloc(KHOSER_LOAD_PTR(ser->folios_fhdr)); if (!folios_ser) @@ -426,7 +443,7 @@ static void memfd_luo_finish(struct liveupdate_file_op_args *args) } out: - kho_restore_free(ser); + kho_restore_free(fhdr); } static int memfd_luo_retrieve_folios(struct file *file, @@ -533,14 +550,24 @@ static int memfd_luo_retrieve_folios(struct file *file, static int memfd_luo_retrieve(struct liveupdate_file_op_args *args) { struct memfd_luo_folio_ser *folios_ser; + DECLARE_KHO_SER_HDR(memfd_luo_ser, *fhdr); struct memfd_luo_ser *ser; struct file *file; int err; - ser = phys_to_virt(args->serialized_data); - if (!ser) + if (WARN_ON_ONCE(!args->serialized_data)) return -EINVAL; + fhdr = phys_to_virt(args->serialized_data); + err = kho_ser_validate(fhdr, memfd_luo_ser); + if (err) { + pr_err("memfd_luo_ser feature validation failed: %pe\n", + ERR_PTR(err)); + goto free_ser; + } + + ser = kho_ser_payload(fhdr, memfd_luo_ser); + /* Make sure the file only has seals supported by this version. */ if (ser->seals & ~MEMFD_LUO_ALL_SEALS) { err = -EOPNOTSUPP; @@ -581,14 +608,14 @@ static int memfd_luo_retrieve(struct liveupdate_file_op_args *args) } args->file = file; - kho_restore_free(ser); + kho_restore_free(fhdr); return 0; put_file: fput(file); free_ser: - kho_restore_free(ser); + kho_restore_free(fhdr); return err; } -- 2.56.0.506.g506a7eabc5-goog