From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (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 0461E28690 for ; Sun, 28 Jun 2026 00:11:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782605483; cv=none; b=id5I6oJEQctaAY/oeyl1rSgrvpggk14mJLTUSTmF8DUS2Q+g2siwqsph4A/gC2mMCDvVYZPsYlFM2f9vAPqM8tgD7O6IADMCD5pgn/aUoFLAU/TMyWzW3pr4fuhXnVp8GnGmOzjGWmKzfOkA0s44bTAc3/66s8fVuPY1OKAWnTs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782605483; c=relaxed/simple; bh=Pe6SvPn+rQXKJOLC8e5JZd8sVPGS4lO5bST0+BtZ4JE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TfyzJJds3ZWpxw7xCC2YmC3PQT3vB3X8oDSybr3YMZy6kw2YTyAEv1DOldmX5aKzVo4ATU3qYzPdJfv0mtksRNOdzQVN+zDgzyl+Z2SMvwBbJVJh4Nj8fNurVKuLFoQ3PYOpO7K1H18IzWJQHHjDzdF+aosHw/urCp4aWfugG0A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tarunsahu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=b2N6f4Hg; arc=none smtp.client-ip=209.85.218.73 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.b="b2N6f4Hg" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-c12518f7c22so7748166b.2 for ; Sat, 27 Jun 2026 17:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782605480; x=1783210280; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3M9J9XOVcczJl+Z2kGqS39ArQMOVpPdk3Lu1iqM0IEA=; b=b2N6f4HgAZE0TRMYQqObuA7qY3wDXhm9X3i4nuSx47sQcuCidpd4klFvZGm8NLqIcK L86rVQoQxGZ4TkX/JtZG/BCySLNhgtFVkLSCvJKanSVTIA8N42nghazI3T3fnOgjSBPf 6bRB0NRHZwLz7PbH50KPJYXAZ1kBgqgxfagWIUOXCZGlyl0z+bErJ5KYyTFcdWKaTe85 q2jPgTBPOYgOcdQTMRiznzky8J5Pex7a3m+VxnlOnjtqAMcCGk9nfdoi+Os0WbqDH5dc Po50FK3TQRlgCkJqOekb6YkchrHIBmNQAAN6U351g4QkvsQE90QeT4ehW7uvFykP8N6H MwLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782605480; x=1783210280; h=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; bh=3M9J9XOVcczJl+Z2kGqS39ArQMOVpPdk3Lu1iqM0IEA=; b=g/N40ecQdFDpN7e1wutLnzrBFBBg+fFwsxSHu4bVhJvSBOO8RRkurEGFor7Ls6E2tX rubJPuzoewtMJ7cgG2hYs1Ftwa7z5c8w05nzYFD31JHFgGGStBB+elTebCwGnPvloYyk QDkeeJEvwlQas02n5WfYJ06/+L4VilHWmwEdemC5VuwtPvL6LNuhYw9rq99N9GJMNLNC pvWCPHvcJche1jRfJRK3jNdnmmBKblQTEQ1aPB38v+gXCPqCAEGwjXSdu+GNfDeKW8Cj MJuuv5mYXsD7IK4fL7UDFYp1oFhlYwoVzwDMUer2m3njaW0YiaUcrRPxA9lMcxHtMKgR 8JtQ== X-Forwarded-Encrypted: i=1; AHgh+Rr+op0wSDSdI7iAs4anvYBJKI04jtSXkg/4g6CaHXZhUt2dc7Hzv/UA9vf1tsfVB21DuEhSdA0rpE6kOEg=@vger.kernel.org X-Gm-Message-State: AOJu0Ywpz94dLCsHStaA2FBtA0634wexEo4zX7CyEEmPBMcV7z1+LlR6 7E3G3Qke7sGhimFiITWYxF/aWVDNh+o27aFcmdKHN7t0bkRhB5p3H6LJ+RCwdhjM6+q4aswAIcp QY9r/0Rl4c6TWENSbeA== X-Received: from ejsh21.prod.google.com ([2002:a17:906:5855:b0:c01:db91:5d49]) (user=tarunsahu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:fd83:b0:c12:30dd:de2 with SMTP id a640c23a62f3a-c1230dd138bmr301464866b.16.1782605479913; Sat, 27 Jun 2026 17:11:19 -0700 (PDT) Date: Sun, 28 Jun 2026 00:11:14 +0000 In-Reply-To: <20260628001114.1869564-1-tarunsahu@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260628001114.1869564-1-tarunsahu@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260628001114.1869564-4-tarunsahu@google.com> Subject: [PATCH v6 3/3] luo: Update serialized data to use KHOSER_PTR From: Tarun Sahu To: Pasha Tatashin , Pratyush Yadav , Andrew Morton , linux-mm@kvack.org, Mike Rapoport , Alexander Graf , skhawaja@google.com Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Tarun Sahu Content-Type: text/plain; charset="UTF-8" Convert raw serialized_data to KHO serializeable pointer (KHOSER_PTR). Signed-off-by: Tarun Sahu Acked-by: Mike Rapoport (Microsoft) --- include/linux/kho/abi/luo.h | 5 +++-- include/linux/liveupdate.h | 4 ++-- kernel/liveupdate/luo_file.c | 24 ++++++++++++------------ mm/memfd_luo.c | 22 +++++++++------------- 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/include/linux/kho/abi/luo.h b/include/linux/kho/abi/luo.h index 288076de6d4a..9e78625cfdc1 100644 --- a/include/linux/kho/abi/luo.h +++ b/include/linux/kho/abi/luo.h @@ -59,6 +59,7 @@ #include #include +#include #include /* @@ -89,14 +90,14 @@ struct luo_ser { /** * struct luo_file_ser - Represents the serialized preserves files. * @compatible: File handler compatible string. - * @data: Private data + * @serialized_data: The serialized KHO pointer for this file * @token: User provided token for this file * * If this structure is modified, `LUO_ABI_COMPATIBLE` must be updated. */ struct luo_file_ser { char compatible[LIVEUPDATE_HNDL_COMPAT_LENGTH]; - u64 data; + DECLARE_KHOSER_PTR(serialized_data, void *); u64 token; } __packed; diff --git a/include/linux/liveupdate.h b/include/linux/liveupdate.h index 88722e5caf02..3bcb6890548d 100644 --- a/include/linux/liveupdate.h +++ b/include/linux/liveupdate.h @@ -33,7 +33,7 @@ struct file; * @file: The file object. For retrieve: [OUT] The callback sets * this to the new file. For other ops: [IN] The caller sets * this to the file being operated on. - * @serialized_data: The opaque u64 handle, preserve/prepare/freeze may update + * @serialized_data: The serialized KHO pointer, preserve/prepare/freeze may update * this field. * @private_data: Private data for the file used to hold runtime state that * is not preserved. Set by the handler's .preserve() @@ -47,7 +47,7 @@ struct liveupdate_file_op_args { struct liveupdate_file_handler *handler; int retrieve_status; struct file *file; - u64 serialized_data; + DECLARE_KHOSER_PTR(serialized_data, void *); void *private_data; }; diff --git a/kernel/liveupdate/luo_file.c b/kernel/liveupdate/luo_file.c index c39f96961a85..5c62d5c32935 100644 --- a/kernel/liveupdate/luo_file.c +++ b/kernel/liveupdate/luo_file.c @@ -125,7 +125,7 @@ static DEFINE_XARRAY(luo_preserved_files); * @file: Pointer to the kernel's &struct file that is being preserved. * This is NULL in the new kernel until the file is successfully * retrieved. - * @serialized_data: The opaque u64 handle to the serialized state of the file. + * @serialized_data: The serialized KHO pointer to the serialized state of the file. * This handle is passed back to the handler's .freeze(), * .retrieve(), and .finish() callbacks, allowing it to track * and update its serialized state across phases. @@ -161,7 +161,7 @@ static DEFINE_XARRAY(luo_preserved_files); struct luo_file { struct liveupdate_file_handler *fh; struct file *file; - u64 serialized_data; + DECLARE_KHOSER_PTR(serialized_data, void *); void *private_data; int retrieve_status; struct mutex mutex; @@ -289,7 +289,7 @@ int luo_preserve_file(struct luo_file_set *file_set, u64 token, int fd) if (err) goto err_kfree; - luo_file->serialized_data = args.serialized_data; + KHOSER_COPY_PTR(luo_file->serialized_data, args.serialized_data); luo_file->private_data = args.private_data; list_add_tail(&luo_file->list, &file_set->files_list); file_set->count++; @@ -342,7 +342,7 @@ void luo_file_unpreserve_files(struct luo_file_set *file_set) args.handler = luo_file->fh; args.file = luo_file->file; - args.serialized_data = luo_file->serialized_data; + KHOSER_COPY_PTR(args.serialized_data, luo_file->serialized_data); args.private_data = luo_file->private_data; luo_file->fh->ops->unpreserve(&args); luo_flb_file_unpreserve(luo_file->fh); @@ -375,12 +375,12 @@ static int luo_file_freeze_one(struct luo_file_set *file_set, args.handler = luo_file->fh; args.file = luo_file->file; - args.serialized_data = luo_file->serialized_data; + KHOSER_COPY_PTR(args.serialized_data, luo_file->serialized_data); args.private_data = luo_file->private_data; err = luo_file->fh->ops->freeze(&args); if (!err) - luo_file->serialized_data = args.serialized_data; + KHOSER_COPY_PTR(luo_file->serialized_data, args.serialized_data); } return err; @@ -396,7 +396,7 @@ static void luo_file_unfreeze_one(struct luo_file_set *file_set, args.handler = luo_file->fh; args.file = luo_file->file; - args.serialized_data = luo_file->serialized_data; + KHOSER_COPY_PTR(args.serialized_data, luo_file->serialized_data); args.private_data = luo_file->private_data; luo_file->fh->ops->unfreeze(&args); @@ -483,7 +483,7 @@ int luo_file_freeze(struct luo_file_set *file_set, strscpy(file_ser->compatible, luo_file->fh->compatible, sizeof(file_ser->compatible)); - file_ser->data = luo_file->serialized_data; + KHOSER_COPY_PTR(file_ser->serialized_data, luo_file->serialized_data); file_ser->token = luo_file->token; } @@ -587,7 +587,7 @@ int luo_retrieve_file(struct luo_file_set *file_set, u64 token, } args.handler = luo_file->fh; - args.serialized_data = luo_file->serialized_data; + KHOSER_COPY_PTR(args.serialized_data, luo_file->serialized_data); err = luo_file->fh->ops->retrieve(&args); if (err) { /* Keep the error code for later use. */ @@ -621,7 +621,7 @@ static int luo_file_can_finish_one(struct luo_file_set *file_set, args.handler = luo_file->fh; args.file = luo_file->file; - args.serialized_data = luo_file->serialized_data; + KHOSER_COPY_PTR(args.serialized_data, luo_file->serialized_data); args.retrieve_status = luo_file->retrieve_status; can_finish = luo_file->fh->ops->can_finish(&args); } @@ -638,7 +638,7 @@ static void luo_file_finish_one(struct luo_file_set *file_set, args.handler = luo_file->fh; args.file = luo_file->file; - args.serialized_data = luo_file->serialized_data; + KHOSER_COPY_PTR(args.serialized_data, luo_file->serialized_data); args.retrieve_status = luo_file->retrieve_status; luo_file->fh->ops->finish(&args); @@ -748,7 +748,7 @@ static int luo_file_deserialize_one(struct luo_file_set *file_set, luo_file->fh = fh; luo_file->file = NULL; - luo_file->serialized_data = ser->data; + KHOSER_COPY_PTR(luo_file->serialized_data, ser->serialized_data); luo_file->token = ser->token; mutex_init(&luo_file->mutex); list_add_tail(&luo_file->list, &file_set->files_list); diff --git a/mm/memfd_luo.c b/mm/memfd_luo.c index 10f3983b0060..a83360551cc5 100644 --- a/mm/memfd_luo.c +++ b/mm/memfd_luo.c @@ -309,7 +309,7 @@ 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); + KHOSER_STORE_PTR(args->serialized_data, ser); return 0; @@ -325,11 +325,10 @@ static int memfd_luo_freeze(struct liveupdate_file_op_args *args) { struct memfd_luo_ser *ser; - if (WARN_ON_ONCE(!args->serialized_data)) + ser = KHOSER_LOAD_PTR(args->serialized_data); + if (WARN_ON_ONCE(!ser)) return -EINVAL; - ser = phys_to_virt(args->serialized_data); - /* * The pos might have changed since prepare. Everything else stays the * same. @@ -344,14 +343,13 @@ static void memfd_luo_unpreserve(struct liveupdate_file_op_args *args) struct inode *inode = file_inode(args->file); struct memfd_luo_ser *ser; - if (WARN_ON_ONCE(!args->serialized_data)) + ser = KHOSER_LOAD_PTR(args->serialized_data); + if (WARN_ON_ONCE(!ser)) return; inode_lock(inode); shmem_freeze(inode, false); - ser = phys_to_virt(args->serialized_data); - memfd_luo_unpreserve_folios(&ser->folios, args->private_data, ser->nr_folios); @@ -397,11 +395,10 @@ static void memfd_luo_finish(struct liveupdate_file_op_args *args) if (args->retrieve_status) return; - if (!args->serialized_data) + ser = KHOSER_LOAD_PTR(args->serialized_data); + if (!ser) return; - ser = phys_to_virt(args->serialized_data); - if (ser->nr_folios) { folios_ser = kho_restore_vmalloc(&ser->folios); if (!folios_ser) @@ -523,11 +520,10 @@ static int memfd_luo_retrieve(struct liveupdate_file_op_args *args) struct file *file; int err; - if (!args->serialized_data) + ser = KHOSER_LOAD_PTR(args->serialized_data); + if (!ser) return -EINVAL; - ser = phys_to_virt(args->serialized_data); - /* Make sure the file only has seals supported by this version. */ if (ser->seals & ~MEMFD_LUO_ALL_SEALS) { err = -EOPNOTSUPP; -- 2.55.0.rc0.799.gd6f94ed593-goog