From nobody Mon Feb 9 22:03:48 2026 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (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 196443321C2 for ; Fri, 14 Nov 2025 15:54:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763135651; cv=none; b=Jbl+hYYQK9B1qOsqBNvZvhTmx/w4VMGA4pBAFDxrp4cPjzvx04yTf+w6C6vjQ8Qpd2+Ax4kVhjXLduIo6oTZruKTjav89o0uBwQS5lwJFoLBuiZeOe69uHGWCyrwJsU7Aj0pllZavgwi/eEgPA426ZSLmo14XtQiEFKvLHlCaco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763135651; c=relaxed/simple; bh=DDUH3x6Ce6VLplr60iOYnnADTYwlSaQLzEpKSLWNz3M=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p9MZhXlPWL7l27fE/mTU249JbPp5Ej7mjpap9g3C5RRdYPrXdx1n0y9OW/7x31ZR581MWI2d1Y5uZwAhFfobQCLX+IYA4bfTRJsVIRCZ7OQ8vnvCBTaimoOX8e9nRigRFfxVjO5C0mt4MquXmUMZQ7NQwbQEZYTrOsIInbAY7Jg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=A9MiKCTw; arc=none smtp.client-ip=209.85.128.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="A9MiKCTw" Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-7866aca9ff4so22228617b3.3 for ; Fri, 14 Nov 2025 07:54:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1763135649; x=1763740449; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qzmFAH3xmZJhmT0Rkc3uU+e9AsoR0HG7wEejoVF1lJ4=; b=A9MiKCTwprv0sSkup7KYbQ6pW76JjMI/Pogaq/OsT2+VMRD4XEOdoFvhMgIEhtiwae VK2jetGLLLC3YGG1Vcszl0nHnQsZDcpu9XA/WSG2IiQ348OKUiIw3+g5YVOAfg/P0SIR 5zg2nhSR58zui52MxMcm1hBlsXWl0B3pGERIJScDW8qEMWRg2XilFBTDjGhmlKWyHrgW ++q8P5Mzuj2pLXCduPXPkXlM/yfmxu6YjYrnFkcCAkGlxjjv43uqf58asJeTpZk9Cetq /nAAVC9BxiRfZu5Pd6r1OnfM9BBclwd4mYSmIjjfOpyC/58+0FnxNKQBNsjrixUWkSwk ddDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763135649; x=1763740449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qzmFAH3xmZJhmT0Rkc3uU+e9AsoR0HG7wEejoVF1lJ4=; b=tMGhFAwpmRF5yWelzR1Ixwt7voOvUB55Q2Y6S5ebZ2pr5ByzHszblj4apTi3Rqc7uU CBuhaJeAWrvripOTLe5bclpAmDgSyeuwESEQs1AtzII4JPVyRzrubBUBkWmHC7v8Nhf0 RdVcv4dIPUiQNZVvdkts2IAhS6V7gv0rKjikLWsHHI3ZdKdijWMzUtD/xfYT+ftQDWNK IH2QNYqR4OShgZjQ1ze5MZYDg3WneIgxLPigN7NhPI8tFQV+5EskKEuorWQ4II6xrxwM bIuxh/tqvs8NZd9t1Z0LANa3khx1OWkWrt3lcxXoSNxDUwywCQ0vcFveLsjVRKBmQcxp Uz6g== X-Forwarded-Encrypted: i=1; AJvYcCWx4AYYpRm45sCY8g42hPDJEEYKz0MwiEnlyv5ZC+zoncZhjzRXDWz/RE7PFqNKvU3KCB6tUUC8VrEQw1E=@vger.kernel.org X-Gm-Message-State: AOJu0YzISDKDeu+JLCCtAawbKdDNGcVPReLa56K8OOVgblS7N1Z1hAx3 UbJvcNwuVib9/MKmTRUW3EYBc5S49ikI2bt3woC08mzbupaq20+pSrHiqgpV5x+VOEc= X-Gm-Gg: ASbGncvjrFNaG525CGoklZ+MJ3E/fLY/W5IrEsEnsCAH5ZU5OdtsWslwtNBLQnuofR3 VKO69IgL3XhLleSF3FGdubssct1z2s4tyuxBQvizJgo4sqZewu9uoo6kYVOdP/PrccTtdaUnCa5 l8uHvwsblk7f8eJXpbicG6g7mTSUoM5do2dTFJuQNB640TpLY2k+sOkAGtqnSpzqx9OQ4mE8d73 jEugnHw2f6wS5sa9NqhjCLhVqKD+ARWx/dmwqLGr3FG6IjRVsqp0m2RCqjrf4qWjsT7Gxt0vYrz 4OMXT1HZjBJjrY8NgpibzAEFB+6l618mlqAarXBTsYob1A8pDrZSFmDWjWmN1asQ76fptfVMagN ts004tp+Ktnli2mNiLFJ/rD3IzbliHiMnOrhqV/WJcj7ECdOdzxz1FA5wroEx/5utgkbtsVTL0p qaNh/XSedF0W80kbrSzZl/tAtJ2NbxJtm+85q9nzhrIpwMMTKAzotLWXn/cFkBjfsYU5Rz X-Google-Smtp-Source: AGHT+IHTzr8yE3ggcwxtjOMXBuZ+AkCCbUZfzA+E1WP5d8Pf6HPSzrjQ6c3qDriXPIifvjJMeL/d/w== X-Received: by 2002:a05:690c:5885:b0:787:f5c5:c630 with SMTP id 00721157ae682-78929ed6f0bmr24916857b3.41.1763135648927; Fri, 14 Nov 2025 07:54:08 -0800 (PST) Received: from soleen.c.googlers.com.com (182.221.85.34.bc.googleusercontent.com. [34.85.221.182]) by smtp.gmail.com with ESMTPSA id 00721157ae682-78822125317sm16468577b3.37.2025.11.14.07.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Nov 2025 07:54:08 -0800 (PST) From: Pasha Tatashin To: akpm@linux-foundation.org, bhe@redhat.com, pasha.tatashin@soleen.com, rppt@kernel.org, jasonmiu@google.com, arnd@arndb.de, coxu@redhat.com, dave@vasilevsky.ca, ebiggers@google.com, graf@amazon.com, kees@kernel.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org Subject: [PATCH v1 06/13] kho: Simplify serialization and remove __kho_abort Date: Fri, 14 Nov 2025 10:53:51 -0500 Message-ID: <20251114155358.2884014-7-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog In-Reply-To: <20251114155358.2884014-1-pasha.tatashin@soleen.com> References: <20251114155358.2884014-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, __kho_finalize() performs memory serialization in the middle of FDT construction. If FDT construction fails later, the function must manually clean up the serialized memory via __kho_abort(). Refactor __kho_finalize() to perform kho_mem_serialize() only after the FDT has been successfully constructed and finished. This reordering has two benefits: 1. It avoids expensive serialization work if FDT generation fails. 2. It removes the need for cleanup in the FDT error path. As a result, the internal helper __kho_abort() is no longer needed for internal error handling. Inline its remaining logic (cleanup of the preserved memory map) directly into kho_abort() and remove the helper. Signed-off-by: Pasha Tatashin Reviewed-by: Pratyush Yadav --- kernel/liveupdate/kexec_handover.c | 41 +++++++++++++----------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_h= andover.c index cd8641725343..aea58e5a6b49 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -1127,14 +1127,6 @@ void *kho_restore_vmalloc(const struct kho_vmalloc *= preservation) } EXPORT_SYMBOL_GPL(kho_restore_vmalloc); =20 -static void __kho_abort(void) -{ - if (kho_out.preserved_mem_map) { - kho_mem_ser_free(kho_out.preserved_mem_map); - kho_out.preserved_mem_map =3D NULL; - } -} - int kho_abort(void) { if (!kho_enable) @@ -1144,7 +1136,8 @@ int kho_abort(void) if (!kho_out.finalized) return -ENOENT; =20 - __kho_abort(); + kho_mem_ser_free(kho_out.preserved_mem_map); + kho_out.preserved_mem_map =3D NULL; kho_out.finalized =3D false; =20 return 0; @@ -1152,12 +1145,12 @@ int kho_abort(void) =20 static int __kho_finalize(void) { - int err =3D 0; - u64 *preserved_mem_map; void *root =3D kho_out.fdt; struct kho_sub_fdt *fdt; + u64 *preserved_mem_map; + int err; =20 - err |=3D fdt_create(root, PAGE_SIZE); + err =3D fdt_create(root, PAGE_SIZE); err |=3D fdt_finish_reservemap(root); err |=3D fdt_begin_node(root, ""); err |=3D fdt_property_string(root, "compatible", KHO_FDT_COMPATIBLE); @@ -1170,13 +1163,7 @@ static int __kho_finalize(void) sizeof(*preserved_mem_map), (void **)&preserved_mem_map); if (err) - goto abort; - - err =3D kho_mem_serialize(&kho_out); - if (err) - goto abort; - - *preserved_mem_map =3D (u64)virt_to_phys(kho_out.preserved_mem_map); + goto err_exit; =20 mutex_lock(&kho_out.fdts_lock); list_for_each_entry(fdt, &kho_out.sub_fdts, l) { @@ -1190,13 +1177,19 @@ static int __kho_finalize(void) =20 err |=3D fdt_end_node(root); err |=3D fdt_finish(root); + if (err) + goto err_exit; =20 -abort: - if (err) { - pr_err("Failed to convert KHO state tree: %d\n", err); - __kho_abort(); - } + err =3D kho_mem_serialize(&kho_out); + if (err) + goto err_exit; + + *preserved_mem_map =3D (u64)virt_to_phys(kho_out.preserved_mem_map); + + return 0; =20 +err_exit: + pr_err("Failed to convert KHO state tree: %d\n", err); return err; } =20 --=20 2.52.0.rc1.455.g30608eb744-goog